diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-06-08 19:37:29 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-06-08 19:37:29 +0000 |
| commit | 8735a5c54cf26dd5b5b686850f800a4aed49ff78 (patch) | |
| tree | ac7404dae428201298c7fed6e3b5360443763694 | |
| parent | 7d11e9346ebd0f9c378952caee0c82d6ca815f4e (diff) | |
Fri Jun 8 19:37:17 UTC 2012
440 files changed, 0 insertions, 25579 deletions
diff --git a/community-staging/awesome/01-fix_glib2_build.patch b/community-staging/awesome/01-fix_glib2_build.patch deleted file mode 100644 index aeab63fbb..000000000 --- a/community-staging/awesome/01-fix_glib2_build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny <thomas.moschny@gmx.de> -Date: Wed, 14 Dec 2011 20:00:53 +0100 -Subject: [PATCH] Fix build with glib2 2.31.0 - -Starting with glib2 2.31.0, It is no longer possible to -include individual headers (like "ghash.h") -- you must -#include <glib.h>. - -Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- - spawn.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/spawn.c b/spawn.c -index 3c8cf07..a6d6c5e 100644 ---- a/spawn.c -+++ b/spawn.c -@@ -24,7 +24,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include <glib/gspawn.h> -+#include <glib.h> - - #include "spawn.h" - #include "screen.h" --- -1.7.2.5 - diff --git a/community-staging/awesome/PKGBUILD b/community-staging/awesome/PKGBUILD deleted file mode 100644 index b62dd9a38..000000000 --- a/community-staging/awesome/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 71670 2012-05-31 20:27:13Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: xduugu -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: Vesa Kaihlavirta - -pkgname=awesome -pkgver=3.4.11 -pkgrel=5 -pkgdesc='Highly configurable framework window manager' -arch=('i686' 'x86_64') -url='http://awesome.naquadah.org/' -license=('GPL2') -depends=( - 'cairo' - 'dbus' - 'imlib2' - 'libev' - 'libxdg-basedir' - 'lua' - 'pango' - 'startup-notification' - 'xcb-util-image' - 'xcb-util-keysyms' - 'xcb-util-wm' - 'xorg-xmessage' -) -makedepends=( - 'asciidoc' - 'cmake' - 'docbook-xsl' - 'doxygen' - 'gperf' - 'imagemagick' - 'luadoc' - 'xmlto' -) -optdepends=( - 'rlwrap: readline support for awesome-client' - 'feh: image background setter for awsetbg' -) -provides=('notification-daemon') -source=("$url/download/$pkgname-$pkgver.tar.xz" - "$pkgname.desktop" - '01-fix_glib2_build.patch') -md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2' - '0fdbeec43d211c6750041d7e37611a6a' - 'baa179074c36e26ef156ebb2060bfd5c') - -build() { - cd $pkgname-$pkgver - # to remove in 3.4.12 - patch -N -p1 -i ../01-fix_glib2_build.patch - make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # install desktop file so you can start awesome from your login manager - install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/awesome/awesome.desktop b/community-staging/awesome/awesome.desktop deleted file mode 100644 index 453399c6e..000000000 --- a/community-staging/awesome/awesome.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Awesome -Comment=Highly configurable framework window manager -Type=XSession -Exec=awesome -TryExec=awesome diff --git a/community-staging/enet/PKGBUILD b/community-staging/enet/PKGBUILD deleted file mode 100644 index 2434a0f40..000000000 --- a/community-staging/enet/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71656 2012-05-31 16:55:51Z ebelanger $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Bj?indeijer <bjorn@lindeijer.nl> - -pkgname=enet -pkgver=1.3.4 -pkgrel=1 -pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' -arch=('i686' 'x86_64') -url='http://enet.bespin.org/' -license=('custom') -depends=('glibc') -options=('!libtool') -source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('e5fb0ca3fd3a9fe7eadbcde4d6af1517') - -build() { - cd "${pkgname}-${pkgver}" - CFLAGS+="-fPIC" ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE deleted file mode 100644 index 7d6035775..000000000 --- a/community-staging/python-bsddb/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2008-2009 Jesus Cea Avion - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.
\ No newline at end of file diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD deleted file mode 100644 index 6d3f1aad7..000000000 --- a/community-staging/python-bsddb/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 71672 2012-05-31 23:21:51Z stephane $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-bsddb -pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.3.0 -pkgrel=2 -pkgdesc="Python interface for BerkeleyDB" -license=('MIT') -arch=('i686' 'x86_64') -url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute') -source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - LICENSE) -sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -build () { - cd "${srcdir}" - - cp -r bsddb3-${pkgver}{,-python2} - - # Build python 3 module - cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build - - # Build python 2 module - cd ../bsddb3-${pkgver}-python2 - python2 setup.py --berkeley-db=/usr build -} - -package_python2-bsddb() { - depends=('db' 'python2>=2.7') - cd "${srcdir}/bsddb3-${pkgver}-python2" - - python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python-bsddb() { - depends=('db' 'python>=3.2') - cd "${srcdir}/bsddb3-${pkgver}" - - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/awesome/01-fix_glib2_build.patch b/community-testing/awesome/01-fix_glib2_build.patch deleted file mode 100644 index aeab63fbb..000000000 --- a/community-testing/awesome/01-fix_glib2_build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny <thomas.moschny@gmx.de> -Date: Wed, 14 Dec 2011 20:00:53 +0100 -Subject: [PATCH] Fix build with glib2 2.31.0 - -Starting with glib2 2.31.0, It is no longer possible to -include individual headers (like "ghash.h") -- you must -#include <glib.h>. - -Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- - spawn.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/spawn.c b/spawn.c -index 3c8cf07..a6d6c5e 100644 ---- a/spawn.c -+++ b/spawn.c -@@ -24,7 +24,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include <glib/gspawn.h> -+#include <glib.h> - - #include "spawn.h" - #include "screen.h" --- -1.7.2.5 - diff --git a/community-testing/awesome/PKGBUILD b/community-testing/awesome/PKGBUILD deleted file mode 100644 index e9c275d33..000000000 --- a/community-testing/awesome/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 71724 2012-06-01 20:08:27Z dreisner $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: xduugu -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: Vesa Kaihlavirta - -pkgname=awesome -pkgver=3.4.11 -pkgrel=5 -pkgdesc='Highly configurable framework window manager' -arch=('i686' 'x86_64') -url='http://awesome.naquadah.org/' -license=('GPL2') -depends=( - 'cairo' - 'dbus' - 'imlib2' - 'libev' - 'libxdg-basedir' - 'lua' - 'pango' - 'startup-notification' - 'xcb-util-image' - 'xcb-util-keysyms' - 'xcb-util-wm' - 'xorg-xmessage' -) -makedepends=( - 'asciidoc' - 'cmake' - 'docbook-xsl' - 'doxygen' - 'gperf' - 'imagemagick' - 'luadoc' - 'xmlto' -) -optdepends=( - 'rlwrap: readline support for awesome-client' - 'feh: image background setter for awsetbg' -) -provides=('notification-daemon') -source=("$url/download/$pkgname-$pkgver.tar.xz" - "$pkgname.desktop" - '01-fix_glib2_build.patch') -md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2' - '0fdbeec43d211c6750041d7e37611a6a' - 'baa179074c36e26ef156ebb2060bfd5c') - -build() { - cd $pkgname-$pkgver - # to remove in 3.4.12 - patch -N -p1 -i ../01-fix_glib2_build.patch - make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # install desktop file so you can start awesome from your login manager - install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/awesome/awesome.desktop b/community-testing/awesome/awesome.desktop deleted file mode 100644 index 453399c6e..000000000 --- a/community-testing/awesome/awesome.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Awesome -Comment=Highly configurable framework window manager -Type=XSession -Exec=awesome -TryExec=awesome diff --git a/community-testing/collectd/PKGBUILD b/community-testing/collectd/PKGBUILD deleted file mode 100644 index a534789c0..000000000 --- a/community-testing/collectd/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 71356 2012-05-27 07:37:54Z bluewind $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Gerhard Brauer <gerhard.brauer@web.de> - -pkgname=collectd -pkgver=5.1.0 -pkgrel=2 -pkgdesc='Daemon which collects system performance statistics periodically' -arch=('i686' 'x86_64') -url='http://collectd.org/' -license=('GPL') - -optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' - 'libdbi: dbi plugin' - 'libesmtp: notify_email plugin' - 'libgcrypt: encryption and authentication for network plugin' - 'iptables: iptables plugin' - 'libmemcached: memcachec plugin' - 'libmysqlclient: mysql plugin' - 'iproute2: netlink plugin' - 'net-snmp: snmp plugin' - 'libnotify: notify_desktop plugin' - 'liboping: ping plugin' - 'libpcap: dns plugin' - 'perl: perl plugin' - 'postgresql-libs: postgresql plugin' - 'python2: python plugin' - 'rrdtool: rrdtool and rrdcached plugins' - 'lm_sensors: lm_sensors and sensors plugins' - 'libvirt: libvirt plugin' - 'libxml2: ascent and libvirt plugins' - 'xmms: xmms plugin' - 'yajl: curl_json plugin') - -makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' - 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' - 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' - 'libvirt' 'libxml2' 'xmms' 'yajl') - -depends=('libltdl') - -source=("${url}files/${pkgname}-${pkgver}.tar.gz" - 'rtnl_dump_filter.patch' - 'libperl.patch' - 'rc.d') -sha1sums=('55f17b17a10710641a9bf4e8c5332cef661cafcd' - 'c92b8dacff0a71f2cc8645c2e350ff9bdc1cbd5f' - '245c098d121a4a05594553583310953b3a2f6461' - '0f441718d5519cb043b1130e5a1d0379078adbcc') - -backup=('etc/collectd.conf') -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../rtnl_dump_filter.patch - patch -p1 -i ../libperl.patch - autoconf - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --with-python=/usr/bin/python2 - - make all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl -} diff --git a/community-testing/collectd/install b/community-testing/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community-testing/collectd/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat <<EOF -==> Customize your /etc/collectd.conf (you really want to). -==> Then start and stop the daemon using: /etc/rc.d/collectd -==> To see some result of collected data, use the Perl script: -==> /usr/share/collectd/collectd2html.pl -EOF -} diff --git a/community-testing/collectd/libperl.patch b/community-testing/collectd/libperl.patch deleted file mode 100644 index baa9c5397..000000000 --- a/community-testing/collectd/libperl.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -aur old/configure.in new/configure.in ---- old/configure.in 2011-09-29 20:38:56.725672831 +1000 -+++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 -@@ -2810,11 +2810,13 @@ - then - SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" -+ SAVE_LIBS="$LIBS" - dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) - PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` - PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` - CFLAGS="$CFLAGS $PERL_CFLAGS" - LDFLAGS="$LDFLAGS $PERL_LDFLAGS" -+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS" - - AC_CACHE_CHECK([for libperl], - [c_cv_have_libperl], -@@ -2833,7 +2835,10 @@ - Nullsv); - ]]), - [c_cv_have_libperl="yes"], -- [c_cv_have_libperl="no"] -+ [ -+ c_cv_have_libperl="no" -+ LIBS="$SAVE_LIBS" -+ ] - ) - ) - diff --git a/community-testing/collectd/rc.d b/community-testing/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community-testing/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community-testing/collectd/rtnl_dump_filter.patch b/community-testing/collectd/rtnl_dump_filter.patch deleted file mode 100644 index d5929a621..000000000 --- a/community-testing/collectd/rtnl_dump_filter.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/src/netlink.c new/src/netlink.c ---- old/src/netlink.c 2012-01-22 22:10:04.000000000 +1100 -+++ new/src/netlink.c 2012-02-01 17:22:54.362752065 +1100 -@@ -570,8 +570,7 @@ - return (-1); - } - -- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - return (-1); -@@ -608,8 +607,7 @@ - continue; - } - -- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - continue; diff --git a/community-testing/courier-mta/PKGBUILD b/community-testing/courier-mta/PKGBUILD deleted file mode 100644 index aee7e75a3..000000000 --- a/community-testing/courier-mta/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 71358 2012-05-27 07:38:25Z bluewind $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -# ----------- NOTE TO ALL USERS ------------ -# Go read http://www.courier-mta.org/install.html b4 running or building courier - -pkgname=courier-mta -pkgver=0.68.0 -pkgrel=2 -pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" -arch=(i686 x86_64) -license=('GPL2') -backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ - 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ - 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ - 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ - 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ - 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ - 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ - 'etc/conf.d/courier-mta') -url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') -optdepends=('libldap') -makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin') -provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') -options=('!libtool') -install=courier-mta.install -source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 - courier.rc.d - courier-mta.rc.d - courier-mta.conf.d - esmtpd.rc.d - esmtpd-ssl.rc.d - esmtpd-msa.rc.d - imapd.rc.d - imapd-ssl.rc.d - pop3d.rc.d - pop3d-ssl.rc.d - webmaild.rc.d) -md5sums=('5bd56150ed7c75cc8378c443742c632e' - '9055ba622efd37603186ce1f37277224' - '5cbeb5c323706058e545f74ad7752ebe' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' - 'caabce8c7b66296b602316aa5af5d4c5' - '1c8b1b66ebafa4ff09ffc0106a9dc82c' - 'dae6c7d5ff0cce0fba5729fedf2a9051' - 'd0cc5eab5d3e0ec33dadd0392421f63e' - '5873a96aa149edda281730010fb4db34' - 'faa09e06a5dc41ee89ab1f8fa6886b63' - '520501daa66c0a94f2e9844ce4919a09' - '33a93f400c3e87bcd207295b7d7333ca') - -# MIGRATION NOTE: -# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. -# Remove those files and this note and also courier-mta.install - -build() { - cd ${srcdir}/courier-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth" - echo $LDFLAGS - # courier is more about configuring than compiling :-), lets start the mess - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var/spool/courier \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --enable-mimetypes=/etc/mime.types \ - --with-piddir=/var/run/courier \ - --with-locking-method=lockf \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-random=/dev/urandom --without-ispell \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-certdb=/etc/ssl/certs/ - make -} - -package() { - cd ${srcdir}/courier-${pkgver} - - #chown mail.mail ${pkgdir}/var/spool/courier - make DESTDIR=${pkgdir} install - # docs say we can get rid of those after make - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - # install the perftest-script for testings - install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) - done - # install pam files according to the layout used in Archlinux - for pamfile in ${pkgdir}/etc/courier/*.authpam; do - sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} - #echo "password required pam_unix.so" >> $pamfile - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") - rm -f ${pamfile} - done - - ############################################################################### - # Arch Linux specific tweaks to make things easier for the user - # create passwordfile for webadmin -> standard archwebadmin - sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile - yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password - # arch specific scripts - install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta - install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta - install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier - install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd - install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl - install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d - install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl - install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd - install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl - install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa - install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild - #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ - # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache - # bug http://bugs.archlinux.org/task/5154 - find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; - # fixing some permissions - chown -R courier:courier ${pkgdir}/usr/lib/courier/modules - rm -r ${pkgdir}/var/run - #chown -R courier:courier ${pkgdir}/var/run/courier - chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} - # make a link to /usr/sbin/sendmail - install -dm 755 ${pkgdir}/usr/sbin - cd ${pkgdir}/usr/sbin - ln -s ../bin/sendmail ./sendmail -} diff --git a/community-testing/courier-mta/courier-mta.conf.d b/community-testing/courier-mta/courier-mta.conf.d deleted file mode 100644 index 5856a5cda..000000000 --- a/community-testing/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild -# -CI_DAEMONS="courier esmtpd imapd pop3d" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community-testing/courier-mta/courier-mta.install b/community-testing/courier-mta/courier-mta.install deleted file mode 100644 index b0d827e43..000000000 --- a/community-testing/courier-mta/courier-mta.install +++ /dev/null @@ -1,61 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - --> if you are using LDAP services to provide lookup in sqwebmail or aliases - --> then you have to install: - libldap -EOM - # create the *.dat files - makealiases - makesmtpaccess -} - -pre_upgrade() { - pre_remove $1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - echo "Please migrate to the new daemon format:" - echo "/etc/rc.d/courier-imap has been split into separate daemons:" - echo " imapd, imapd-ssl, pop3d, pop3d-ssl" - echo "This elimates the need for /etc/conf.d/courier-imap" - echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" - echo "you first start authdaemond before any other of these daemons." - echo "Example prior to this change:" - echo " DAEMONS=( ... courier-mta ...)" - echo "Example after this change:" - echo " DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl" - echo " pop3d pop3d-ssl webmaild ... )" - echo "This allows better control over the daemons and will generate" - echo "correct entries in /run/daemons" - echo "An old configuration will keep working but please do migrate in time" - echo "as support for this will be removed some time in 2012." -} - - -pre_remove() { - # manual backup, since courier is always processing the whole directory - # - so it would process "system" AND "system.pacsave" -> bad - [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup - cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system - cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default - cat << EOM - --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default - --> files have been backed up to /etc/courier/_backup since the *.pacsave - --> files cannot stay in place. Read about couriers alias handling from the - --> documentation! -EOM -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/community-testing/courier-mta/courier-mta.rc.d b/community-testing/courier-mta/courier-mta.rc.d deleted file mode 100644 index 416946a5a..000000000 --- a/community-testing/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/sbin/${daemon} start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/sbin/${daemon} stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly deleted file mode 100644 index 6c541321e..000000000 --- a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Cleans the cache of the sqwebmail server -if [ -x /usr/share/sqwebmail/cleancache.pl ]; then - su -c "/usr/share/sqwebmail/cleancache.pl" bin -fi diff --git a/community-testing/courier-mta/courier.rc.d b/community-testing/courier-mta/courier.rc.d deleted file mode 100644 index 7c581a24a..000000000 --- a/community-testing/courier-mta/courier.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier daemon" - /usr/sbin/courier start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon courier - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier daemon" - /usr/sbin/courier stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon courier - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/esmtpd-msa.rc.d b/community-testing/courier-mta/esmtpd-msa.rc.d deleted file mode 100644 index 31458aca8..000000000 --- a/community-testing/courier-mta/esmtpd-msa.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd-msa" - /usr/sbin/esmtpd-msa start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd-msa - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd-msa" - /usr/sbin/esmtpd-msa stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd-msa - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/esmtpd-ssl.rc.d b/community-testing/courier-mta/esmtpd-ssl.rc.d deleted file mode 100644 index 2a13be03f..000000000 --- a/community-testing/courier-mta/esmtpd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd-ssl" - /usr/sbin/esmtpd-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd-ssl" - /usr/sbin/esmtpd-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/esmtpd.rc.d b/community-testing/courier-mta/esmtpd.rc.d deleted file mode 100644 index dbaa9d680..000000000 --- a/community-testing/courier-mta/esmtpd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd" - /usr/sbin/esmtpd start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd" - /usr/sbin/esmtpd stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/imapd-ssl.rc.d b/community-testing/courier-mta/imapd-ssl.rc.d deleted file mode 100644 index 3dc74cfdf..000000000 --- a/community-testing/courier-mta/imapd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd-ssl" - /usr/sbin/imapd-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd-ssl" - /usr/sbin/imapd-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/imapd.rc.d b/community-testing/courier-mta/imapd.rc.d deleted file mode 100644 index 8bce59f6c..000000000 --- a/community-testing/courier-mta/imapd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd" - /usr/sbin/imapd start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd" - /usr/sbin/imapd stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/pop3d-ssl.rc.d b/community-testing/courier-mta/pop3d-ssl.rc.d deleted file mode 100644 index 6e7ae4e12..000000000 --- a/community-testing/courier-mta/pop3d-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d-ssl" - /usr/sbin/pop3d-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d-ssl" - /usr/sbin/pop3d-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/pop3d.rc.d b/community-testing/courier-mta/pop3d.rc.d deleted file mode 100644 index 25f8379ba..000000000 --- a/community-testing/courier-mta/pop3d.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d" - /usr/sbin/pop3d start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d" - /usr/sbin/pop3d stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/webmaild.rc.d b/community-testing/courier-mta/webmaild.rc.d deleted file mode 100644 index 835cc2bf0..000000000 --- a/community-testing/courier-mta/webmaild.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier webmaild" - /usr/sbin/webmaild start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon webmaild - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier webmaild" - /usr/sbin/webmaild stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon webmaild - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/eeze-svn/PKGBUILD b/community-testing/eeze-svn/PKGBUILD deleted file mode 100644 index 93a96617f..000000000 --- a/community-testing/eeze-svn/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 71488 2012-05-27 13:14:31Z dreisner $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: bluebugs - -pkgname=eeze-svn -pkgver=69825 -pkgrel=2 -pkgdesc="A data storage and compression library" -arch=('i686' 'x86_64') -groups=('e17-libs-svn' 'e17-svn') -url="http://www.enlightenment.org" -license=('BSD') -depends=('ecore-svn' 'eina-svn' 'udev') -makedepends=('subversion') -conflicts=('eeze') -provides=('eeze') -options=(!libtool) -source=() -md5sums=() - -_svntrunk="http://svn.enlightenment.org/svn/e/trunk/eeze" -_svnmod="eeze" - -build() { - cd $srcdir - -msg "Connecting to $_svntrunk SVN server...." - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - ./autogen.sh --prefix=/usr - make -} - -package(){ - cd $_svnmod-build - make DESTDIR=$pkgdir install - - # install license files - install -Dm644 $srcdir/$_svnmod-build/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING - - rm -r $srcdir/$_svnmod-build - -} diff --git a/community-testing/ekg2/PKGBUILD b/community-testing/ekg2/PKGBUILD deleted file mode 100644 index 8f5cc8047..000000000 --- a/community-testing/ekg2/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 71360 2012-05-27 07:38:29Z bluewind $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Mateusz Herych <heniekk@gmail.com> - -pkgname=ekg2 -pkgver=0.3.1 -pkgrel=4 -pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" -arch=('i686' 'x86_64') -url="http://ekg2.org/" -license=('GPL') -depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') -optdepends=('xosd: xosd support' - 'sqlite: sqlite support' - 'gtk2: gtk support') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('68fc05b432c34622df6561eaabef5a40') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod - mv "$pkgdir"/usr/libexec/ioctld "$pkgdir"/usr/lib/ekg2/ioctld - rm -rf "$pkgdir"/usr/libexec - chmod -R 755 "$pkgdir"/usr/lib/perl5 -} diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD deleted file mode 100644 index 27d921c0a..000000000 --- a/community-testing/flightgear/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 71490 2012-05-27 13:14:35Z dreisner $ -# 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.6.0 -pkgrel=5 -pkgdesc="An open-source, multi-platform flight simulator" -arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') -makedepends=('boost' 'cmake') -license=("GPL") -url="http://www.flightgear.org" -options=('!makeflags') -#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") -#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") -source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('943f784f55c7e11ddce6082d2d1dbba4') - -build() { - cd $srcdir/flightgear-$pkgver - sed -i '1,1i#include <unistd.h>' utils/TerraSync/terrasync.cxx - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . - make - sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop -} - -package() { - depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') - cd $srcdir/flightgear-$pkgver - make DESTDIR=$pkgdir install - install -Dm0644 package/flightgear.desktop $pkgdir//usr/share/applications/flightgear.desktop - install -Dm0644 package/RedHat/flightgear.48.png $pkgdir/usr/share/icons/flightgear.png - ln -sf flightgear $pkgdir/usr/share/FlightGear -} diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD deleted file mode 100644 index d2aa9bfa4..000000000 --- a/community-testing/freeradius/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 71362 2012-05-27 07:38:39Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jason R Begley (jayray@digitalgoat.com> - -pkgname=freeradius -pkgver=2.1.12 -pkgrel=6 -pkgdesc="The premier open source RADIUS server" -arch=('i686' 'x86_64') -url="http://www.freeradius.org/" -license=('GPL') -depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmysqlclient') -makedepends=('libpcap' 'unixodbc' 'python2') -optdepends=('libpcap' 'unixodbc' 'python2') -options=('!libtool' '!makeflags') -install=$pkgname.install -source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} - radiusd - krb5-build-fix.patch) -md5sums=('862d3a2c11011e61890ba84fa636ed8c' - '8759569d36b9f353c281e24875b556be' - 'f1a6530b1b69d2fa793aa45b2de379bb' - 'c6a61de7576933f59154a53bfc12a2d2') - -build() { - cd $srcdir/freeradius-server-$pkgver - export CFLAGS="$CFLAGS -fno-strict-aliasing" - sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in - patch -p1 <$srcdir/krb5-build-fix.patch - ./configure --with-system-libtool --with-system-libltdl \ - --prefix=/usr --enable-heimdal-krb5 \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius - make -} - -package() { - cd $srcdir/freeradius-server-$pkgver - make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd - chmod o+r $pkgdir/etc/raddb/* - mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default - rm -rf $pkgdir/var/run -} diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install deleted file mode 100644 index c3b9f9415..000000000 --- a/community-testing/freeradius/freeradius.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - groupadd -r radiusd - useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd - - touch /var/log/radius/radius.log - chown -R radiusd.radiusd /var/log/radius/radius.log - - [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb - - /bin/true -} - -pre_remove() { - /etc/rc.d/radiusd stop - /bin/true -} - -post_remove() { - userdel radiusd - groupdel radiusd - /bin/true -} diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch deleted file mode 100644 index 11dae7090..000000000 --- a/community-testing/freeradius/krb5-build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c ---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 -+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 -@@ -375,7 +375,7 @@ - * Heimdal krb5 verification - */ - radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val*/, - userP->realm); - - krb5_cc_default(context, &id); -@@ -390,7 +390,7 @@ - - radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", - error_message(ret), -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val */, - userP->realm); - - return RLM_MODULE_REJECT; diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd deleted file mode 100644 index bf872b6f2..000000000 --- a/community-testing/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/i3-wm/PKGBUILD b/community-testing/i3-wm/PKGBUILD deleted file mode 100644 index a6ae0813f..000000000 --- a/community-testing/i3-wm/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 71726 2012-06-01 20:08:31Z dreisner $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=i3-wm -_pkgsourcename=i3 -pkgver=4.2 -pkgrel=2 -pkgdesc="An improved dynamic tiling window manager" -arch=('i686' 'x86_64') -url="http://i3wm.org/" -license=('BSD') -replaces=("i3" "i3bar") -groups=("i3") -depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre') -makedepends=('bison' 'flex') -optdepends=('rxvt-unicode: The terminal emulator used in the default config.' - 'dmenu: As menu.' - 'i3lock: For locking your screen.' - 'i3status: To display systeminformation with a bar.' - 'perl: To migrate your configuration to v4 format.') -options=('docs' '!strip') -source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") -md5sums=('11b7e5ecdd837341978c72341cb890c6') - -build() { - cd "$srcdir/$_pkgsourcename-$pkgver" - - # In order to avoid problems with bison use only a single process - MAKEFLAGS="-j1" - make -} - -package() { - cd "$srcdir/$_pkgsourcename-$pkgver" - - make DESTDIR="$pkgdir/" install - - install -Dm644 man/i3.1 \ - ${pkgdir}/usr/share/man/man1/i3.1 - install -Dm644 i3bar/doc/i3bar.1 \ - ${pkgdir}/usr/share/man/man1/i3bar.1 - install -Dm644 man/i3-config-wizard.1 \ - ${pkgdir}/usr/share/man/man1/i3-config-wizard.1 - install -Dm644 man/i3-input.1 \ - ${pkgdir}/usr/share/man/man1/i3-input.1 - install -Dm644 man/i3-msg.1 \ - ${pkgdir}/usr/share/man/man1/i3-msg.1 - install -Dm644 man/i3-migrate-config-to-v4.1 \ - ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 - install -Dm644 man/i3-nagbar.1 \ - ${pkgdir}/usr/share/man/man1/i3-nagbar.1 - install -Dm644 LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/inn/PKGBUILD b/community-testing/inn/PKGBUILD deleted file mode 100644 index 4a71ca57e..000000000 --- a/community-testing/inn/PKGBUILD +++ /dev/null @@ -1,132 +0,0 @@ -# $Id: PKGBUILD 71364 2012-05-27 07:38:55Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Edward Tjörnhammar <xhemi@cube2.se> -# Contributor: Edward Tjörnhammar <xhemi@cube2.se> - -pkgname=inn -pkgver=2.5.2 -pkgrel=10 -pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." -url="http://www.isc.org/software/inn/" -arch=('i686' 'x86_64') -license=("custom:INN") -depends=('openssl' 'dovecot') -makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl') -optdepends=('perl' 'python2' 'libsasl') -options=(emptydirs docs zipman) -install=inn.install -backup=(etc/inn/newsfeeds - etc/inn/incoming.conf - etc/inn/nnrpd.track - etc/inn/passwd.nntp - etc/inn/inn.conf - etc/inn/moderators - etc/inn/control.ctl - etc/inn/expire.ctl - etc/inn/nntpsend.ctl - etc/inn/innreport.conf - etc/inn/innwatch.ctl - etc/inn/distrib.pats - etc/inn/actsync.cfg - etc/inn/actsync.ign - etc/inn/motd.news - etc/inn/storage.conf - etc/inn/cycbuff.conf - etc/inn/buffindexed.conf - etc/inn/innfeed.conf - etc/inn/news2mail.cf - etc/inn/readers.conf - etc/inn/radius.conf - etc/inn/ovdb.conf - etc/inn/subscriptions - var/db/inn/active - var/db/inn/active.times - var/db/inn/history - var/db/inn/history.dir - var/db/inn/history.hash - var/db/inn/history.index - var/db/inn/newsgroups) -source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf - site.make.patch) -md5sums=('a6e577dceb90d07501b96149508b974b' - 'a243d9498568f1beee20da5684b5fbfc' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' - '960c800026ed6e03901cf0bafdfd53d8') - -build() { - cd $srcdir/inn-$pkgver - - [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --includedir=/usr/include/inn \ - --sbindir=/usr/sbin \ - --with-libtool \ - --with-gnu-id \ - --with-db-dir=/var/db/inn \ - --sysconfdir=/etc/inn \ - --with-spool-dir=/var/spool/news \ - --with-log-dir=/var/log/inn \ - --with-run-dir=/var/run/inn \ - --with-tmp-dir=/var/spool/inn/tmp \ - --enable-largefiles \ - --with-openssl=/usr \ - --with-perl \ - --with-python \ - --with-sendmail=/usr/bin/msmtp \ - --with-sasl=/usr \ - --with-news-user=9 \ - --with-news-group=13 - # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database - - test -f include/config.h - cat >>include/config.h <<EOF -#undef RUNASUSER -#define RUNASUSER "news" -#undef RUNASGROUP -#define RUNASGROUP "news" -EOF - sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global - [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH - - make -} - -package() { - cd $srcdir/inn-$pkgver - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH - - make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/etc/{conf,rc}.d - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - - cd $pkgdir/usr/lib - for i in lib*.a; do - gcc -shared -o ${i%%.a}.so.2.0.0 $i - for j in 2.0 2; do - ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j - done - done - - touch $pkgdir/var/db/inn/history{.dir,.hash,.index,} - - mkdir -p $pkgdir/usr/share/doc/inn $pkgdir/usr/share/inn/ - mv $pkgdir/usr/share/man/man3/list.3 $pkgdir/usr/share/man/man3/list-inn.3 - mv $pkgdir/usr/doc/* $pkgdir/usr/share/doc/inn/ - mv $pkgdir/usr/http/* $pkgdir/usr/share/inn/ - mv $pkgdir/usr/bin/archive $pkgdir/usr/bin/archive.inn - rm -rf $pkgdir/usr/doc $pkgdir/usr/http $pkgdir/var/run - install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE - chown root:root $pkgdir/usr/bin/innbind - chmod 05555 $pkgdir/usr/bin/innbind -} diff --git a/community-testing/inn/inn.install b/community-testing/inn/inn.install deleted file mode 100644 index e4070870f..000000000 --- a/community-testing/inn/inn.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- - grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- - - /usr/bin/makedbz -i -o 2>&- >&- - mkdir /var/log/news 2>&- >&- - - chown news:news -R var/spool/news 2>&- >&- - chown news:news var/log/news 2>&- >&- - chown news:news -R var/db/inn 2>&- >&- - - echo "" - echo "->" - echo "-> If this is a first-time installation, a minimal active file and" - echo "-> history database have been installed. Do not forget to update" - echo "-> your cron entries and configure INN. See INSTALL for more" - echo "-> information." - echo "->" - echo "-> The default user:group for inn is news:news" - echo "->" - echo "" -} diff --git a/community-testing/inn/innd.conf b/community-testing/inn/innd.conf deleted file mode 100644 index 48f96ba5e..000000000 --- a/community-testing/inn/innd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NEWS_USER=news -NEWS_GROUP=news diff --git a/community-testing/inn/innd.rc b/community-testing/inn/innd.rc deleted file mode 100644 index 5e36aec0d..000000000 --- a/community-testing/inn/innd.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd -[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; -[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; - -case "$1" in - start) - stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || { - mkdir -p /var/run/inn - chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn - } - su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - echo $! > /var/run/innd.pid - add_daemon innd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews" - ctlinnd throttle "shutting down" 2>&- >&- - su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- - rm /var/run/innd.pid - rm_daemon innd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/inn/nnrpd.conf b/community-testing/inn/nnrpd.conf deleted file mode 100644 index 689a289ce..000000000 --- a/community-testing/inn/nnrpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -USE_SSL=1 -LISTEN_PORT=563 -NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf" diff --git a/community-testing/inn/nnrpd.rc b/community-testing/inn/nnrpd.rc deleted file mode 100644 index d7c902832..000000000 --- a/community-testing/inn/nnrpd.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd -[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1; - -PID=`pidof -o %PPID nnrpd` -case "$1" in - start) - stat_busy "Starting InterNetNews Readers Daemon" - if [ ! -f /var/run/nnrpd.pid ]; then - stat_append ":: InterNetNews (innd) is not running" - stat_fail - exit 1 - fi - - [ -d /var/run/inn ] || mkdir -p /var/run/inn - [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID nnrpd` - echo $PID > /var/run/nnrpd.pid - add_daemon nnrpd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews Readers Daemon" - [ ! -z "$PID" ] && kill $PID >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/nnrpd.pid - rm_daemon nnrpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/inn/site.make.patch b/community-testing/inn/site.make.patch deleted file mode 100644 index 5af6e1162..000000000 --- a/community-testing/inn/site.make.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200 -+++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200 -@@ -52,7 +52,6 @@ - - PATH_ACTIVE = ${PATHDB}/active - PATH_ACTIVE_TIMES = ${PATHDB}/active.times --PATH_HISTORY = ${PATHDB}/history - PATH_NEWSGROUPS = ${PATHDB}/newsgroups - - ## Scripts from above, plus site-specific config files. -@@ -98,7 +97,7 @@ - ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) - - SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ -- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) -+ $D$(PATH_NEWSGROUPS) - - ## Get new versions of everything from samples directory. - all: $(ALL) config -@@ -143,12 +142,6 @@ - chown $(RUNASUSER) $@ - chgrp $(RUNASGROUP) $@ - chmod $(FILEMODE) $@ --$D$(PATH_HISTORY): -- touch $@ -- chown $(RUNASUSER) $@ -- chgrp $(RUNASGROUP) $@ -- chmod $(FILEMODE) $@ -- test -z "$D" && $(PATHBIN)/makedbz -i -o - - bootstrap: - diff --git a/community-testing/kvirc/PKGBUILD b/community-testing/kvirc/PKGBUILD deleted file mode 100644 index ea5174a22..000000000 --- a/community-testing/kvirc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 71366 2012-05-27 07:39:04Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=kvirc -pkgver=4.0.4 -pkgrel=5 -pkgdesc="Qt-based IRC client" -url="http://www.kvirc.net" -depends=('python2' 'qt' 'libxss' 'qtwebkit') -arch=(i686 x86_64) -makedepends=('cmake') -license=('GPL') -options=("!libtool") -install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 - kvirc-4.0.4-gcc-4.7.0.patch) -md5sums=('26fd24979ae4a29bac9309b3b0c98788' - '863e33f5b38f0b5124144e9a8b640e42') - -build() { - cd $srcdir - - # Fix build with GCC 4.7 - patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch" - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DWANT_KDE4=OFF \ - -DWANT_PERL=ON \ - -DWANT_PHONON=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=$pkgdir install -} diff --git a/community-testing/kvirc/kvirc-4.0.4-gcc-4.7.0.patch b/community-testing/kvirc/kvirc-4.0.4-gcc-4.7.0.patch deleted file mode 100644 index f122a29af..000000000 --- a/community-testing/kvirc/kvirc-4.0.4-gcc-4.7.0.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
-===================================================================
---- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 4667)
-+++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
-@@ -190,6 +190,6 @@
- QString artist;
- QString title;
-- foreach (QVariant v, reply.arguments()) {
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
-+ foreach (QVariant w, reply.arguments()) {
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
- QVariant v = qdbus_cast<QVariantMap>(arg);
- if (v.userType() == QVariant::Map) {
-Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
-===================================================================
---- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
-+++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6025)
-@@ -139,6 +139,6 @@
- return __return_if_fail; \
- MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
-- foreach (QVariant v, reply.arguments()) { \
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
-+ foreach (QVariant w, reply.arguments()) { \
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
- QVariant v = qdbus_cast<QVariantMap>(arg); \
- if (v.userType() == QVariant::Map) { \
-@@ -214,6 +214,6 @@
- MPRIS_CALL_METHOD("GetMetadata", "")
-
-- foreach (QVariant v, reply.arguments()) {
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
-+ foreach (QVariant w, reply.arguments()) {
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
- QVariant v = qdbus_cast<QVariantMap>(arg);
- if (v.userType() == QVariant::Map) {
-@@ -292,6 +292,6 @@
- MPRIS_CALL_METHOD("GetMetadata", -1)
-
-- foreach (QVariant v, reply.arguments()) {
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
-+ foreach (QVariant w, reply.arguments()) {
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
- QVariant v = qdbus_cast<QVariantMap>(arg);
- if (v.userType() == QVariant::Map) {
-@@ -353,6 +353,6 @@
- MPRIS_CALL_METHOD("GetMetadata", "")
-
-- foreach (QVariant v, reply.arguments()) {
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
-+ foreach (QVariant w, reply.arguments()) {
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
- QVariant v = qdbus_cast<QVariantMap>(arg);
- if (v.userType() == QVariant::Map) {
-@@ -404,6 +404,6 @@
- MPRIS_CALL_METHOD("GetMetadata", -1)
-
-- foreach (QVariant v, reply.arguments()) {
-- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
-+ foreach (QVariant w, reply.arguments()) {
-+ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
- QVariant v = qdbus_cast<QVariantMap>(arg);
- if (v.userType() == QVariant::Map) {
diff --git a/community-testing/kvirc/kvirc.install b/community-testing/kvirc/kvirc.install deleted file mode 100644 index 8f76d007f..000000000 --- a/community-testing/kvirc/kvirc.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - true -} - -post_upgrade() { - post_install -} - -pre_remove() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - true -} diff --git a/community-testing/libcec/PKGBUILD b/community-testing/libcec/PKGBUILD deleted file mode 100644 index 450194bda..000000000 --- a/community-testing/libcec/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71492 2012-05-27 13:14:39Z dreisner $ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> -# Contributor: Philippe Cherel <philippe.cherel@mayenne.org> - -pkgname=libcec -pkgver=1.6.3 -pkgrel=1 -pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" -arch=('i686' 'x86_64') -url="https://github.com/Pulse-Eight/libcec" -license=('GPL') -depends=('udev' 'lockdev') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-ab37938 -sha256sums=('964fb7ad2281b44dacddd57e5cfc16750271492cbbf48291ee487644d69bcb61') -options=(!libtool) - -build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - autoreconf -vif - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD deleted file mode 100644 index fd8b61ae9..000000000 --- a/community-testing/libvirt/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 71546 2012-05-28 16:42:48Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=libvirt -pkgver=0.9.12 -pkgrel=8 -pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" -arch=('i686' 'x86_64') -url="http://libvirt.org/" -license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' - 'kvm' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'radvd' - 'dmidecode') -options=('emptydirs' '!libtool') -backup=('etc/conf.d/libvirtd' - 'etc/conf.d/libvirtd-guests' - 'etc/libvirt/libvirtd.conf' - 'etc/libvirt/libvirt.conf' - 'etc/libvirt/qemu.conf' - 'etc/sasl2/libvirt.conf') -install="libvirt.install" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.rc.d - libvirtd.conf.d - libvirtd-guests.rc.d - libvirtd-guests.conf.d - libvirt.tmpfiles.d - openbsd-netcat-default.patch - libvirt-libnl3.patch) -md5sums=('5e842bc55733ceba60c64767580ff3e4' - 'c43244c40a0437038c82089618e7beaa' - '3ed0e24f5b5e25bf553f5427d64915e6' - '8297b1be794a24cc77f66af9380ace59' - 'bc2971dacdbac967fc3474e50affc345' - '8d98e62915785686b0b6c8c070628392' - 'b0be50eb9dfe4d133decf23b60880f7d' - 'ba27fbcd989de8d84cfff98326f10c54') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - export PYTHON=`which python2` - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - - patch -Np1 -i ${srcdir}/libvirt-libnl3.patch - aclocal - automake --add-missing || true - autoreconf - - export LDFLAGS=-lX11 - export RADVD=/usr/sbin/radvd - [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ - --with-init-script=systemd - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd - install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - - install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests - install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - - - install -dm0755 $pkgdir/usr/lib/sysctl.d - mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd - - # systemd stuff - install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf - mv $pkgdir/lib/* $pkgdir/usr/lib/ - - rm -rf \ - $pkgdir/var/run \ - $pkgdir/etc/rc.d/init.d \ - $pkgdir/etc/sysconfig \ - $pkgdir/lib \ - $pkgdir/etc/sysctl.d -} diff --git a/community-testing/libvirt/libvirt-libnl3.patch b/community-testing/libvirt/libvirt-libnl3.patch deleted file mode 100644 index 1e5f141b9..000000000 --- a/community-testing/libvirt/libvirt-libnl3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac ---- libvirt-0.9.12/configure.ac 2012-05-14 06:15:40.000000000 +0400 -+++ libvirt-0.9.12.my/configure.ac 2012-05-17 13:18:22.000000000 +0400 -@@ -71,7 +71,7 @@ - LIBCURL_REQUIRED="7.18.0" - OPENWSMAN_REQUIRED="2.2.3" - LIBPCAP_REQUIRED="1.0.0" --LIBNL_REQUIRED="1.1" -+LIBNL_REQUIRED="3.2" - LIBSSH2_REQUIRED="1.0" - LIBBLKID_REQUIRED="2.17" - DBUS_REQUIRED="1.0.0" -@@ -2652,21 +2652,9 @@ - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - have_libnl=yes - AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) -- AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) - PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) - LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" - LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" -- ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ -- have_libnl=yes -- AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], -- [whether the netlink library is available]) -- AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], -- [whether the netlink v1 library is available]) -- ], [ -- if test "$with_macvtap" = "yes"; then -- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) -- fi -- ]) - ]) - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) -diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am ---- libvirt-0.9.12/daemon/Makefile.am 2012-04-20 08:25:25.000000000 +0400 -+++ libvirt-0.9.12.my/daemon/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -96,6 +96,7 @@ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ - $(WARN_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ - -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" -diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am ---- libvirt-0.9.12/src/Makefile.am 2012-05-05 16:53:48.000000000 +0400 -+++ libvirt-0.9.12.my/src/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -16,6 +16,7 @@ - - AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ - $(LIBXML_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ - $(WIN32_EXTRA_CFLAGS) \ -diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c ---- libvirt-0.9.12/src/util/virnetdevmacvlan.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c 2012-05-17 13:25:21.000000000 +0400 -@@ -27,6 +27,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevmacvlan.h" - #include "virmacaddr.h" - #include "util.h" -diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c ---- libvirt-0.9.12/src/util/virnetdevvportprofile.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c 2012-05-17 13:27:54.000000000 +0400 -@@ -22,6 +22,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevvportprofile.h" - #include "virterror_internal.h" - -diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c ---- libvirt-0.9.12/src/util/virnetlink.c 2012-05-09 16:41:41.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.c 2012-05-17 13:38:08.000000000 +0400 -@@ -49,7 +49,7 @@ - - #define NETLINK_ACK_TIMEOUT_S 2 - --#if defined(__linux__) && defined(HAVE_LIBNL) -+#if defined(__linux__) && defined(HAVE_LIBNL3) - /* State for a single netlink event handle */ - struct virNetlinkEventHandle { - int watch; -diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h ---- libvirt-0.9.12/src/util/virnetlink.h 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.h 2012-05-17 13:27:37.000000000 +0400 -@@ -23,9 +23,10 @@ - # include "config.h" - # include "internal.h" - --# if defined(__linux__) && defined(HAVE_LIBNL) -+# if defined(__linux__) && defined(HAVE_LIBNL3) - - # include <netlink/msg.h> -+# include <stdint.h> - - # else - diff --git a/community-testing/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install deleted file mode 100644 index 3881386d2..000000000 --- a/community-testing/libvirt/libvirt.install +++ /dev/null @@ -1,38 +0,0 @@ -_libvirt_setup() { - rm -f /usr/lib/python?.?/site-packages/libvirt.pyc - echo ">>> To use libvirt as a non-root user:" - echo ">>> Use polkit to grant access." - echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." - echo ">>> (see unixperms.patch in PKGBUILD for help)" - echo "" -} - -post_install() { - _libvirt_setup || return 1 - echo ">>> Be sure to see optdepends as you may find some of them helpfull." - echo ">>> Especially: bridge-utils, dnsmasq, and hal." - echo "" - echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root." - echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" - echo ">>> booting." - echo "" - /bin/true -} - -post_upgrade() { - _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by running the command:" - echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." - echo ">>> You may also need to run 'rm -rf ~/.libvirt'" - echo "" - /bin/true -} - -post_remove() { - rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc - echo ">>> You may wish to delete the group 'libvirt' if it still exists." - echo ">>> It can be removed by running 'groupdel libvirt' as root." - echo "" - depmod -a - /bin/true -} diff --git a/community-testing/libvirt/libvirt.tmpfiles.d b/community-testing/libvirt/libvirt.tmpfiles.d deleted file mode 100644 index 0cec93271..000000000 --- a/community-testing/libvirt/libvirt.tmpfiles.d +++ /dev/null @@ -1,4 +0,0 @@ -d /var/run/libvirt/qemu 0755 root root - -d /var/run/libvirt/lxc 0755 root root - -d /var/run/libvirt/uml 0755 root root - -d /var/run/libvirt/network 0755 root root - diff --git a/community-testing/libvirt/libvirtd-guests.conf.d b/community-testing/libvirt/libvirtd-guests.conf.d deleted file mode 100644 index 02a933715..000000000 --- a/community-testing/libvirt/libvirtd-guests.conf.d +++ /dev/null @@ -1,11 +0,0 @@ -LIBVIRTD_STOP_ACTION=suspend - -#LIBVIRTD_URI="-c qemu+ssh://user@host/system" -LIBVIRTD_URI="" - -#LIBVIRTD_BYPASS_CACHE="--bypass-cache" -LIBVIRTD_BYPASS_CACHE="" - -LIBVIRTD_START_DELAY=0 - -LIBVIRTD_SHUTDOWN_TIMEOUT=3 diff --git a/community-testing/libvirt/libvirtd-guests.rc.d b/community-testing/libvirt/libvirtd-guests.rc.d deleted file mode 100644 index 670b5431a..000000000 --- a/community-testing/libvirt/libvirtd-guests.rc.d +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/libvirtd-guests -. /etc/rc.conf -. /etc/rc.d/functions - -LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" - -# get guest state by name -libvirt_get_guest_state() -{ - virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' -} - -# list IDs of running guests -libvirt_list() -{ - - list=$(virsh $LIBVIRTD_URI list) - - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - uuids= - for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then - RETVAL=1 - return 1 - fi - uuids="$uuids $uuid" - done - - echo $uuids - -} - -libvirt_domname() -{ - uuid=$1 - name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') - - echo $name -} - -# suspend guest by name -libvirt_suspend() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# shutdown guest by name -libvirt_shutdown() -{ - virsh $LIBVIRTD_URI shutdown "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# start guest by name -libvirt_start() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null -} - -# stop all guests -libvirt_stop_all() -{ - mkdir -p `dirname $LIBVIRTD_LISTFILE` - echo -n >$LIBVIRTD_LISTFILE - - for i in `libvirt_list`; do - name=`libvirt_domname $i` - if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$name guest" - libvirt_suspend "$i" - else - stat_busy "Shutting libvirtd/$i guest down" - libvirt_shutdown "$i" - fi - [ $? -eq 0 ] && stat_done || stat_fail - echo $i >>$LIBVIRTD_LISTFILE - done -} - -# start all guests -libvirt_start_all() -{ - if [ -f $LIBVIRTD_LISTFILE ]; then - for i in `cat $LIBVIRTD_LISTFILE`; do - name='libvirt_domname $i' - stat_busy "Starting/resuming libvirtd/$name guest" - libvirt_start "$i" - [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail - done - fi - rm -f $LIBVIRTD_LISTFILE -} - -# main -LC_ALL=C -LANG=C -case "$1" in - start) - libvirt_start_all - add_daemon libvirtd-guests - ;; - stop) - libvirt_stop_all - rm_daemon libvirtd-guests - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community-testing/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d deleted file mode 100644 index d4d25b47a..000000000 --- a/community-testing/libvirt/libvirtd.conf.d +++ /dev/null @@ -1,3 +0,0 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community-testing/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d deleted file mode 100644 index 193bffa9c..000000000 --- a/community-testing/libvirt/libvirtd.rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/libvirtd -. /etc/rc.d/functions - -LIBVIRTD_CONFIG_ARGS= -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" -fi - -PID=`pidof -o %PPID /usr/sbin/libvirtd` -case "$1" in - start) - stat_busy "Starting libvirtd" - export RADVD=/usr/sbin/radvd - for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do - [ -d $i ] || mkdir -p $i - done - [ -z "$PID" ] && ( - mkdir -p /var/{cache,run}/libvirt - rm -rf /var/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME \ - /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - ) - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon libvirtd - stat_done - fi - ;; - stop) - stat_busy "Stopping libvirtd" - [ ! -z "$PID" ] && ( - kill $PID &> /dev/null - rm -rf /var/cache/libvirt/* - rm -f /var/run/libvirtd.pid - ) - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon libvirtd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading libvirtd configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/community-testing/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch deleted file mode 100644 index a01b4f14e..000000000 --- a/community-testing/libvirt/openbsd-netcat-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c ---- libvirt-0.9.7/src/qemu/qemu_migration.c 2011-10-31 07:46:04.000000000 +0400 -+++ libvirt-0.9.7.my/src/qemu/qemu_migration.c 2011-11-08 15:46:10.000000000 +0400 -@@ -1589,7 +1589,7 @@ - spec->dest.unix_socket.file); - } else { - const char *args[] = { -- "nc", "-U", spec->dest.unix_socket.file, NULL -+ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL - }; - ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); - } -diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c ---- libvirt-0.9.7/src/remote/remote_driver.c 2011-11-08 07:53:30.000000000 +0400 -+++ libvirt-0.9.7.my/src/remote/remote_driver.c 2011-11-08 15:46:10.000000000 +0400 -@@ -614,7 +614,7 @@ - username, - !tty, - !verify, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - keyfile, - sockname))) - goto failed; -diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c ---- libvirt-0.9.7/src/rpc/virnetsocket.c 2011-11-08 07:53:30.000000000 +0400 -+++ libvirt-0.9.7.my/src/rpc/virnetsocket.c 2011-11-08 15:46:31.000000000 +0400 -@@ -642,7 +642,7 @@ - virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - - if (!netcat) -- netcat = "nc"; -+ netcat = "nc.openbsd"; - - virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); - diff --git a/community-testing/linux-tools/PKGBUILD b/community-testing/linux-tools/PKGBUILD deleted file mode 100644 index 58d729acd..000000000 --- a/community-testing/linux-tools/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 71368 2012-05-27 07:39:14Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=linux-tools -pkgname=('perf' 'cpupower') -pkgver=3.4 -pkgrel=2 -license=('GPL2') -arch=('i686' 'x86_64') -url='http://www.kernel.org' -options=('!strip') -makedepends=('asciidoc' 'xmlto') -# split packages need all package dependencies set manually in makedepends -makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') -source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" -# "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.4.xz" - 'cpupower.rc' - 'cpupower.conf' - 'cpupower.service') -md5sums=('967f72983655e2479f951195953e8480' - '73dbc931e86b3b73d6e2338dcbee81a4' - '857ccdd0598511e3bf4b63522754dc48' - '20870541e88109d2f153be3c58a277f1') - -build() { - # apply stable patching set - if [[ -e "$srcdir"/patch-* ]]; then - msg2 'Applying stable patch set' - patch -N -p1 -i "$srcdir"/patch-* - fi - - msg2 'Build perf' - pushd linux-$pkgver/tools/perf - make \ - DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ - PYTHON=python2 \ - NO_GTK2=1 \ - PERF_VERSION=$pkgver-$pkgrel \ - all man - popd - - msg2 'Build cpupower' - cd linux-$pkgver/tools/power/cpupower - # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} - make VERSION=$pkgver-$pkgrel -} - -package_perf() { - pkgdesc='Linux kernel performance auditing tool' - depends=('python2' 'libnewt' 'elfutils') - - cd linux-$pkgver/tools/perf - make \ - DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ - PYTHON=python2 \ - NO_GTK2=1 \ - PERF_VERSION=$pkgver-$pkgrel \ - install install-man -} - -package_cpupower() { - pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' - backup=('etc/conf.d/cpupower') - depends=('pciutils') - conflicts=('cpufrequtils') - - pushd linux-$pkgver/tools/power/cpupower - make \ - DESTDIR="$pkgdir" \ - mandir='/usr/share/man' \ - docdir='/usr/share/doc/cpupower' \ - install install-man - popd - # install rc.d script - install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower" - install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower" - install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/linux-tools/cpupower.conf b/community-testing/linux-tools/cpupower.conf deleted file mode 100644 index ee8602953..000000000 --- a/community-testing/linux-tools/cpupower.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Define CPUs governor -# valid governors: ondemand, performance, powersave, conservative, userspace. -#governor='ondemand' - -# Limit frequency range -# Valid suffixes: Hz, kHz (default), MHz, GHz, THz -#min_freq="2.25GHz" -#max_freq="3GHz" - -# Specific frequency to be set. -# Requires userspace governor to be available and loaded. -#freq= - -# Utilizes cores in one processor package/socket first before processes are -# scheduled to other processor packages/sockets. -# See man (1) CPUPOWER-SET for additional details. -#mc_scheduler= - -# Utilizes thread siblings of one processor core first before processes are -# scheduled to other cores. See man (1) CPUPOWER-SET for additional details. -#smp_scheduler= - -# Sets a register on supported Intel processore which allows software to convey -# its policy for the relative importance of performance versus energy savings to -# the processor. See man (1) CPUPOWER-SET for additional details. -#perf_bias= - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/linux-tools/cpupower.rc b/community-testing/linux-tools/cpupower.rc deleted file mode 100644 index 27a491e95..000000000 --- a/community-testing/linux-tools/cpupower.rc +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower - -case "$1" in - start|restart) - stat_busy "Setting cpupower rules" - declare -i fail=0 - - # frequency-set options - declare -a params=() - params+=(${governor:+-g $governor}) - params+=(${min_freq:+-d $min_freq}) - params+=(${max_freq:+-u $max_freq}) - params+=(${freq:+-f $freq}) - if ((${#params[@]} > 0)); then - cpupower frequency-set "${params[@]}" >/dev/null || fail=1 - fi - - # set options - declare -a params=() - params+=(${mc_scheduler:+-m $mc_scheduler}) - params+=(${smp_scheduler:+-s $smp_scheduler}) - params+=(${perf_bias:+-b $perf_bias}) - if ((${#params[@]} > 0)); then - cpupower set "${params[@]}" >/dev/null || fail=1 - fi - - # print failure if any - (($fail > 0)) && stat_fail && exit 1 || stat_done - ;; - *) - echo "usage: ${0##*/} {start|restart}" -esac - -true - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/linux-tools/cpupower.service b/community-testing/linux-tools/cpupower.service deleted file mode 100644 index f77cfdc97..000000000 --- a/community-testing/linux-tools/cpupower.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Apply cpupower configuration - -[Service] -Type=oneshot -ExecStart=/etc/rc.d/cpupower start -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/multipath-tools/PKGBUILD b/community-testing/multipath-tools/PKGBUILD deleted file mode 100644 index b4f134390..000000000 --- a/community-testing/multipath-tools/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 71548 2012-05-28 17:59:37Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> -# Contributor: Michael P <ptchinster@archlinux.us> -# Contributor: Matt Heagney <matt@heagney.com> - -pkgname=multipath-tools -pkgver=0.4.9 -pkgrel=8 -pkgdesc='Multipath tools for Linux' -arch=('i686' 'x86_64') -url="http://christophe.varoqui.free.fr/" -license=('GPL') -depends=('libaio' 'device-mapper') -backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') -install=multipath-tools.install -options=(!emptydirs) -source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 - multipath.conf multipath.conf.annotated multipathd.rc - fix-build.patch buffer-overflows.patch log_enquery_overflow.patch - blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch) -md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' - '9324ff0ba8330dcb21b2fcf64988026f' - 'be11462922eeeb9fcd2ba5f3f137b7d9' - '7c04ef96441363b0d43a2ebb13a87659' - '885c0ba9c90b73cc93aa3f78005f81d6' - 'c5aab36777b0304a3525533cdd31bddc' - '00eae05e02f1b85062e998574ab1b833' - '61b4038c4c145ca52e836145ea6bdd6c' - 'd99beb6d8a9b84f90125c7cacf8a6006') - -build() { - patch -Np1 -i fix-build.patch - patch -Np1 -i buffer-overflows.patch - patch -Np1 -i log_enquery_overflow.patch - patch -Np1 -i blacklist-cciss-devices.patch - patch -Np1 -i explicitly-include-posix_types.h.patch - - # Needs to be fixed upstream. Refer to - # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 - export LDFLAGS=${LDFLAGS/-Wl,--as-needed} - - make -} - -package() { - make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install - install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf - install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd -} diff --git a/community-testing/multipath-tools/blacklist-cciss-devices.patch b/community-testing/multipath-tools/blacklist-cciss-devices.patch deleted file mode 100644 index 497121c36..000000000 --- a/community-testing/multipath-tools/blacklist-cciss-devices.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Fri, 3 Oct 2008 12:39:48 +0200 -Subject: [PATCH] blacklist cciss devices - -cciss support isn't complete in 0.4.8 and the half functioning causes -problems in d-i among other things. -Closes: #500991 ---- - libmultipath/blacklist.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index f369517..2e5efc8 100644 ---- a/libmultipath/blacklist.c -+++ b/libmultipath/blacklist.c -@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf) - if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) - return 1; - -+ str = STRDUP("^cciss!c[0-9]d[0-9]*"); -+ if (!str) -+ return 1; -+ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) -+ return 1; -+ - vector_foreach_slot (conf->hwtable, hwe, i) { - if (hwe->bl_product) { - if (alloc_ble_device(conf->blist_device)) --- diff --git a/community-testing/multipath-tools/buffer-overflows.patch b/community-testing/multipath-tools/buffer-overflows.patch deleted file mode 100644 index 38719aceb..000000000 --- a/community-testing/multipath-tools/buffer-overflows.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c 2010-11-28 12:22:12.037228583 -0800 -@@ -94,7 +94,7 @@ - if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) - return 0; - -- snprintf(vendor, 9, "%.8s\n", inqBuffp + 8); -+ snprintf(vendor, 8, "%.8s\n", inqBuffp + 8); - snprintf(product, 17, "%.16s", inqBuffp + 16); - snprintf(luname, 21, "%.19s", inqBuffp + 36); - snprintf(wwpn, 17, "%.16s", inqBuffp + 96); ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c 2010-11-28 12:22:44.199483997 -0800 -@@ -123,7 +123,7 @@ - return -1; - } - -- snprintf (vendor, 9, "%.8s", inqBuffp + 8); -+ snprintf (vendor, 8, "%.8s", inqBuffp + 8); - snprintf (product, 17, "%.16s", inqBuffp + 16); - snprintf (serial, 5, "%.4s", inqBuffp + 40); - snprintf (ldev, 5, "%.4s", inqBuffp + 44); diff --git a/community-testing/multipath-tools/explicitly-include-posix_types.h.patch b/community-testing/multipath-tools/explicitly-include-posix_types.h.patch deleted file mode 100644 index 6cbbc3ba1..000000000 --- a/community-testing/multipath-tools/explicitly-include-posix_types.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sat, 5 Dec 2009 18:11:00 +0100 -Subject: [PATCH] explicitly include posix_types.h - -to get the correct type for __kernel_old_dev_t - -Closes: #558990 ---- - kpartx/lopart.c | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -Index: mpath/kpartx/lopart.c -=================================================================== ---- mpath.orig/kpartx/lopart.c 2012-02-09 18:02:23.808800332 +0530 -+++ mpath/kpartx/lopart.c 2012-02-09 18:15:24.400671080 +0530 -@@ -26,18 +26,7 @@ - #include <sys/stat.h> - #include <sys/mman.h> - #include <sysmacros.h> -- --#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \ -- || defined (__x86_64__) --typedef unsigned long __kernel_old_dev_t; --#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__)) --typedef unsigned int __kernel_old_dev_t; --#else --typedef unsigned short __kernel_old_dev_t; --#endif -- --#define dev_t __kernel_old_dev_t -- -+#include <asm/posix_types.h> - #include <linux/loop.h> - - #include "lopart.h" diff --git a/community-testing/multipath-tools/fix-build.patch b/community-testing/multipath-tools/fix-build.patch deleted file mode 100644 index ff8f6824c..000000000 --- a/community-testing/multipath-tools/fix-build.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -rupN upstream/Makefile.inc devel/Makefile.inc ---- upstream/Makefile.inc 2010-05-22 14:01:58.000000000 +0200 -+++ devel/Makefile.inc 2012-05-26 10:14:46.969786387 +0200 -@@ -32,11 +32,10 @@ rcdir = $(prefix)/etc/init.d - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath - --GZIP = /bin/gzip -9 -c - INSTALL_PROGRAM = install - --OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes --CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" - SHARED_FLAGS = -shared - - %.o: %.c -diff -rupN upstream/kpartx/Makefile devel/kpartx/Makefile ---- upstream/kpartx/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/Makefile 2012-05-26 10:23:38.909780754 +0200 -@@ -6,7 +6,7 @@ include ../Makefile.inc - - CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - --LDFLAGS = -ldevmapper -+LIBS = -ldevmapper - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o - EXEC = kpartx -@@ -14,22 +14,22 @@ EXEC = kpartx - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) - $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/kpartx/kpartx.rules devel/kpartx/kpartx.rules ---- upstream/kpartx/kpartx.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/kpartx.rules 2012-05-26 10:30:32.769776372 +0200 -@@ -27,9 +27,9 @@ ENV{DM_PART}=="?*", \ - - # Create dm tables for partitions - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - - LABEL="kpartx_end" - -diff -rupN upstream/multipath/Makefile devel/multipath/Makefile ---- upstream/multipath/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/Makefile 2012-05-26 10:22:38.819781391 +0200 -@@ -7,32 +7,30 @@ include ../Makefile.inc - OBJS = main.o - - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath - - EXEC = multipath - - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) - - uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -- rm $(DESTDIR)$(bindir)/$(EXEC) -- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz -- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules -+ rm -f $(DESTDIR)$(bindir)/$(EXEC) -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/multipath/multipath.rules devel/multipath/multipath.rules ---- upstream/multipath/multipath.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/multipath.rules 2012-05-26 10:17:34.849784609 +0200 -@@ -1,7 +1,24 @@ --# --# udev rules for multipathing. --# The persistent symlinks are created with the kpartx rules --# -+# multipath wants the devmaps presented as meaninglful device names -+# so name them after their devmap name -+SUBSYSTEM!="block", GOTO="end_mpath" - --# socket for uevents --SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" -+ENV{MPATH_SBIN_PATH}="/sbin" -+TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" -+ -+ACTION=="add", ENV{DEVTYPE}!="partition", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ -+ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}="1" -+ -+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \ -+ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" -+ -+RUN+="socket:/org/kernel/dm/multipath_event" -+KERNEL!="dm-*", GOTO="end_mpath" -+ACTION!="change", GOTO="end_mpath" -+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" -+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" -+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" -+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" -+RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" -+LABEL="end_mpath" -diff -rupN upstream/multipath-tools.spec.in devel/multipath-tools.spec.in ---- upstream/multipath-tools.spec.in 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath-tools.spec.in 2012-05-26 10:24:16.989780353 +0200 -@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT - %{prefix}/usr/share/man/man8/multipathd.8.gz - %{prefix}/usr/share/man/man5/multipath.conf.5.gz - %{prefix}/sbin/multipathd --%{prefix}/etc/udev/rules.d/multipath.rules --%{prefix}/etc/udev/rules.d/kpartx.rules -+%{prefix}/usr/lib/udev/rules.d/multipath.rules -+%{prefix}/usr/lib/udev/rules.d/kpartx.rules - %{prefix}/lib/udev/kpartx_id - %{prefix}/lib/multipath/*.so - -diff -rupN upstream/multipathd/Makefile devel/multipathd/Makefile ---- upstream/multipathd/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipathd/Makefile 2012-05-26 10:14:46.969786387 +0200 -@@ -6,8 +6,8 @@ include ../Makefile.inc - # basic flags setting - # - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ -- -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ -+ -L$(multipathdir) -lmultipath - - # - # debuging stuff -@@ -28,21 +28,20 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt. - all : $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(rcdir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) - diff --git a/community-testing/multipath-tools/log_enquery_overflow.patch b/community-testing/multipath-tools/log_enquery_overflow.patch deleted file mode 100644 index 67367c9f4..000000000 --- a/community-testing/multipath-tools/log_enquery_overflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Miskiewicz <arekm@maven.pl> -Date: Sat, 27 Nov 2010 19:21:21 +0100 -Subject: [PATCH] multipath-tools overflow - -On Saturday 27 of November 2010, you wrote: - -[...] - -> the whole logarea is memset to 0 by logarea_init(), and each dequeued -> message is also memset to 0 by log_dequeue(), so it seems normal that -> msg->str value is 0x0, but it's really its address that matters. - -Ok, got it. Pointers, memory areas in my debugging session - are looking -good then. - -> -> It's not clear to me : are you actually hitting a bug or is it your -> debug session that puzzles you ? - -I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think -the bug is strcpy usage instead of memcpy because I'm building with --O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow -detection. - -That detection seem to be smart enough to know that &str area is not -a string memory and aborts the program. - -Found similar problem discussed here -http://sourceware.org/ml/binutils/2005-11/msg00308.html - -glibc aborts the program: -[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24}, -{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9 -/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117 - -same for valgrind: -**13436** *** strcpy_chk: buffer overflow detected ***: program terminated -==13436== at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477) -==13436== by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781) -==13436== by 0x40EDC06: log_enqueue (string3.h:107) -==13436== by 0x40ED68A: log_safe (log_pthread.c:24) -==13436== by 0x40E296A: dlog (debug.c:36) -==13436== by 0x804ECEC: pidfile_create (pidfile.c:37) -==13436== by 0x804E731: main (main.c:1424) - -The bug is not visible if I run multipathd in debug mode (-d). - -This patch fixes the problem for me by avoiding false positive on strcpy_chk. ---- - libmultipath/log.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libmultipath/log.c b/libmultipath/log.c -index e56e46b..57b7696 100644 ---- a/libmultipath/log.c -+++ b/libmultipath/log.c -@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap) - la->empty = 0; - msg = (struct logmsg *)la->tail; - msg->prio = prio; -- strcpy((void *)&msg->str, buff); -+ memcpy((void *)&msg->str, buff, strlen(buff) + 1); - lastmsg->next = la->tail; - msg->next = la->head; - --- -1.7.6.5 - diff --git a/community-testing/multipath-tools/multipath-tools.install b/community-testing/multipath-tools/multipath-tools.install deleted file mode 100644 index fa58bbc35..000000000 --- a/community-testing/multipath-tools/multipath-tools.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - - echo " * For full functonality ensure that the dm_multipath kernel module is loaded" -} diff --git a/community-testing/multipath-tools/multipath.conf b/community-testing/multipath-tools/multipath.conf deleted file mode 100644 index 6dacf093d..000000000 --- a/community-testing/multipath-tools/multipath.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Very Basic Multipath Configuration File -# - -defaults { - getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" -} - diff --git a/community-testing/multipath-tools/multipath.conf.annotated b/community-testing/multipath-tools/multipath.conf.annotated deleted file mode 100644 index b79488413..000000000 --- a/community-testing/multipath-tools/multipath.conf.annotated +++ /dev/null @@ -1,362 +0,0 @@ -## -## This is a template multipath-tools configuration file -## Uncomment the lines relevent to your environment -## -# -## -## name : defaults -## desc : multipath-tools default settings -## -#defaults { -# # -# # name : udev_dir -# # desc : directory where udev creates its device nodes -# # default : /dev -# # -# udev_dir /dev -# -# # -# # name : polling_interval -# # scope : multipathd -# # desc : interval between two path checks in seconds -# # default : 5 -# # -# polling_interval 10 -# -# # -# # name : selector -# # scope : multipath -# # desc : the default path selector algorithm to use -# # these algorithms are offered by the kernel multipath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# selector "round-robin 0" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : the default path grouping policy to apply to unspecified -# # multipaths -# # default : multibus -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a path -# # priority value. The ALUA bits in SPC-3 provide an -# # exploitable prio value for example. "none" is a valid value -# # default : (null) -# # -# #prio_callout "/bin/true" -# -# # -# # name : path_checker -# # scope : multipath & multipathd -# # desc : the default method used to determine the paths' state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# #path_checker directio -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : rr_weight -# # scope : multipath -# # desc : if set to priorities the multipath configurator will assign -# # path weights as "path prio * rr_min_io" -# # values : priorities|uniform -# # default : uniform -# # -# rr_weight priorities -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : user_friendly_names -# # scope : multipath -# # desc : If set to "yes", using the bindings file -# # /var/lib/multipath/bindings to assign a persistent and -# # unique alias to the multipath, in the form of mpath<n>. -# # If set to "no" use the WWID as the alias. In either case -# # this be will be overriden by any specific aliases in this -# # file. -# # values : yes|no -# # default : no -# user_friendly_names no -# -#} -# -## -## name : blacklist -## scope : multipath & multipathd -## desc : list of device names to discard as not multipath candidates -## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop -## -#blacklist { -# wwid 26353900f02796769 -# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" -# devnode "^hd[a-z][[0-9]*]" -# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" -# device { -# vendor DEC.* -# product MSA[15]00 -# } -#} -## -## name : blacklist_exceptions -## scope : multipath & multipathd -## desc : list of device names to be treated as multipath candidates -## even if they are on the blacklist. -## Note: blacklist exceptions are only valid in the same class. -## It is not possible to blacklist devices using the devnode keyword -## and to exclude some devices of them using the wwid keyword. -## default : - -## -#blacklist_exceptions { -# devnode "^dasd[c-d]+[0-9]*" -# wwid "IBM.75000000092461.4d00.34" -# wwid "IBM.75000000092461.4d00.35" -# wwid "IBM.75000000092461.4d00.36" -#} -# -## -## name : multipaths -## scope : multipath & multipathd -## desc : list of multipaths finest-grained settings -## -#multipaths { -# # -# # name : multipath -# # scope : multipath & multipathd -# # desc : container for settings that apply to one specific multipath -# # -# multipath { -# # -# # name : wwid -# # scope : multipath & multipathd -# # desc : index of the container -# # -# wwid 3600508b4000156d700012000000b0000 -# -# # -# # name : alias -# # scope : multipath -# # desc : symbolic name for the multipath -# # -# alias yellow -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to this multipath -# # values : failover, multibus, group_by_serial -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# # path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# } -# multipath { -# wwid 1DEC_____321816758474 -# alias red -# rr_weight priorities -# } -#} -# -## -## name : devices -## scope : multipath & multipathd -## desc : list of per storage controller settings -## overrides default settings (device_maps block) -## overriden by per multipath settings (multipaths block) -## -#devices { -# # -# # name : device -# # scope : multipath & multipathd -# # desc : settings for this specific storage controller -# # -# device { -# # -# # name : vendor, product -# # scope : multipath & multipathd -# # desc : index for the block -# # -# vendor "COMPAQ " -# product "HSV110 (C)COMPAQ" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to multipath hosted -# # by this storage controller -# # values : failover = 1 path per priority group -# # multibus = all valid paths in 1 priority -# # group -# # group_by_serial = 1 priority group per detected -# # serial number -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a path -# # weight. Weights are summed for each path group to -# # determine the next PG to use case of failure. -# # "none" is a valid value. -# # default : no callout, all paths equals -# # -# prio_callout "/sbin/mpath_prio_balance_units %d" -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback 30 -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : product_blacklist -# # scope : multipath & multipathd -# # desc : product strings to blacklist for this vendor -# # default : none -# # -# product_blacklist LUN_Z -# } -# device { -# vendor "COMPAQ " -# product "MSA1000 " -# path_grouping_policy multibus -# path_checker tur -# rr_weight priorities -# } -#} diff --git a/community-testing/multipath-tools/multipathd.rc b/community-testing/multipath-tools/multipathd.rc deleted file mode 100644 index 7f5ef5d6a..000000000 --- a/community-testing/multipath-tools/multipathd.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting multipathd" - /usr/bin/multipathd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon multipathd - stat_done - fi - ;; - stop) - stat_busy "Stopping multipathd" - [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon multipathd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/pcsc-perl/PKGBUILD b/community-testing/pcsc-perl/PKGBUILD deleted file mode 100644 index 7d4f3229c..000000000 --- a/community-testing/pcsc-perl/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71370 2012-05-27 07:39:18Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> -# Contributor: marc0s <marc0s@fsfe.org> - -pkgname=pcsc-perl -pkgver=1.4.12 -pkgrel=3 -pkgdesc="A Perl Module for PC/SC SmartCard access" -arch=('i686' 'x86_64') -url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" -license=('GPL' 'PerlArtistic') -depends=('pcsclite' 'perl') -makedepends=('pkgconfig') -options=('!emptydirs') -source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f34c5ab748815bf0b2e571362b4f8121') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/pcsclite/PKGBUILD b/community-testing/pcsclite/PKGBUILD deleted file mode 100644 index 985cef395..000000000 --- a/community-testing/pcsclite/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 71496 2012-05-27 13:15:03Z dreisner $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> - -pkgname=pcsclite -pkgver=1.8.3 -pkgrel=3 -pkgdesc="PC/SC Architecture smartcard middleware library" -arch=('i686' 'x86_64') -url="https://alioth.debian.org/projects/pcsclite/" -license=('BSD') -depends=('python') -makedepends=('pkg-config') -options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2" - 'pcscd') -md5sums=('7ad8c97c89f77aab7a00317eb7e811e9' - 'c97b6bce695222efb0f003d8e8369010') - -build() { - cd "${srcdir}/pcsc-lite-${pkgver}" - - ./configure --prefix=/usr \ - --enable-libudev \ - --sysconfdir=/etc \ - --enable-ipcdir=/run/pcscd \ - --enable-usbdropdir=/usr/lib/pcsc/drivers \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - make -} - -package() { - cd "${srcdir}/pcsc-lite-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd - install -d ${pkgdir}/usr/lib/pcsc/drivers -} diff --git a/community-testing/pcsclite/pcscd b/community-testing/pcsclite/pcscd deleted file mode 100644 index 1dc5e0166..000000000 --- a/community-testing/pcsclite/pcscd +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/sbin/pcscd -NAME=pcscd -DESC="PC/SC smart card daemon" -PID_FILE=/run/pcscd/pcscd.pid -PCSCD_OPTIONS= - -case "$1" in - start) - stat_busy "Starting $DESC" - $DAEMON $PCSCD_OPTIONS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $NAME - stat_done - fi - ;; - - stop) - stat_busy "Stopping $DESC" - [ -f $PID_FILE ] && kill `cat $PID_FILE` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $NAME status"; - ck_status $NAME - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" - ;; - -esac - -exit 0 - diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD deleted file mode 100644 index 86975e92c..000000000 --- a/community-testing/perl-berkeleydb/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71682 2012-06-01 10:38:28Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-berkeleydb -pkgver=0.50 -pkgrel=4 -pkgdesc="Interface to Berkeley DB version 2, 3 or 4" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/BerkeleyDB/" -license=('GPL' 'PerlArtistic') -depends=('perl' 'db') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('6afc8f49133c262c606d1b96e1412863') - -build() { - cd $srcdir/BerkeleyDB-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` - depends=('perl' "db=$_dbver") - - cd $srcdir/BerkeleyDB-$pkgver - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-class-methodmaker/PKGBUILD b/community-testing/perl-class-methodmaker/PKGBUILD deleted file mode 100644 index 1bfbb91bf..000000000 --- a/community-testing/perl-class-methodmaker/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 71374 2012-05-27 07:39:26Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-class-methodmaker -pkgver=2.18 -pkgrel=6 -pkgdesc="Create generic class methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Class-MethodMaker" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") -md5sums=('99435d78e0a1754b102fe39597c6c3df') - -build() { - cd $srcdir/Class-MethodMaker-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-clone/PKGBUILD b/community-testing/perl-clone/PKGBUILD deleted file mode 100644 index 21a131b25..000000000 --- a/community-testing/perl-clone/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: François Charette <firmicus ατ gmx δοτ net> -# Contributor: Alex Dioso <adioso->gmail*com> - -pkgname=perl-clone -pkgver=0.31 -pkgrel=5 -pkgdesc='Recursive copy of nested objects.' -arch=('i686' 'x86_64') -url='http://search.cpan.org/~RDF/Clone' -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz") -md5sums=('65f34e7280d7b7dfb72ab6224e5767f5') - -build() { - cd Clone-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Clone-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-blowfish/PKGBUILD b/community-testing/perl-crypt-blowfish/PKGBUILD deleted file mode 100644 index 46632d24f..000000000 --- a/community-testing/perl-crypt-blowfish/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 71378 2012-05-27 07:39:34Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-crypt-blowfish -pkgver=2.12 -pkgrel=5 -pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Crypt-Blowfish" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') - -build() { - cd $srcdir/Crypt-Blowfish-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-des/PKGBUILD b/community-testing/perl-crypt-des/PKGBUILD deleted file mode 100644 index f3e44d110..000000000 --- a/community-testing/perl-crypt-des/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 71380 2012-05-27 07:39:39Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -#Contributor: Pete Morris <pete dot morris at gmail dot com> -pkgname=perl-crypt-des -pkgver=2.05 -pkgrel=5 -pkgdesc="Perl DES encryption module" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dparis/Crypt-DES" -license=("GPL" "PerlArtistic") -depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') -build() { - cd Crypt-DES-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=${pkgdir} - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-curses/PKGBUILD b/community-testing/perl-curses/PKGBUILD deleted file mode 100644 index e140e7e6b..000000000 --- a/community-testing/perl-curses/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 71382 2012-05-27 07:39:43Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-curses -pkgver=1.28 -pkgrel=5 -pkgdesc="Character screen handling and windowing" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Curses" -license=('GPL' 'PerlArtistic') -depends=('perl' 'ncurses') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-$pkgver.tgz) -md5sums=('ed9f7ddf2d90f4266da91c3dc9fad9c9') - -build() { - cd $srcdir/Curses-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-data-structure-util/PKGBUILD b/community-testing/perl-data-structure-util/PKGBUILD deleted file mode 100644 index a94e14843..000000000 --- a/community-testing/perl-data-structure-util/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 71384 2012-05-27 07:39:47Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-data-structure-util -pkgver=0.15 -pkgrel=6 -pkgdesc="Perl/CPAN Module Data::Structure::Util" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Data-Structure-Util" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/Data-Structure-Util-$pkgver.tar.gz") -md5sums=('e12ba777c0abfbd79a131de28d542359') - -build() { - cd $srcdir/Data-Structure-Util-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-datetime/PKGBUILD b/community-testing/perl-datetime/PKGBUILD deleted file mode 100644 index a75b666d1..000000000 --- a/community-testing/perl-datetime/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 71386 2012-05-27 07:39:51Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-datetime -pkgver=0.72 -pkgrel=2 -pkgdesc="A complete, easy to use date and time object" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DateTime" -license=('GPL' 'PerlArtistic') -depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' - 'perl-params-validate>=0.76' 'perl-math-round') -LC_NUMERIC=C -provides=("perl-datetime=`printf %.4f $pkgver`") -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') - -build() { - cd $srcdir/DateTime-$pkgver - perl Build.PL installdirs=vendor destdir="$pkgdir/" - ./Build -} - -check() { - cd $srcdir/DateTime-$pkgver -# ./Build test - true -} - -package() { - cd $srcdir/DateTime-$pkgver - ./Build install - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-dbd-odbc/PKGBUILD b/community-testing/perl-dbd-odbc/PKGBUILD deleted file mode 100644 index 701197bf0..000000000 --- a/community-testing/perl-dbd-odbc/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71388 2012-05-27 07:39:55Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-dbd-odbc -pkgver=1.37 -pkgrel=2 -pkgdesc="ODBC Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-ODBC/" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi' 'perl' 'unixodbc') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") -md5sums=('0c294f8e3365c841dcee8a0ba4671c99') - -build() { - cd DBD-ODBC-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd DBD-ODBC-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-dbd-pg/PKGBUILD b/community-testing/perl-dbd-pg/PKGBUILD deleted file mode 100644 index 4a0cc32a6..000000000 --- a/community-testing/perl-dbd-pg/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71390 2012-05-27 07:39:59Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-dbd-pg -pkgver=2.19.2 -pkgrel=2 -pkgdesc="Postgres Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-Pg" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.52' 'postgresql-libs') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") -md5sums=('67c859593e40959b42b3ef23ce6b581e') - -build() { - cd DBD-Pg-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd DBD-Pg-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-dbd-sqlite2/PKGBUILD b/community-testing/perl-dbd-sqlite2/PKGBUILD deleted file mode 100644 index 25a63419d..000000000 --- a/community-testing/perl-dbd-sqlite2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71392 2012-05-27 07:40:03Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-dbd-sqlite2 -pkgver=0.33 -pkgrel=9 -pkgdesc="Perl/CPAN Module DBD::SQLite2" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/DBD-SQLite2" -license=("GPL" "PerlArtistic") -depends=("perl-dbi") -source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") -md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') - -build() { - cd DBD-SQLite2-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd DBD-SQLite2-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-dbd-sybase/PKGBUILD b/community-testing/perl-dbd-sybase/PKGBUILD deleted file mode 100644 index 1d0009d64..000000000 --- a/community-testing/perl-dbd-sybase/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71394 2012-05-27 07:40:07Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-dbd-sybase -pkgver=1.14 -pkgrel=2 -pkgdesc="Sybase Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-Sybase/" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") -md5sums=('db6662d710b3adffe37bd8aec8060eda') - -build() { - cd $srcdir/DBD-Sybase-${pkgver} - export SYBASE=/usr - echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/DBD-Sybase-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-device-serialport/PKGBUILD b/community-testing/perl-device-serialport/PKGBUILD deleted file mode 100644 index a6c38f6ee..000000000 --- a/community-testing/perl-device-serialport/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 71396 2012-05-27 07:40:11Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ross melin <rdmelin@gmail.com> - -pkgname=perl-device-serialport -pkgver=1.04 -pkgrel=4 -pkgdesc="POSIX clone of Win32::SerialPort" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Device-SerialPort" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/C/CO/COOK/Device-SerialPort-$pkgver.tar.gz) -md5sums=('82c698151f934eb28c65d1838cee7d9e') - -build() { - cd $srcdir/Device-SerialPort-$pkgver - eval `perl -V:archname` - PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor - make - make DESTDIR=$pkgdir install - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-file-rsyncp/PKGBUILD b/community-testing/perl-file-rsyncp/PKGBUILD deleted file mode 100644 index 7c237c6c2..000000000 --- a/community-testing/perl-file-rsyncp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71398 2012-05-27 07:40:15Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=perl-file-rsyncp -pkgver=0.70 -pkgrel=2 -pkgdesc='Perl interface to rsync file list encoding and decoding' -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -options=('!emptydirs' '!makeflags') -url='http://search.cpan.org/dist/File-RsyncP' -source=("http://search.cpan.org/CPAN/authors/id/C/CB/CBARRATT/File-RsyncP-$pkgver.tar.gz") -md5sums=('f244372d15a2991b8700f62e73ac51e4') - -build() { - cd File-RsyncP-$pkgver - USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd File-RsyncP-$pkgver - make test -} - -package() { - cd File-RsyncP-$pkgver - make install DESTDIR="$pkgdir/" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/perl-fuse/PKGBUILD b/community-testing/perl-fuse/PKGBUILD deleted file mode 100644 index 29c16106f..000000000 --- a/community-testing/perl-fuse/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71400 2012-05-27 07:40:19Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-fuse -pkgver=0.14 -pkgrel=2 -pkgdesc="write filesystems in Perl using FUSE" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Fuse" -depends=('perl' 'fuse') -license=('GPL') -source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) -md5sums=('df72f17bf03e1a31c1a834816a3a59f1') - -build() { - cd $srcdir/Fuse-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/Fuse-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-gd/PKGBUILD b/community-testing/perl-gd/PKGBUILD deleted file mode 100644 index ff2ad7043..000000000 --- a/community-testing/perl-gd/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71402 2012-05-27 07:40:23Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> - -pkgname=perl-gd -pkgver=2.46 -pkgrel=3 -pkgdesc="Interface to Gd Graphics Library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GD" -license=('GPL' 'PerlArtistic') -depends=('gd') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) -md5sums=('ea86a94eb45330eae27ecbfd5c2f43bb') - -build() { - cd $srcdir/GD-$pkgver - unset CFLAGS - unset LDFLAGS - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make CCFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -} -package() { - cd $srcdir/GD-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-gnome2-wnck/PKGBUILD b/community-testing/perl-gnome2-wnck/PKGBUILD deleted file mode 100644 index 066d9411a..000000000 --- a/community-testing/perl-gnome2-wnck/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71404 2012-05-27 07:40:27Z bluewind $ -# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=perl-gnome2-wnck -pkgver=0.16 -pkgrel=6 -pkgdesc="Perl interface to the Window Navigator Construction Kit" -arch=('i686' 'x86_64') -license=("GPL" "PerlArtistic") -url="http://search.cpan.org/dist/Gnome2-Wnck" -depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") -md5sums=('439f4569ffd7af96ef1d3feaab23760e') - -build() { - cd Gnome2-Wnck-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Gnome2-Wnck-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gssapi/PKGBUILD b/community-testing/perl-gssapi/PKGBUILD deleted file mode 100644 index 05836e8af..000000000 --- a/community-testing/perl-gssapi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71406 2012-05-27 07:40:31Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-gssapi -pkgver=0.28 -pkgrel=6 -pkgdesc="Perl/CPAN Module GSSAPI" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/GSSAPI" -license=("GPL" "PerlArtistic") -depends=('krb5') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-${pkgver}.tar.gz") -md5sums=('65f00a0749212af064289c8a05e59b3f') - -build() { - cd GSSAPI-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GSSAPI-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gstreamer-interfaces/PKGBUILD b/community-testing/perl-gstreamer-interfaces/PKGBUILD deleted file mode 100644 index 9947fa89b..000000000 --- a/community-testing/perl-gstreamer-interfaces/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71410 2012-05-27 07:40:39Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer-interfaces -pkgver=0.06 -pkgrel=5 -pkgdesc="GStreamer::Interfaces" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer-Interfaces" -license=('GPL' 'PerlArtistic') -depends=('glib-perl' 'gstreamer0.10-base' 'perl-extutils-pkgconfig' 'perl-gstreamer' 'perl-extutils-depends') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-Interfaces-${pkgver}.tar.gz") -md5sums=('aa9583a484fa6829935b360887ecda45') - -build() { - cd GStreamer-Interfaces-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GStreamer-Interfaces-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gstreamer/PKGBUILD b/community-testing/perl-gstreamer/PKGBUILD deleted file mode 100644 index 5d6ac2836..000000000 --- a/community-testing/perl-gstreamer/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71408 2012-05-27 07:40:35Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer -pkgver=0.17 -pkgrel=1 -pkgdesc="Interface to the GStreamer library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer" -license=('GPL' 'PerlArtistic') -depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz) -md5sums=('8fe097daf0e2534452a3f69af05ec9fd') - -build() { - cd GStreamer-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd GStreamer-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-sexy/PKGBUILD b/community-testing/perl-gtk2-sexy/PKGBUILD deleted file mode 100644 index 37450bd09..000000000 --- a/community-testing/perl-gtk2-sexy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71412 2012-05-27 07:40:43Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Charles Mauch <cmauch@gmail.com> -# Creator: Florian Ragwitz <http://search.cpan.org/~/> - -pkgname=perl-gtk2-sexy -pkgver=0.05 -pkgrel=7 -pkgdesc="Perl/CPAN Module Gtk2::Sexy" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-Sexy" -license=('GPL' 'PerlArtistic') -depends=('gtk2' 'libsexy') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl') -options=(docs !emptydirs) -source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz") -md5sums=('3e291808250d7b956ba8443013a1b461') - -build() { - cd Gtk2-Sexy-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Gtk2-Sexy-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-trayicon/PKGBUILD b/community-testing/perl-gtk2-trayicon/PKGBUILD deleted file mode 100644 index 765346183..000000000 --- a/community-testing/perl-gtk2-trayicon/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71414 2012-05-27 07:40:47Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-gtk2-trayicon -pkgver=0.06 -pkgrel=9 -pkgdesc="Perl interface to the EggTrayIcon library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-TrayIcon/" -depends=('gtk2-perl') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -license=("GPL") -options=('!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz") -md5sums=('522c328f14681a25d76eeaf317e05049') - -build() { - cd Gtk2-TrayIcon-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Gtk2-TrayIcon-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-webkit/PKGBUILD b/community-testing/perl-gtk2-webkit/PKGBUILD deleted file mode 100644 index 3ada07b18..000000000 --- a/community-testing/perl-gtk2-webkit/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71416 2012-05-27 07:40:51Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gtk2-webkit -pkgver=0.09 -pkgrel=3 -pkgdesc="Gtk2::WebKit" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-WebKit" -license=('GPL' 'PerlArtistic') -depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz) -md5sums=('e696fc2b15d6189370e19bce9a9e56f3') - -build() { - cd Gtk2-WebKit-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Gtk2-WebKit-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-html-strip/PKGBUILD b/community-testing/perl-html-strip/PKGBUILD deleted file mode 100644 index ec6c149ef..000000000 --- a/community-testing/perl-html-strip/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71418 2012-05-27 07:40:55Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-html-strip -pkgver=1.06 -pkgrel=8 -pkgdesc="Perl/CPAN Module HTML::Strip" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~kilinrax/HTML-Strip/" -license=("GPL" "PerlArtistic") -depends=('perl') -source=("http://www.cpan.org/authors/id/K/KI/KILINRAX/HTML-Strip-$pkgver.tar.gz") -md5sums=('ceeacef0c7c31983e3a991e77bb58b45') -options=('!emptydirs') - -build() { - cd $srcdir/HTML-Strip-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/HTML-Strip-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-inline-java/PKGBUILD b/community-testing/perl-inline-java/PKGBUILD deleted file mode 100644 index 6fce37ba5..000000000 --- a/community-testing/perl-inline-java/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71420 2012-05-27 07:40:59Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> - -pkgname=perl-inline-java -pkgver=0.53 -pkgrel=4 -pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." -arch=('i686' 'x86_64') -depends=('perl' 'perl-inline' 'java-runtime') -makedepends=('java-environment') -license=("GPL" "PerlArtistic") -url="http://search.cpan.org/dist/Inline-Java" -source=(http://search.cpan.org/CPAN/authors/id/P/PA/PATL/Inline-Java-$pkgver.tar.gz) -md5sums=('23f96c2ac4915302c3647c0abc92916f') -options=('!emptydirs') - -build() { - cd $srcdir/Inline-Java-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor J2SDK=$J2SDKDIR - make java - make -} -package() { - cd $srcdir/Inline-Java-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-io-dirent/PKGBUILD b/community-testing/perl-io-dirent/PKGBUILD deleted file mode 100644 index 77470e22f..000000000 --- a/community-testing/perl-io-dirent/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71422 2012-05-27 07:41:03Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=perl-io-dirent -pkgver=0.05 -pkgrel=2 -pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url='http://search.cpan.org/~scottw/IO-Dirent/' -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCOTTW/IO-Dirent-$pkgver.tar.gz") -md5sums=('248ab22c31a310c3482fd99592ae550c') - -build() { - cd IO-Dirent-$pkgver - USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd IO-Dirent-$pkgver - make test -} - -package() { - cd IO-Dirent-$pkgver - make install DESTDIR="$pkgdir/" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/perl-io-tty/PKGBUILD b/community-testing/perl-io-tty/PKGBUILD deleted file mode 100644 index 138103958..000000000 --- a/community-testing/perl-io-tty/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71424 2012-05-27 07:41:07Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-io-tty -pkgver=1.10 -pkgrel=2 -pkgdesc="Provide an interface to TTYs and PTYs" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/IO-Tty/" -license=("GPL" "PerlArtistic") -depends=('glibc') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/IO-Tty-$pkgver.tar.gz") -md5sums=('46baec86a145e57f0ec661fa412b097c') - -build() { - cd $srcdir/IO-Tty-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package(){ - cd $srcdir/IO-Tty-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-json-xs/PKGBUILD b/community-testing/perl-json-xs/PKGBUILD deleted file mode 100644 index 436380711..000000000 --- a/community-testing/perl-json-xs/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71426 2012-05-27 07:41:11Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tor Krill <tor@krill.nu> - -pkgname=perl-json-xs -pkgver=2.32 -pkgrel=2 -pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" -url="http://search.cpan.org/dist/JSON-XS/" -license=("GPL") -arch=('i686' 'x86_64') -depends=('perl' 'perl-common-sense') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('87f71c78010083ad4d158b5765c4a609') - -build() { - cd $srcdir/JSON-XS-$pkgver -# eval `perl -V:archname` - perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/JSON-XS-$pkgver - make DESTDIR=$pkgdir install - - find $pkgdir -name '.packlist' -delete && \ - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-libapreq2/PKGBUILD b/community-testing/perl-libapreq2/PKGBUILD deleted file mode 100644 index 0205c166f..000000000 --- a/community-testing/perl-libapreq2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71428 2012-05-27 07:41:15Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-libapreq2 -pkgver=2.13 -pkgrel=3 -pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/libapreq2" -depends=('mod_perl' 'apr-util') -makedepends=('perl-extutils-xsbuilder') -license=("GPL") -options=('!libtool' '!makeflags') -source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz) -md5sums=('c11fb0861aa84dcc6cd0f0798b045eee') - -build() { - cd $srcdir/libapreq2-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs - find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \; - sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config - make -} -package(){ - cd $srcdir/libapreq2-$pkgver - make install DESTDIR=$pkgdir - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-linux-pid/PKGBUILD b/community-testing/perl-linux-pid/PKGBUILD deleted file mode 100644 index 343cba886..000000000 --- a/community-testing/perl-linux-pid/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 71430 2012-05-27 07:41:19Z bluewind $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Generator : CPANPLUS::Dist::Arch 1.12 - -pkgname='perl-linux-pid' -pkgver='0.04' -pkgrel='2' -pkgdesc="Interface to Linux getpp?id functions" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -depends=('perl') -url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz') -md5sums=('130c4d299f827abf1f2285fddf03fccb') -_distdir="${srcdir}/Linux-Pid-0.04" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - cd "$_distdir" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - make test - ) -} - -package() { - cd "$_distdir" - make install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - diff --git a/community-testing/perl-mail-box-parser-c/PKGBUILD b/community-testing/perl-mail-box-parser-c/PKGBUILD deleted file mode 100644 index e6a15529d..000000000 --- a/community-testing/perl-mail-box-parser-c/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71432 2012-05-27 07:41:23Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-box-parser-c -pkgver=3.006 -pkgrel=8 -pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Box-Parser-C" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-${pkgver}.tar.gz") -md5sums=('3dfb3e2729597ae33114250cbce1b884') - -build() { - cd Mail-Box-Parser-C-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Box-Parser-C-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-mail-transport-dbx/PKGBUILD b/community-testing/perl-mail-transport-dbx/PKGBUILD deleted file mode 100644 index e19cb056f..000000000 --- a/community-testing/perl-mail-transport-dbx/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71434 2012-05-27 07:41:27Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-transport-dbx -pkgver=0.07 -pkgrel=8 -pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Transport-Dbx" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Mail-Transport-Dbx-${pkgver}.tar.gz") -md5sums=('4dcf5346a67c0a7f861cb2bb51a7d14e') - -build() { - cd Mail-Transport-Dbx-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Transport-Dbx-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-net-dbus/PKGBUILD b/community-testing/perl-net-dbus/PKGBUILD deleted file mode 100644 index af4ca8c2f..000000000 --- a/community-testing/perl-net-dbus/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71436 2012-05-27 07:41:31Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-net-dbus -pkgver=1.0.0 -pkgrel=2 -pkgdesc="Binding for DBus messaging protocol" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Net-DBus" -license=('GPL' 'PerlArtistic') -depends=('dbus' 'perl-xml-twig') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-${pkgver}.tar.gz") -md5sums=('b17e32976d1a3b56feb908ebd7fed7f1') - -build() { - cd Net-DBus-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Net-DBus-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-net-libidn/PKGBUILD b/community-testing/perl-net-libidn/PKGBUILD deleted file mode 100644 index 9952a505b..000000000 --- a/community-testing/perl-net-libidn/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71438 2012-05-27 07:41:35Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-net-libidn -pkgver=0.12 -pkgrel=6 -pkgdesc="Perl/CPAN Module Net::LibIDN" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Net-LibIDN/" -license=("GPL" "PerlArtistic") -depends=(perl libidn) -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-${pkgver}.tar.gz") -md5sums=('c3e4de2065009d67bcb1df0afb473e12') - -build() { - cd Net-LibIDN-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Net-LibIDN-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-package-stash-xs/PKGBUILD b/community-testing/perl-package-stash-xs/PKGBUILD deleted file mode 100644 index 3d18368dd..000000000 --- a/community-testing/perl-package-stash-xs/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 71440 2012-05-27 07:41:39Z bluewind $ - -pkgname=perl-package-stash-xs -pkgver=0.25 -pkgrel=2 -pkgdesc="faster and more correct implementation of the Package::Stash API" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.8.1') -makedepends=('perl-extutils-makemaker>=6.30') -checkdepends=('perl-test-fatal' 'perl-test-simple') -url=https://metacpan.org/release/Package-Stash-XS -source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") -md5sums=(52ece18842c46da8fb7a4a14dea910ab) -sha512sums=(2b539d9ba1a68c5ba681e9eabbcde4b396f66dc8dbd3b1e333286ea7ce39b93b97ec4bd97c31681720a925553b128371ce2c48f11254806aebd5de868a22b528) -_distdir="${srcdir}/Package-Stash-XS-${pkgver}" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/community-testing/perl-params-classify/PKGBUILD b/community-testing/perl-params-classify/PKGBUILD deleted file mode 100644 index 832fb88d6..000000000 --- a/community-testing/perl-params-classify/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 71442 2012-05-27 07:41:43Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-params-classify -pkgver=0.013 -pkgrel=2 -pkgdesc="argument type classification" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/~zefram/Params-Classify" -options=(!emptydirs) -depends=('perl>=5.10.1') -source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Params-Classify-$pkgver.tar.gz") -md5sums=('63d24fbec775472ada49d16bce4a9b1f') - -build() { - cd $srcdir/Params-Classify-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=${pkgdir} - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete -} diff --git a/community-testing/perl-params-util/PKGBUILD b/community-testing/perl-params-util/PKGBUILD deleted file mode 100644 index 68cefdbf3..000000000 --- a/community-testing/perl-params-util/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 71444 2012-05-27 07:41:47Z bluewind $ - -pkgname=perl-params-util -pkgver=1.04 -pkgrel=2 -pkgdesc="Simple, compact and correct param-checking functions" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30' 'perl-scalar-list-utils') -makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52' - 'perl-pathtools') -checkdepends=('perl-test-simple') -url=https://metacpan.org/release/Params-Util -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz") -md5sums=(84bfb0a16cff67f2077ece0e24408b0f) -sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d) -_distdir="${srcdir}/Params-Util-${pkgver}" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/community-testing/perl-params-validate/PKGBUILD b/community-testing/perl-params-validate/PKGBUILD deleted file mode 100644 index 5a26ca6d4..000000000 --- a/community-testing/perl-params-validate/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71446 2012-05-27 07:41:51Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-params-validate -pkgver=1.06 -pkgrel=3 -pkgdesc="Validate sub params against a spec" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Params-Validate" -license=('GPL' 'PerlArtistic') -depends=('perl' 'perl-module-implementation') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('4f7a281269cd30d7c3994ba5acb50857') - -build() { - cd Params-Validate-${pkgver} - perl ./Build.PL --installdirs=vendor - ./Build -} -package(){ - cd Params-Validate-${pkgver} - ./Build install --destdir=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-string-crc32/PKGBUILD b/community-testing/perl-string-crc32/PKGBUILD deleted file mode 100644 index 8ba55cfb1..000000000 --- a/community-testing/perl-string-crc32/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71448 2012-05-27 07:41:55Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-string-crc32 -pkgver=1.4 -pkgrel=8 -pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/String-CRC32" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz") -md5sums=('9b241bc4a482a3aa59fbb1429bc30546') - -build() { - cd String-CRC32-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd String-CRC32-${pkgver} - - make pure_install doc_install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-text-charwidth/PKGBUILD b/community-testing/perl-text-charwidth/PKGBUILD deleted file mode 100644 index c7bd0894c..000000000 --- a/community-testing/perl-text-charwidth/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71450 2012-05-27 07:41:59Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-text-charwidth -pkgver=0.04 -pkgrel=8 -pkgdesc="Perl/CPAN Module Text::CharWidth" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Text-CharWidth" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-${pkgver}.tar.gz") -md5sums=('37a723df0580c0758c0ee67b37336c15') - -build() { - cd Text-CharWidth-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-CharWidth-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-text-kakasi/ChangeLog b/community-testing/perl-text-kakasi/ChangeLog deleted file mode 100644 index 0a469fdff..000000000 --- a/community-testing/perl-text-kakasi/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2008-10-27 Allan McRae <allan@archlinux.org> - * perl-text-kakasi 2.04-4 - * fixed typo in depends diff --git a/community-testing/perl-text-kakasi/PKGBUILD b/community-testing/perl-text-kakasi/PKGBUILD deleted file mode 100644 index 5d1d046de..000000000 --- a/community-testing/perl-text-kakasi/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 71452 2012-05-27 07:42:05Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-text-kakasi -pkgver=2.04 -pkgrel=9 -pkgdesc="Perl frontend to kakasi" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Text-Kakasi" -license=('GPL' 'PerlArtistic') -depends=('perl' 'kakasi') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANKOGAI/Text-Kakasi-${pkgver}.tar.gz") -md5sums=('5a9e381cb93edfd707124a63c60f96b1') - -build() { - cd Text-Kakasi-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-Kakasi-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-tie-hash-indexed/PKGBUILD b/community-testing/perl-tie-hash-indexed/PKGBUILD deleted file mode 100644 index c899c68db..000000000 --- a/community-testing/perl-tie-hash-indexed/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71454 2012-05-27 07:42:09Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-tie-hash-indexed -pkgver=0.05 -pkgrel=8 -pkgdesc="Ordered hashes for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Tie-Hash-Indexed" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MH/MHX/Tie-Hash-Indexed-${pkgver}.tar.gz) -md5sums=('41e2d013df8cfafdd239bc65bbada014') - -build() { - cd Tie-Hash-Indexed-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tie-Hash-Indexed-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-tk-tablematrix/PKGBUILD b/community-testing/perl-tk-tablematrix/PKGBUILD deleted file mode 100644 index f10e15f9b..000000000 --- a/community-testing/perl-tk-tablematrix/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 71456 2012-05-27 07:42:13Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-tk-tablematrix -pkgver=1.23 -pkgrel=9 -pkgdesc="Display data in TableSpreadsheet format" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Tk-TableMatrix" -license=("GPL" "PerlArtistic") -depends=('perl-tk') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-${pkgver}.tar.gz") -md5sums=('6b7653d129bf1a8327054a88b58d6364') - -build() { - cd Tk-TableMatrix-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tk-TableMatrix-${pkgver} - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete - - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld -} diff --git a/community-testing/perl-www-curl/PKGBUILD b/community-testing/perl-www-curl/PKGBUILD deleted file mode 100644 index 692876e34..000000000 --- a/community-testing/perl-www-curl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71458 2012-05-27 07:42:17Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-www-curl -pkgver=4.15 -pkgrel=3 -pkgdesc="Perl/CPAN Module WWW::Curl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/WWW-Curl/" -license=("GPL" "PerlArtistic") -depends=("curl") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-${pkgver}.tar.gz") -md5sums=('31c0b8c7e5e2d26bcc8213d702186d5f') - -build() { - cd WWW-Curl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd WWW-Curl-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-xml-libxml/PKGBUILD b/community-testing/perl-xml-libxml/PKGBUILD deleted file mode 100644 index f3556136c..000000000 --- a/community-testing/perl-xml-libxml/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 71460 2012-05-27 07:42:23Z bluewind $ -# Maintainer: Justin "juster" Davis <jrcd83@gmail.com> -# Contributor: François Charette <francois.archlinux.org> - -pkgname=perl-xml-libxml -pkgver=1.98 -pkgrel=1 -pkgdesc="Interface to the libxml library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/XML-LibXML" -license=('GPL') -depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07') -provides=('perl-libxml' 'perl-xml-libxml-common') -replaces=('perl-libxml' 'perl-xml-libxml-common') -conflicts=('perl-libxml' 'perl-xml-libxml-common') -install=perl-xml-libxml.install -source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('78c2e293d02e92ca99b07e9a768380ca') - -build() { - cd $srcdir/XML-LibXML-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd $srcdir/XML-LibXML-$pkgver - make test -} - -package() { - cd $srcdir/XML-LibXML-$pkgver - make pure_install doc_install DESTDIR=$pkgdir -} diff --git a/community-testing/perl-xml-libxml/perl-xml-libxml.install b/community-testing/perl-xml-libxml/perl-xml-libxml.install deleted file mode 100644 index 43c29a245..000000000 --- a/community-testing/perl-xml-libxml/perl-xml-libxml.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo ":: Installing SAX XML Parsers" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" -} - -post_upgrade() { - libxmlcount=`grep -c XML::LibXML::SAX /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini` - if [[ $libxmlcount == 0 ]]; then - echo ":: Installing SAX XML Parsers" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" - fi -} - diff --git a/community-testing/perl-xml-libxslt/PKGBUILD b/community-testing/perl-xml-libxslt/PKGBUILD deleted file mode 100644 index fa68feaa1..000000000 --- a/community-testing/perl-xml-libxslt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71462 2012-05-27 07:42:27Z bluewind $ -# Maintainer: Justin "juster" Davis <jrcd83@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-xml-libxslt -pkgver=1.77 -pkgrel=1 -pkgdesc="Interface to the gnome libxslt library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/XML-LibXSLT" -license=('GPL') -depends=('perl-xml-libxml' 'libxslt') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('a9cf4adb3637a0a42eb69a2998fa488e') - -build() { - cd "$srcdir/XML-LibXSLT-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/XML-LibXSLT-$pkgver" - make test -} - -package() { - cd "$srcdir/XML-LibXSLT-$pkgver" - make install DESTDIR="$pkgdir" -} diff --git a/community-testing/perl-xmms/PKGBUILD b/community-testing/perl-xmms/PKGBUILD deleted file mode 100644 index 8aa743b34..000000000 --- a/community-testing/perl-xmms/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71464 2012-05-27 07:42:31Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Georg Grabler <ggrabler@gmail.com> - -pkgname=perl-xmms -pkgver=0.12 -pkgrel=8 -pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dougm/Xmms-Perl/" -depends=('perl' 'xmms' 'libxxf86dga') -license=('GPL' 'PerlArtistic') -source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOUGM/Xmms-Perl-${pkgver}.tar.gz") -md5sums=('d1fbf6d09330f7855dd80f3ceee8e6f7') - -build() { - cd Xmms-Perl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Xmms-Perl-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/pork/PKGBUILD b/community-testing/pork/PKGBUILD deleted file mode 100644 index 8ec2d47a6..000000000 --- a/community-testing/pork/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71466 2012-05-27 07:42:35Z bluewind $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=pork -pkgver=0.99.8.1 -pkgrel=6 -pkgdesc="Console-based AOL Instant Messenger & IRC client" -arch=('i686' 'x86_64') -url="http://dev.ojnk.net/" -license=('GPL') -depends=('ncurses' 'perl') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz) -sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE deleted file mode 100644 index 7d6035775..000000000 --- a/community-testing/python-bsddb/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2008-2009 Jesus Cea Avion - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.
\ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD deleted file mode 100644 index 14a706a61..000000000 --- a/community-testing/python-bsddb/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 71680 2012-06-01 10:25:01Z stephane $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-bsddb -pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.3.0 -pkgrel=2 -pkgdesc="Python interface for BerkeleyDB" -license=('MIT') -arch=('i686' 'x86_64') -url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute') -source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - LICENSE) -sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -build () { - cd "${srcdir}" - - cp -r bsddb3-${pkgver}{,-python2} - - # Build python 3 module - cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build - - # Build python 2 module - cd ../bsddb3-${pkgver}-python2 - python2 setup.py --berkeley-db=/usr build -} - -package_python2-bsddb() { - depends=('db' 'python2>=2.7') - cd "${srcdir}/bsddb3-${pkgver}-python2" - - python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python-bsddb() { - depends=('db' 'python>=3.2') - cd "${srcdir}/bsddb3-${pkgver}" - - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/rxvt-unicode/PKGBUILD b/community-testing/rxvt-unicode/PKGBUILD deleted file mode 100644 index ba4cf3197..000000000 --- a/community-testing/rxvt-unicode/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 71468 2012-05-27 07:42:45Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=rxvt-unicode -pkgver=9.15 -pkgrel=3 -pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' -arch=('i686' 'x86_64') -url='http://software.schmorp.de/pkg/rxvt-unicode.html' -license=('GPL') -depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification') -optdepends=('gtk2-perl: to use the urxvt-tabbed') -source=( - "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2" - 'urxvt.desktop' - 'urxvtc.desktop' - 'urxvt-tabbed.desktop' -) -md5sums=('15595aa326167ac5eb68c28d95432faf' - '88d8786d74b819450adf722180db09fd' - 'bebf5b6b399b74b557fcedbdb47cc387' - '2604896bb107fbb5511bfd6f46d65894') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --enable-256-color \ - --enable-combining \ - --enable-fading \ - --enable-font-styles \ - --enable-iso14755 \ - --enable-keepscrolling \ - --enable-lastlog \ - --enable-mousewheel \ - --enable-next-scroll \ - --enable-perl \ - --enable-pixbuf \ - --enable-pointer-blank \ - --enable-rxvt-scroll \ - --enable-selectionscrolling \ - --enable-slipwheeling \ - --enable-smart-resize \ - --enable-startup-notification \ - --enable-transparency \ - --enable-unicode3 \ - --enable-utmp \ - --enable-wtmp \ - --enable-xft \ - --enable-xim \ - --enable-xterm-scroll \ - --disable-frills - make -} - -package() { - pushd $pkgname-$pkgver - # workaround terminfo installation - export TERMINFO="$pkgdir/usr/share/terminfo" - install -d "$TERMINFO" - make DESTDIR="$pkgdir" install - # install the tabbing wrapper ( requires gtk2-perl! ) - sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed - install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed" - popd - # install freedesktop menu - for _f in urxvt urxvtc urxvt-tabbed; do - install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" - done -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/rxvt-unicode/urxvt-tabbed.desktop b/community-testing/rxvt-unicode/urxvt-tabbed.desktop deleted file mode 100644 index f3efdc9b9..000000000 --- a/community-testing/rxvt-unicode/urxvt-tabbed.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt (tabbed) -Comment=An unicode capable and tabbed rxvt clone -Exec=urxvt-tabbed -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-testing/rxvt-unicode/urxvt.desktop b/community-testing/rxvt-unicode/urxvt.desktop deleted file mode 100644 index 0a9baf7df..000000000 --- a/community-testing/rxvt-unicode/urxvt.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt -Comment=An unicode capable rxvt clone -Exec=urxvt -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-testing/rxvt-unicode/urxvtc.desktop b/community-testing/rxvt-unicode/urxvtc.desktop deleted file mode 100644 index e39a418f6..000000000 --- a/community-testing/rxvt-unicode/urxvtc.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt (client) -Comment=An unicode capable rxvt clone client for urxvtd -Exec=urxvtc -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-testing/spacefm/PKGBUILD b/community-testing/spacefm/PKGBUILD deleted file mode 100644 index e240c5d10..000000000 --- a/community-testing/spacefm/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 71498 2012-05-27 13:15:09Z dreisner $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ -# Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> - -pkgname=spacefm -pkgver=0.7.6 -pkgrel=3 -pkgdesc="A multi-panel tabbed file manager" -arch=('i686' 'x86_64') -url="http://ignorantguru.github.com/spacefm/" -license=('GPL2') -install=$pkgname.install -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev') -makedepends=('intltool' 'gettext') -optdepends=('lsof: device processes' - 'eject: eject media' - 'wget: plugin download' - 'gksu: perform as root functionality' - 'pmount: mount as non-root user' - 'udisks: mount as non-root user' - 'udisks2: mount as non-root user') -source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('572b256ab46073d8bb065999bd531423') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # NOTE: To enable hal support add --enable-hal to - # configure line below. See README for details. - # NOTE: To disable inotify and use fam or gamin instead, add: - # --disable-inotify to configure line below. - # NOTE: To add a custom su program (mysu in this example), add: - # --with-preferable-sudo="mysu" to configure line below. - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install -} - diff --git a/community-testing/spacefm/spacefm.install b/community-testing/spacefm/spacefm.install deleted file mode 100644 index 1182e768f..000000000 --- a/community-testing/spacefm/spacefm.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/znc/PKGBUILD b/community-testing/znc/PKGBUILD deleted file mode 100644 index f648723d0..000000000 --- a/community-testing/znc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 71470 2012-05-27 07:42:49Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: mickael9 <mickael9 at gmail dot com> - -pkgname=znc -pkgver=0.206 -pkgrel=2 -pkgdesc='An IRC bouncer with modules & scripts support' -url='http://en.znc.in/wiki/index.php/ZNC' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('c-ares' 'libsasl') -#makedepends=('swig' 'tcl' 'python' 'perl') -makedepends=('tcl' 'python' 'perl') -optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" - "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" - "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") -md5sums=('b7d3f21da81abaeb553066b0e10beb53' - 'a9c72d556d9a4ef100520433f17d71ae' - '19bf033c5cb9243171c215043c594f07') - -build() { - # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 - # use an alternate ways of building znc explain here: - # - http://wiki.znc.in/Modperl - # - http://wiki.znc.in/Modpython - mv -v modperl/* $pkgname-$pkgver/modules/modperl - mv -v modpython/* $pkgname-$pkgver/modules/modpython - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-sasl \ - --enable-python \ - --enable-perl \ - --enable-tcl \ - --disable-swig \ - --enable-extra - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/amsn/amsn-0.98.4-libpng15.patch b/community/amsn/amsn-0.98.4-libpng15.patch deleted file mode 100644 index 24f875d02..000000000 --- a/community/amsn/amsn-0.98.4-libpng15.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- utils/TkCximage/src/CxImage/ximapng.cpp -+++ utils/TkCximage/src/CxImage/ximapng.cpp -@@ -15,7 +15,7 @@ - void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message) - { - strcpy(info.szLastError,message); -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - //////////////////////////////////////////////////////////////////////////////// - #if CXIMAGE_SUPPORT_DECODE -@@ -62,7 +62,7 @@ - /* Set error handling if you are using the setjmp/longjmp method (this is - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* Free all of the memory associated with the png_ptr and info_ptr */ - delete [] row_pointers; - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -@@ -77,15 +77,15 @@ - png_read_info(png_ptr, info_ptr); - - if (info.nEscape == -1){ -- head.biWidth = info_ptr->width; -- head.biHeight= info_ptr->height; -+ head.biWidth = png_get_image_width(png_ptr, info_ptr); -+ head.biHeight= png_get_image_height(png_ptr, info_ptr); - info.dwType = CXIMAGE_FORMAT_PNG; -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - /* calculate new number of channels */ - int channels=0; -- switch(info_ptr->color_type){ -+ switch(png_get_color_type(png_ptr, info_ptr)){ - case PNG_COLOR_TYPE_GRAY: - case PNG_COLOR_TYPE_PALETTE: - channels = 1; -@@ -101,71 +101,76 @@ - break; - default: - strcpy(info.szLastError,"unknown PNG color type"); -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - //find the right pixel depth used for cximage -- int pixel_depth = info_ptr->pixel_depth; -+#if MIGHT_BE_BUGGY -+ int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr); - if (channels == 1 && pixel_depth>8) pixel_depth=8; -+#endif -+ int pixel_depth; -+ if (channels == 1) pixel_depth=8; - if (channels == 2) pixel_depth=8; - if (channels >= 3) pixel_depth=24; - -- if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){ -- longjmp(png_ptr->jmpbuf, 1); -+ if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){ -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - /* get metrics */ -- switch (info_ptr->phys_unit_type) -+ png_uint_32 res_x, res_y; -+ int unit_type; -+ png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type); -+ switch (unit_type) - { - case PNG_RESOLUTION_UNKNOWN: -- SetXDPI(info_ptr->x_pixels_per_unit); -- SetYDPI(info_ptr->y_pixels_per_unit); -+ SetXDPI(res_x); -+ SetYDPI(res_y); - break; - case PNG_RESOLUTION_METER: -- SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5)); -- SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5)); -+ SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5)); -+ SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5)); - break; - } - -- if (info_ptr->num_palette>0){ -- SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette); -- SetClrImportant(info_ptr->num_palette); -- } else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette); -+ if (num_palette>0){ -+ SetPalette((rgb_color*)palette,num_palette); -+ SetClrImportant(num_palette); -+ } else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs - SetPaletteColor(0,0,0,0); - SetPaletteColor(1,85,85,85); - SetPaletteColor(2,170,170,170); - SetPaletteColor(3,255,255,255); - } else SetGrayPalette(); //<DP> needed for grayscale PNGs - -- int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3; -+ int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3; - -- if (info_ptr->num_trans!=0){ //palette transparency -- if (info_ptr->num_trans==1){ -- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- info.nBkgndIndex = info_ptr->trans_color.index; --#else -- info.nBkgndIndex = info_ptr->trans_values.index; --#endif -+png_uint_32 png_get_tRNS (png_const_structp png_ptr, png_infop -+info_ptr, png_bytep *trans_alpha, int *num_trans, png_color_16p -+*trans_color); -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; -+ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); -+ if (num_trans!=0){ //palette transparency -+ if (num_trans==1){ -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){ -+ info.nBkgndIndex = trans_color->index; - } else{ --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- info.nBkgndIndex = info_ptr->trans_color.gray>>nshift; --#else -- info.nBkgndIndex = info_ptr->trans_values.gray>>nshift; --#endif -+ info.nBkgndIndex = trans_color->gray>>nshift; - } - } -- if (info_ptr->num_trans>1){ -+ if (num_trans>1){ - RGBQUAD* pal=GetPalette(); - if (pal){ - DWORD ip; -- for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++) --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; --#else -- pal[ip].rgbReserved=info_ptr->trans[ip]; --#endif -- for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){ -+ for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++) -+ pal[ip].rgbReserved=trans_alpha[ip]; -+ for (ip=num_trans;ip<head.biClrUsed;ip++){ - pal[ip].rgbReserved=255; - } - info.bAlphaPaletteEnabled=true; -@@ -178,15 +183,9 @@ - int num_trans; - png_color_16 *image_background; - if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){ --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_color.red>>nshift); -- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift); -- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_color.blue>>nshift); --#else -- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift); -- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift); -- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_values.blue>>nshift); --#endif -+ info.nBkgndColor.rgbRed = (BYTE)(trans_color->red>>nshift); -+ info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift); -+ info.nBkgndColor.rgbBlue = (BYTE)(trans_color->blue>>nshift); - info.nBkgndColor.rgbReserved = 0; - info.nBkgndIndex = 0; - } -@@ -202,15 +201,15 @@ - } - - // <vho> - flip the RGB pixels to BGR (or RGBA to BGRA) -- if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){ -+ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){ - png_set_bgr(png_ptr); - } - - // <vho> - handle cancel -- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); -+ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); - - // row_bytes is the width x number of channels x (bit-depth / 8) -- row_pointers = new BYTE[info_ptr->rowbytes + 8]; -+ row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8]; - - // turn on interlace handling - int number_passes = png_set_interlace_handling(png_ptr); -@@ -221,8 +220,10 @@ - SetCodecOption(0); - } - -- int chan_offset = info_ptr->bit_depth >> 3; -- int pixel_offset = info_ptr->pixel_depth >> 3; -+ int bit_depth = png_get_bit_depth(png_ptr, info_ptr); -+ int chan_offset = bit_depth >> 3; -+ //int pixel_offset = info_ptr->pixel_depth >> 3; -+ int pixel_offset = (bit_depth * channels) >> 3; - - for (int pass=0; pass < number_passes; pass++) { - iter.Upset(); -@@ -230,7 +231,7 @@ - do { - - // <vho> - handle cancel -- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); -+ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); - - #if CXIMAGE_SUPPORT_ALPHA // <vho> - if (AlphaIsValid()) { -@@ -241,7 +242,7 @@ - BYTE* prow= iter.GetRow(ay); - - //recover data from previous scan -- if (info_ptr->interlace_type && pass>0 && pass!=7){ -+ if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){ - for(ax=0;ax<head.biWidth;ax++){ - long px = ax * pixel_offset; - if (channels == 2){ -@@ -278,10 +279,10 @@ - #endif // CXIMAGE_SUPPORT_ALPHA // vho - { - //recover data from previous scan -- if (info_ptr->interlace_type && pass>0){ -- iter.GetRow(row_pointers, info_ptr->rowbytes); -+ if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){ -+ iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr)); - //re-expand buffer for images with bit depth > 8 -- if (info_ptr->bit_depth > 8){ -+ if (png_get_bit_depth(png_ptr, info_ptr) > 8){ - for(long ax=(head.biWidth*channels-1);ax>=0;ax--) - row_pointers[ax*chan_offset] = row_pointers[ax]; - } -@@ -291,15 +292,15 @@ - png_read_row(png_ptr, row_pointers, NULL); - - //shrink 16 bit depth images down to 8 bits -- if (info_ptr->bit_depth > 8){ -+ if (png_get_bit_depth(png_ptr, info_ptr) > 8){ - for(long ax=0;ax<(head.biWidth*channels);ax++) - row_pointers[ax] = row_pointers[ax*chan_offset]; - } - - //copy the pixels -- iter.SetRow(row_pointers, info_ptr->rowbytes); -+ iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr)); - //<DP> expand 2 bpp images only in the last pass -- if (info_ptr->bit_depth==2 && pass==(number_passes-1)) -+ if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1)) - expand2to4bpp(iter.GetRow()); - - //go on -@@ -340,6 +341,11 @@ - BYTE trans[256]; //for transparency (don't move) - png_struct *png_ptr; - png_info *info_ptr; -+ png_uint_32 width, height; -+ png_byte bit_depth; -+ png_byte color_type; -+ png_byte interlace_type; -+ BYTE channels; - - cx_try - { -@@ -362,9 +368,8 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)){ -+ if (setjmp(png_jmpbuf(png_ptr))){ - /* If we get here, we had a problem reading the file */ -- if (info_ptr->palette) free(info_ptr->palette); - png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr); - cx_throw("Error saving PNG file"); - } -@@ -376,20 +381,18 @@ - png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data); - - /* set the file information here */ -- info_ptr->width = GetWidth(); -- info_ptr->height = GetHeight(); -- info_ptr->pixel_depth = (BYTE)GetBpp(); -- info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1; -- info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels); -- info_ptr->compression_type = info_ptr->filter_type = 0; -- info_ptr->valid = 0; -+ width = GetWidth(); -+ height = GetHeight(); -+ //pixel_depth = (BYTE)GetBpp(); -+ channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1; -+ bit_depth = (BYTE)(GetBpp()/channels); - - switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){ - case 1: -- info_ptr->interlace_type = PNG_INTERLACE_ADAM7; -+ interlace_type = PNG_INTERLACE_ADAM7; - break; - default: -- info_ptr->interlace_type = PNG_INTERLACE_NONE; -+ interlace_type = PNG_INTERLACE_NONE; - } - - /* set compression level */ -@@ -399,19 +402,19 @@ - - if (GetNumColors()){ - if (bGrayScale){ -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ color_type = PNG_COLOR_TYPE_GRAY; - } else { -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ color_type = PNG_COLOR_TYPE_PALETTE; - } - } else { -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; - } - #if CXIMAGE_SUPPORT_ALPHA - if (AlphaIsValid()){ -- info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; -- info_ptr->channels++; -- info_ptr->bit_depth = 8; -- info_ptr->pixel_depth += 8; -+ color_type |= PNG_COLOR_MASK_ALPHA; -+ channels++; -+ bit_depth = 8; -+ //pixel_depth += 8; - } - #endif - -@@ -428,29 +431,21 @@ - /* set metrics */ - png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER); - -- png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth, -- info_ptr->color_type, info_ptr->interlace_type, -+ png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, -+ color_type, interlace_type, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - //<DP> simple transparency - if (info.nBkgndIndex >= 0){ -- info_ptr->num_trans = 1; -- info_ptr->valid |= PNG_INFO_tRNS; --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- info_ptr->trans_alpha = trans; -- info_ptr->trans_color.index = (BYTE)info.nBkgndIndex; -- info_ptr->trans_color.red = tc.rgbRed; -- info_ptr->trans_color.green = tc.rgbGreen; -- info_ptr->trans_color.blue = tc.rgbBlue; -- info_ptr->trans_color.gray = info_ptr->trans_color.index; --#else -- info_ptr->trans = trans; -- info_ptr->trans_values.index = (BYTE)info.nBkgndIndex; -- info_ptr->trans_values.red = tc.rgbRed; -- info_ptr->trans_values.green = tc.rgbGreen; -- info_ptr->trans_values.blue = tc.rgbBlue; -- info_ptr->trans_values.gray = info_ptr->trans_values.index; --#endif -+ png_color_16 trans_color; -+ -+ trans_color.index = (BYTE)info.nBkgndIndex; -+ trans_color.red = tc.rgbRed; -+ trans_color.green = tc.rgbGreen; -+ trans_color.blue = tc.rgbBlue; -+ trans_color.gray = (BYTE)info.nBkgndIndex; -+ -+ png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color); - - // the transparency indexes start from 0 for non grayscale palette - if (!bGrayScale && head.biClrUsed && info.nBkgndIndex) -@@ -459,30 +454,27 @@ - - /* set the palette if there is one */ - if (GetPalette()){ -- if (!bGrayScale){ -- info_ptr->valid |= PNG_INFO_PLTE; -- } -- - int nc = GetClrImportant(); - if (nc==0) nc = GetNumColors(); - - if (info.bAlphaPaletteEnabled){ - for(WORD ip=0; ip<nc;ip++) - trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved; -- info_ptr->num_trans = (WORD)nc; -- info_ptr->valid |= PNG_INFO_tRNS; --#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -- info_ptr->trans_alpha = trans; --#else -- info_ptr->trans = trans; --#endif -+ png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL); - } - - // copy the palette colors -- info_ptr->palette = new png_color[nc]; -- info_ptr->num_palette = (png_uint_16) nc; -- for (int i=0; i<nc; i++) -- GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue); -+ if (!bGrayScale) { -+ png_color *palette; -+ -+ palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0])); -+ for (int i=0; i<nc; i++) -+ GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue); -+ png_set_PLTE(png_ptr, info_ptr, palette, nc); -+ png_data_freer(png_ptr, info_ptr, -+ PNG_DESTROY_WILL_FREE_DATA, -+ PNG_FREE_PLTE); -+ } - } - - #if CXIMAGE_SUPPORT_ALPHA // <vho> -@@ -496,8 +488,8 @@ - } } } - #endif // CXIMAGE_SUPPORT_ALPHA // <vho> - -- int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); -- info_ptr->rowbytes = row_size; -+ int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr)); -+ //info_ptr->rowbytes = row_size; - BYTE *row_pointers = new BYTE[row_size]; - - /* write the file information */ -@@ -515,7 +507,7 @@ - if (AlphaIsValid()){ - for (long ax=head.biWidth-1; ax>=0;ax--){ - c = BlindGetPixelColor(ax,ay); -- int px = ax * info_ptr->channels; -+ int px = ax * png_get_channels(png_ptr, info_ptr); - if (!bGrayScale){ - row_pointers[px++]=c.rgbRed; - row_pointers[px++]=c.rgbGreen; -@@ -530,7 +522,7 @@ - #endif //CXIMAGE_SUPPORT_ALPHA // <vho> - { - iter.GetRow(row_pointers, row_size); -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP - RGBtoBGR(row_pointers, row_size); - png_write_row(png_ptr, row_pointers); - } -@@ -547,12 +539,6 @@ - /* It is REQUIRED to call this to finish writing the rest of the file */ - png_write_end(png_ptr, info_ptr); - -- /* if you malloced the palette, free it here */ -- if (info_ptr->palette){ -- delete [] (info_ptr->palette); -- info_ptr->palette = NULL; -- } -- - /* clean up after the write, and free any memory allocated */ - png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr); - ---- utils/TkCximage/src/CxImage/ximapng.h -+++ utils/TkCximage/src/CxImage/ximapng.h -@@ -64,8 +64,8 @@ - - static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg) - { -- strncpy((char*)png_ptr->error_ptr,error_msg,255); -- longjmp(png_ptr->jmpbuf, 1); -+ strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - }; - diff --git a/community/amsn/amsn-0.98.4-v4l2.patch b/community/amsn/amsn-0.98.4-v4l2.patch deleted file mode 100644 index 815a6ad19..000000000 --- a/community/amsn/amsn-0.98.4-v4l2.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add support for v4l2 on Linux so it can compile against modern -kernel headers. #363201 - -Patch by Kevin McCarthy <signals@gentoo.org> - ---- configure.ac -+++ configure.ac -@@ -382,6 +382,10 @@ - AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) - fi - -+if test "$FOUND_OS" = "linux"; then -+ AC_CHECK_HEADERS(linux/videodev2.h) -+fi -+ - #--------------------------------------------------------------------------------------------- - - dnl --------------------------------------------------------------------- ---- utils/linux/capture/capture.h -+++ utils/linux/capture/capture.h -@@ -33,7 +33,11 @@ - #ifdef HAVE_SYS_VIDEODEV2_H - # include <sys/videodev2.h> - #else --# include <linux/videodev.h> -+ #ifdef HAVE_LINUX_VIDEODEV2_H -+ #include <linux/videodev2.h> -+ #else -+ #include <linux/videodev.h> -+ #endif - #endif - - #include "grab-ng.h" diff --git a/community/amsn/amsn-jpeg7.patch b/community/amsn/amsn-jpeg7.patch deleted file mode 100644 index d9c9f103d..000000000 --- a/community/amsn/amsn-jpeg7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/TkCximage/src/CxImage/ximajpg.cpp.orig 2009-07-18 05:29:43.000000000 -0300 -+++ utils/TkCximage/src/CxImage/ximajpg.cpp 2009-07-18 05:30:31.000000000 -0300 -@@ -142,6 +142,7 @@ - */ //</DP> - - // Set the scale <ignacio> -+ SetJpegScale(8); // Set an initial value (FIX for jpeg-7) - cinfo.scale_denom = GetJpegScale(); - - // Borrowed the idea from GIF implementation <ignacio> diff --git a/community/amsn/amsn-libpng14.patch b/community/amsn/amsn-libpng14.patch deleted file mode 100644 index 8b6e8a05d..000000000 --- a/community/amsn/amsn-libpng14.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- utils/TkCximage/src/CxImage/ximapng.cpp 2008-03-07 20:14:37.000000000 +0100 -+++ utils/TkCximage/src/CxImage/ximapng.cpp_fixed 2010-01-28 23:08:13.000000000 +0100 -@@ -142,9 +142,9 @@ - if (info_ptr->num_trans!=0){ //palette transparency - if (info_ptr->num_trans==1){ - if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ -- info.nBkgndIndex = info_ptr->trans_values.index; -+ info.nBkgndIndex = info_ptr->trans_color.index; - } else{ -- info.nBkgndIndex = info_ptr->trans_values.gray>>nshift; -+ info.nBkgndIndex = info_ptr->trans_color.gray>>nshift; - } - } - if (info_ptr->num_trans>1){ -@@ -152,7 +152,7 @@ - if (pal){ - DWORD ip; - for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++) -- pal[ip].rgbReserved=info_ptr->trans[ip]; -+ pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; - for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){ - pal[ip].rgbReserved=255; - } -@@ -166,9 +166,9 @@ - int num_trans; - png_color_16 *image_background; - if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){ -- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift); -- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift); -- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_values.blue>>nshift); -+ info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_color.red>>nshift); -+ info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift); -+ info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_color.blue>>nshift); - info.nBkgndColor.rgbReserved = 0; - info.nBkgndIndex = 0; - } -@@ -417,12 +417,12 @@ - if (info.nBkgndIndex >= 0){ - info_ptr->num_trans = 1; - info_ptr->valid |= PNG_INFO_tRNS; -- info_ptr->trans = trans; -- info_ptr->trans_values.index = (BYTE)info.nBkgndIndex; -- info_ptr->trans_values.red = tc.rgbRed; -- info_ptr->trans_values.green = tc.rgbGreen; -- info_ptr->trans_values.blue = tc.rgbBlue; -- info_ptr->trans_values.gray = info_ptr->trans_values.index; -+ info_ptr->trans_alpha = trans; -+ info_ptr->trans_color.index = (BYTE)info.nBkgndIndex; -+ info_ptr->trans_color.red = tc.rgbRed; -+ info_ptr->trans_color.green = tc.rgbGreen; -+ info_ptr->trans_color.blue = tc.rgbBlue; -+ info_ptr->trans_color.gray = info_ptr->trans_color.index; - - // the transparency indexes start from 0 for non grayscale palette - if (!bGrayScale && head.biClrUsed && info.nBkgndIndex) -@@ -443,7 +443,7 @@ - trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved; - info_ptr->num_trans = (WORD)nc; - info_ptr->valid |= PNG_INFO_tRNS; -- info_ptr->trans = trans; -+ info_ptr->trans_alpha = trans; - } - - // copy the palette colors diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD deleted file mode 100644 index a7a8a958b..000000000 --- a/community/cherokee/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 64315 2012-02-11 23:19:41Z allan $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Link Dupont <link@subpop.net> - -pkgname=cherokee -pkgver=1.2.101 -pkgrel=3 -pkgdesc="A very fast, flexible and easy to configure Web Server" -arch=('i686' 'x86_64') -url="http://www.cherokee-project.com/" -license=('GPL2') -depends=('openssl' 'pcre') -makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient' - 'ffmpeg' 'geoip') -optdepends=('python2: cherokee-admin (administrative web interface)' - 'libldap: ldap validator' - 'pam: pam validator' - 'libmysqlclient: mysql validator' - 'ffmpeg: Audio/Video streaming handler' - 'geoip: GeoIP rule module' - 'rrdtool: RRDtool based information collector') -backup=('etc/cherokee/cherokee.conf' - 'etc/logrotate.d/cherokee' - 'etc/pam.d/cherokee') -options=('!libtool') -source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz - cherokee.rc - cherokee.logrotate - fix-ctk-path-handler-match.patch) -sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8' - '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86' - '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e' - '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Fix path matching bug in CTK apps (e.g. market) - patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch" - - # Use subdirectory for logs - sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre - - # Use Python 2 in cherokee-admin - sed -i 's/"python"/"python2"/' cherokee/main_admin.c - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --with-wwwroot=/srv/http \ - --with-wwwuser=http \ - --with-wwwgroup=http \ - --with-python=python2 \ - --enable-os-string="Arch Linux" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 DESTDIR="$pkgdir" install - - # PAM configuration file for cherokee - install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname" - - # Fix ownership of /var/lib/cherokee/graphs - chown -R http:http "$pkgdir/var/lib/$pkgname/graphs" - - # Use Python 2 - sed -i 's/env python$/&2/' \ - "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \ - "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}} - sed -i -r "s/['\"]python/&2/g" \ - "$pkgdir/usr/share/cherokee/admin/wizards/django.py" - - # Compile Python scripts - python2 -m compileall "$pkgdir" - python2 -O -m compileall "$pkgdir" - - install -d -o http -g http "$pkgdir/var/log/$pkgname" - install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" - - # Cleanup - rm -rf "$pkgdir/srv" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/cherokee/cherokee.logrotate b/community/cherokee/cherokee.logrotate deleted file mode 100644 index 19207fd02..000000000 --- a/community/cherokee/cherokee.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/cherokee/*.error /var/log/cherokee/*.access { - daily - rotate 14 - compress - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/community/cherokee/cherokee.rc b/community/cherokee/cherokee.rc deleted file mode 100755 index 2d413dc13..000000000 --- a/community/cherokee/cherokee.rc +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name=cherokee - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid - if kill $PID &>/dev/null; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading $daemon_name daemon" - [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid - if kill -HUP $PID &>/dev/null; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting $daemon_name daemon" - [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid - if kill -USR1 $PID &>/dev/null; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/community/cherokee/fix-ctk-path-handler-match.patch b/community/cherokee/fix-ctk-path-handler-match.patch deleted file mode 100644 index abd20c5ef..000000000 --- a/community/cherokee/fix-ctk-path-handler-match.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py ---- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py 2011-06-06 14:17:35.000000000 +0300 -+++ cherokee-1.2.99/admin/CTK/CTK/Server.py 2011-09-16 03:31:06.000000000 +0300 -@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler) - my_thread.scgi_conn = self - my_thread.request_url = url - -+ # Drop the query string before matching against the handlers -+ path = url.split('?', 1)[0] -+ - for published in server._web_paths: -- if re.match (published._regex, url): -+ if re.match (published._regex, path): - # POST - if published._method == 'POST': - post = self._process_post() diff --git a/community/exim/ChangeLog b/community/exim/ChangeLog deleted file mode 100644 index 80a101472..000000000 --- a/community/exim/ChangeLog +++ /dev/null @@ -1,29 +0,0 @@ -2011-10-10 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.77 - -2011-07-15 Angel Velasquez <angvp@archlinux.org> - * Rebuilt without tcp_wrappers - * Fixing logrotate issue FS#25094 - * ChangeLog file changed name from exim.changelog to ChangeLog - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Rebuilt against db 5.2.28 - -2010-05-09 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.76 - * Removed previous patch since is no longer needed - * Removed newaliases script FS#22744 - * Removed sudo dependency - -2010-05-07 Angel Velasquez <angvp@archlinux.org> - * Adding patch for security issue see: http://goo.gl/QBict - -2010-05-06 Angel Velasquez <angvp@archlinux.org> - * Setting sticky id to deliver mail. Closes FS#24109 - -2010-04-30 Angel Velasquez <angvp@archlinux.org> - * exim 4.75 - * Config updated with the aliases path. Closes FS#22743 - * Removed sed hackings and added a exim.Makefile . Closes FS#22744 - * Replaced creation of the user at build time. Closes FS#22745 - diff --git a/community/paraview/ffmpeg-0.8.diff b/community/paraview/ffmpeg-0.8.diff deleted file mode 100644 index 523919d6f..000000000 --- a/community/paraview/ffmpeg-0.8.diff +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff deleted file mode 100644 index 6540de045..000000000 --- a/community/paraview/fix-build-with-zlib-1.2.6.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original 2012-02-09 16:22:56.420371795 +0000 -+++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C 2012-02-09 16:25:59.652228526 +0000 -@@ -703,10 +703,10 @@ - { - // Read past the specified offset. - if(byteOffset > 0) -- gzseek(gz_handle, byteOffset, SEEK_SET); -+ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); - - // Read the whole dataset -- gzread(gz_handle, whole_buff, whole_nelem * unit_size); -+ gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size); - } - else - { -@@ -1046,9 +1046,9 @@ - { - // Read past the specified offset. - if(byteOffset > 0) -- gzseek(gz_handle, byteOffset, SEEK_SET); -+ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET); - -- gzread(gz_handle, rv->GetVoidPointer(0), -+ gzread((gzFile)gz_handle, rv->GetVoidPointer(0), - nvals * dataNumComponents * unit_size); - } - else -@@ -1192,7 +1192,7 @@ - // Close the file descriptors. - // - if (gzipped) -- gzclose(gz_handle); -+ gzclose((gzFile)gz_handle); - else - fclose(file_handle); - diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch deleted file mode 100644 index b34852673..000000000 --- a/community/picard/typeheader.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur old/picard/webservice.py new/picard/webservice.py ---- old/picard/webservice.py 2011-10-23 19:15:29.000000000 +0200 -+++ new/picard/webservice.py 2012-04-28 17:43:17.562422696 +0200 -@@ -149,8 +149,11 @@ - url.setPassword(self.config.setting["password"]) - request = QtNetwork.QNetworkRequest(url) - request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string) -- if method == "POST" and host == self.config.setting["server_host"]: -- request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8") -+ if data is not None: -+ if method == "POST" and host == self.config.setting["server_host"]: -+ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8") -+ else: -+ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") - send = self._request_methods[method] - reply = send(request, data) if data is not None else send(request) - key = (host, port) -@@ -370,6 +373,7 @@ - def _encode_acoustid_args(self, args): - filters = [] - args['client'] = ACOUSTID_KEY -+ args['clientversion'] = version_string - args['format'] = 'xml' - for name, value in args.items(): - value = str(QUrl.toPercentEncoding(value)) diff --git a/community/tilda/fix.patch b/community/tilda/fix.patch deleted file mode 100644 index 058af6a36..000000000 --- a/community/tilda/fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tilda-0.9.6/src/key_grabber.c 2008-04-08 01:12:31.000000000 +0300 -+++ tilda-0.9.6/src/key_grabber.c 2009-10-16 17:39:16.399679408 +0300 -@@ -190,7 +190,7 @@ - * Overriding the user time here seems to work a lot better than calling - * gtk_window_present_with_time() here, or at the end of the function. I have - * no idea why, they should do the same thing. */ -- gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window, -+ gdk_x11_window_set_user_time (GTK_WIDGET(tw->window), - tomboy_keybinder_get_current_event_time()); - gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); - gtk_widget_show (GTK_WIDGET(tw->window)); - ---- tilda-0.9.6/tilda.desktop.in 2007-03-16 04:53:34.000000000 +0100 -+++ tilda-0.9.6/tilda.desktop.in 2011-08-28 19:08:53.000000000 +0200 -@@ -2 +1,0 @@ --Encoding=UTF-8 -@@ -4,2 +3,2 @@ --Exec=@BINDIR@/tilda --Icon=@PIXMAPSDIR@/tilda.png -+Exec=tilda -+Icon=tilda -@@ -8 +7 @@ --Categories=GNOME;GTK;Application;Utility;TerminalEmulator; -+Categories=GNOME;GTK;Utility;TerminalEmulator;System; diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD deleted file mode 100644 index 801cd583b..000000000 --- a/core/libusb/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 157958 2012-04-30 07:20:00Z tpowa $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=libusb -pkgver=1.0.9 -pkgrel=1 -depends=('glibc') -pkgdesc="Library to enable user space application programs to communicate with USB devices." -arch=(i686 x86_64) -url="http://libusb.sourceforge.net/" -license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2) -options=(!libtool) -replaces=(libusb1) -md5sums=('7f5a02375ad960d4e33a6dae7d63cfcb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/core/pinentry/gtk2-pinentry-segfault.patch b/core/pinentry/gtk2-pinentry-segfault.patch deleted file mode 100644 index c0b9fb4ca..000000000 --- a/core/pinentry/gtk2-pinentry-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.000000000 -0600 -+++ gtk+-2/pinentry-gtk-2.c 2010-07-07 00:11:30.413572124 -0500 -@@ -145,7 +145,7 @@ - { - gdk_keyboard_ungrab (gdk_event_get_time (event)); - /* Unmake window transient for the root window. */ -- gdk_window_set_transient_for (win->window, NULL); -+ gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); - } - - diff --git a/core/procps-ng/complain_unmounted_proc.patch b/core/procps-ng/complain_unmounted_proc.patch deleted file mode 100644 index ed932dbba..000000000 --- a/core/procps-ng/complain_unmounted_proc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: <hesso@hesso.pool.math.tu-berlin.de> -Description: Complain when /proc/version cannot be found instead of -exiting silently. ---- a/proc/version.c -+++ b/proc/version.c -@@ -33,8 +33,10 @@ - char buf[256]; - int version_string_depth; - -- if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ -+ if ( (fp=fopen("/proc/version","r")) == NULL) { -+ fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n"); - exit(1); -+ } - if (fgets(buf, 256, fp) == NULL) { - fprintf(stderr, "Cannot read kernel version from /proc/version\n"); - fclose(fp); diff --git a/core/procps-ng/gnu-kbsd-version.patch b/core/procps-ng/gnu-kbsd-version.patch deleted file mode 100644 index f310a4c93..000000000 --- a/core/procps-ng/gnu-kbsd-version.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: <csmall@debian.org> -Description: Rework version parsing so its ok with other OSes ---- a/proc/version.c -+++ b/proc/version.c -@@ -28,20 +28,26 @@ - int linux_version_code; - - void init_Linux_version(void) { -- static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ -+ FILE *fp; -+ char buf[256]; - int version_string_depth; - -- if (uname(&uts) == -1) /* failure implies impending death */ -- exit(1); -- -- version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ -+ exit(1); -+ if (fgets(buf, 256, fp) == NULL) { -+ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); -+ fclose(fp); -+ exit(1); -+ } -+ fclose(fp); -+ version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z); - - if ((version_string_depth < 2) || /* Non-standard for all known kernels */ - ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ - fprintf(stderr, /* *very* unlikely to happen by accident */ - "Non-standard uts for running kernel:\n" -- "release %s=%d.%d.%d gives version code %d\n", -- uts.release, x, y, z, LINUX_VERSION(x,y,z)); -+ "%s=%d.%d.%d gives version code %d\n", -+ buf, x, y, z, LINUX_VERSION(x,y,z)); - linux_version_code = LINUX_VERSION(x, y, z); - } diff --git a/core/procps-ng/includes_restrict.patch b/core/procps-ng/includes_restrict.patch deleted file mode 100644 index 417e93223..000000000 --- a/core/procps-ng/includes_restrict.patch +++ /dev/null @@ -1,144 +0,0 @@ -Author: Craig Small <csmall@debian.org> -Description: Change restrict to __restrict - procps automake defines restrict which means the binaries for procps - binaries compile. However external programs may not of defined - restrict. includes from libc6 use __restrict and if is good enough for - them, its good enough for us. - ---- a/proc/devname.h -+++ b/proc/devname.h -@@ -10,9 +10,9 @@ - #define ABBREV_TTY 2 /* remove tty */ - #define ABBREV_PTS 4 /* remove pts/ */ - --extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); -+extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); - --extern int tty_to_dev(const char *restrict const name); -+extern int tty_to_dev(const char *__restrict const name); - - EXTERN_C_END - #endif ---- a/proc/escape.h -+++ b/proc/escape.h -@@ -14,10 +14,10 @@ - #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it - #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>" - --extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells); --extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells); --extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags); --extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom); -+extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells); -+extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells); -+extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags); -+extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom); - - EXTERN_C_END - #endif ---- a/proc/procps.h -+++ b/proc/procps.h -@@ -103,6 +103,6 @@ - #endif - - --typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2))); -+typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2))); - - #endif ---- a/proc/readproc.h -+++ b/proc/readproc.h -@@ -173,10 +173,10 @@ - // char deBug1[64]; - pid_t taskdir_user; // for threads - int did_fake; // used when taskdir is missing -- int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const); -- proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const); -- int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); -- proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); -+ int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const); -+ proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const); -+ int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); -+ proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); - pid_t* pids; // pids of the procs - uid_t* uids; // uids of procs - int nuid; // cannot really sentinel-terminate unsigned short[] -@@ -200,8 +200,8 @@ - int ntask; // * readproctab2 - } proc_data_t; // * when PROC_LOOSE_TASKS set - --extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); --extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); -+extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); -+extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); - - // Convenient wrapper around openproc and readproc to slurp in the whole process - // table subset satisfying the constraints of flags and the optional PID list. -@@ -222,12 +222,12 @@ - // only before first use. Thereafter, the library will manage such - // a passed proc_t, freeing any additional acquired memory associated - // with the previous process or thread. --extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p); --extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t); --extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x); -+extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p); -+extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t); -+extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x); - - // warning: interface may change --extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid); -+extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid); - - extern void look_up_our_self(proc_t *p); - ---- a/proc/sig.h -+++ b/proc/sig.h -@@ -16,13 +16,13 @@ - EXTERN_C_BEGIN - - /* return -1 on failure */ --extern int signal_name_to_number(const char *restrict name); -+extern int signal_name_to_number(const char *__restrict name); - - extern const char *signal_number_to_name(int signo); - --extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line); -+extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line); - --extern char *strtosig(const char *restrict s); -+extern char *strtosig(const char *__restrict s); - - extern void pretty_print_signals(void); - ---- a/proc/sysinfo.h -+++ b/proc/sysinfo.h -@@ -57,11 +57,11 @@ - - #define BUFFSIZE (64*1024) - typedef unsigned long long jiff; --extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, -- unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, -- unsigned *restrict intr, unsigned *restrict ctxt, -- unsigned int *restrict running, unsigned int *restrict blocked, -- unsigned int *restrict btime, unsigned int *restrict processes); -+extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz, -+ unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout, -+ unsigned *__restrict intr, unsigned *__restrict ctxt, -+ unsigned int *__restrict running, unsigned int *__restrict blocked, -+ unsigned int *__restrict btime, unsigned int *__restrict processes); - - extern void meminfo(void); - ---- a/proc/wchan.h -+++ b/proc/wchan.h -@@ -6,8 +6,8 @@ - EXTERN_C_BEGIN - - extern const char * lookup_wchan(unsigned KLONG address, unsigned pid); --extern int open_psdb(const char *restrict override); --extern int open_psdb_message(const char *restrict override, message_fn message); -+extern int open_psdb(const char *__restrict override); -+extern int open_psdb_message(const char *__restrict override, message_fn message); - - EXTERN_C_END - diff --git a/core/procps-ng/makefile_watch_ncurses.patch b/core/procps-ng/makefile_watch_ncurses.patch deleted file mode 100644 index 08d70bdc7..000000000 --- a/core/procps-ng/makefile_watch_ncurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -383,7 +383,7 @@ - @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c - @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@ - @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c --@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@ -+@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ - kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c - skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c - snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c diff --git a/core/procps-ng/sig_printf_literal.patch b/core/procps-ng/sig_printf_literal.patch deleted file mode 100644 index 2140abf0d..000000000 --- a/core/procps-ng/sig_printf_literal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/proc/sig.c -+++ b/proc/sig.c -@@ -257,7 +257,7 @@ - while(++i <= number_of_signals){ - int n; - n = printf("%2d %s", i, signal_number_to_name(i)); -- if(n>0 && i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); -+ if(n>0 && i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); - else printf("\n"); - } - if((i-1)%7) printf("\n"); diff --git a/core/procps-ng/sysctl_man.patch b/core/procps-ng/sysctl_man.patch deleted file mode 100644 index d6023edfb..000000000 --- a/core/procps-ng/sysctl_man.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/sysctl.8 -+++ b/sysctl.8 -@@ -55,7 +55,7 @@ - \fB\-w\fR, \fB\-\-write\fR - Use this option when you want to change a sysctl setting. - .TP --\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR] -+\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR] - Load in sysctl settings from the file specified or /etc/sysctl.conf if none - given. Specifying \- as filename means reading data from standard input. - .TP -@@ -117,7 +117,7 @@ - .br - /sbin/sysctl \-w kernel.domainname="example.com" - .br --/sbin/sysctl \-p /etc/sysctl.conf -+/sbin/sysctl \-p/etc/sysctl.conf - .br - /sbin/sysctl \-a \-\-pattern forward - .br diff --git a/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch deleted file mode 100644 index 7873dc337..000000000 --- a/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 12250c0acf747d4ed538927ad7604356b93fb444 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sat, 3 Mar 2012 12:28:15 +0100 -Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev - -This means we don't need a flagday in order to move udev to use -/usr/lib/udev/rules.d ---- - src/libudev.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/libudev.c b/src/libudev.c -index d954dae..4da6309 100644 ---- a/src/libudev.c -+++ b/src/libudev.c -@@ -43,8 +43,8 @@ struct udev { - void *userdata; - char *sys_path; - char *dev_path; -- char *rules_path[4]; -- unsigned long long rules_path_ts[4]; -+ char *rules_path[5]; -+ unsigned long long rules_path_ts[5]; - int rules_path_count; - char *run_path; - struct udev_list properties_list; -@@ -255,9 +255,14 @@ UDEV_EXPORT struct udev *udev_new(void) - goto err; - - if (udev->rules_path[0] == NULL) { -- /* /usr/lib/udev -- system rules */ -- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d"); -+ /* /lib/udev -- compat for system rules */ -+ udev->rules_path[0] = strdup("/lib/udev/rules.d"); - if (!udev->rules_path[0]) -+ goto err; -+ -+ /* /usr/lib/udev -- system rules */ -+ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d"); -+ if (!udev->rules_path[1]) - goto err; - - /* /run/udev -- runtime rules */ -@@ -265,11 +270,11 @@ UDEV_EXPORT struct udev *udev_new(void) - goto err; - - /* /etc/udev -- local administration rules */ -- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); -- if (!udev->rules_path[1]) -+ udev->rules_path[3] = strdup(SYSCONFDIR "/udev/rules.d"); -+ if (!udev->rules_path[3]) - goto err; - -- udev->rules_path_count = 3; -+ udev->rules_path_count = 4; - } - - dbg(udev, "context %p created\n", udev); -@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void) - dbg(udev, "dev_path='%s'\n", udev->dev_path); - dbg(udev, "sys_path='%s'\n", udev->sys_path); - dbg(udev, "run_path='%s'\n", udev->run_path); -- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]); -+ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], -+ udev->rules_path[2], udev->rules_path[3]); - free(config_file); - return udev; - err: -@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev) - free(udev->rules_path[0]); - free(udev->rules_path[1]); - free(udev->rules_path[2]); -+ free(udev->rules_path[3]); - free(udev->run_path); - dbg(udev, "context %p released\n", udev); - free(udev); --- -1.7.10 - diff --git a/core/udev/0002-reinstate-TIMEOUT-handling.patch b/core/udev/0002-reinstate-TIMEOUT-handling.patch deleted file mode 100644 index edbbf1d32..000000000 --- a/core/udev/0002-reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 629d840316280cffcc724fac41047374a7685490 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Thu, 15 Mar 2012 02:12:43 +0100 -Subject: [PATCH 2/2] reinstate TIMEOUT= handling - -Without treating events with timeouts specially some drivers would cause a -30 seconds stall on boot: . - -I also received reports of some drivers not working at all, even after the -timeout. - -We will remove this patch when more drivers have been fixed in the kernel (3.4?). - -This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and -57c6f8ae5f52a6e8ffc66a54966346f733dded39. ---- - TODO | 2 ++ - src/libudev-device.c | 19 +++++++++++++++++++ - src/libudev-private.h | 1 + - src/udevd.c | 13 ++++++++++--- - 4 files changed, 32 insertions(+), 3 deletions(-) - -diff --git a/TODO b/TODO -index 8b8b9c8..3d26e89 100644 ---- a/TODO -+++ b/TODO -@@ -7,6 +7,8 @@ - - - move /usr/lib/udev/devices/ to tmpfiles - -+ - remove TIMEOUT= handling -+ - - trigger --subsystem-match=usb/usb_device - - - kill rules_generator -diff --git a/src/libudev-device.c b/src/libudev-device.c -index 10f28b8..639c367 100644 ---- a/src/libudev-device.c -+++ b/src/libudev-device.c -@@ -68,6 +68,7 @@ struct udev_device { - struct udev_list tags_list; - unsigned long long int seqnum; - unsigned long long int usec_initialized; -+ int timeout; - int devlink_priority; - int refcount; - dev_t devnum; -@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) - return 0; - } - -+int udev_device_get_timeout(struct udev_device *udev_device) -+{ -+ return udev_device->timeout; -+} -+ -+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) -+{ -+ char num[32]; -+ -+ udev_device->timeout = timeout; -+ snprintf(num, sizeof(num), "%u", timeout); -+ udev_device_add_property(udev_device, "TIMEOUT", num); -+ return 0; -+} -+ - const char *udev_device_get_devpath_old(struct udev_device *udev_device) - { - return udev_device->devpath_old; -@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, - udev_device_set_devpath_old(udev_device, &property[12]); - } else if (strncmp(property, "SEQNUM=", 7) == 0) { - udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); -+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { -+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "IFINDEX=", 8) == 0) { - udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "DEVMODE=", 8) == 0) { -@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) - udev_list_init(udev, &udev_device->sysattr_value_list, true); - udev_list_init(udev, &udev_device->sysattr_list, false); - udev_list_init(udev, &udev_device->tags_list, true); -+ udev_device->timeout = -1; - udev_device->watch_handle = -1; - /* copy global properties */ - udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) -diff --git a/src/libudev-private.h b/src/libudev-private.h -index 5f5c64a..ec63b67 100644 ---- a/src/libudev-private.h -+++ b/src/libudev-private.h -@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); - void udev_device_set_is_initialized(struct udev_device *udev_device); - int udev_device_add_tag(struct udev_device *udev_device, const char *tag); - void udev_device_cleanup_tags_list(struct udev_device *udev_device); -+int udev_device_get_timeout(struct udev_device *udev_device); - unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); - void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); - int udev_device_get_devlink_priority(struct udev_device *udev_device); -diff --git a/src/udevd.c b/src/udevd.c -index 1702217..88e9272 100644 ---- a/src/udevd.c -+++ b/src/udevd.c -@@ -401,7 +401,7 @@ out: - } - } - --static void event_run(struct event *event) -+static void event_run(struct event *event, bool force) - { - struct udev_list_node *loop; - -@@ -427,7 +427,7 @@ static void event_run(struct event *event) - return; - } - -- if (children >= children_max) { -+ if (!force && children >= children_max) { - if (children_max > 1) - info(event->udev, "maximum number (%i) of children reached\n", children); - return; -@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) - - event->state = EVENT_QUEUED; - udev_list_node_append(&event->node, &event_list); -+ -+ /* run all events with a timeout set immediately */ -+ if (udev_device_get_timeout(dev) > 0) { -+ event_run(event, true); -+ return 0; -+ } -+ - return 0; - } - -@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) - continue; - } - -- event_run(event); -+ event_run(event, false); - } - } - --- -1.7.10 - diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD deleted file mode 100644 index 9916a3a9c..000000000 --- a/core/udev/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 159406 2012-05-23 20:09:27Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> - -pkgname=udev -pkgver=182 -pkgrel=4 -pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl') -install=udev.install -arch=(i686 x86_64) -license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - 0001-split-usr-always-read-config-files-from-lib-udev.patch - 0002-reinstate-TIMEOUT-handling.patch - initcpio-hooks-udev - initcpio-install-udev) -url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" -backup=(etc/udev/udev.conf) -groups=('base') -options=(!makeflags !libtool) -md5sums=('023877e6cc0d907994b8c648beab542b' - '0fa3eac115ad0140af1582d941b15f2c' - '94b816896bf23275c0598fc8e07270c3' - 'e433c11d38cf4f877b41d06e2753ebe0' - 'e6faf4c3fe456f10d8efd2487d5e3cb7') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch - patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # install the mkinitpcio hook - install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev - install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev - - # udevd moved, symlink to make life easy for restarting udevd manually - ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd - - # the path to udevadm is hardcoded in some places - install -d ${pkgdir}/sbin - ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm - - # fix wrong path to /bin/sh - sed -i -e 's#/usr/bin/sh#/bin/sh#g' $pkgdir/usr/lib/udev/keyboard-force-release.sh - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev deleted file mode 100644 index 313a88130..000000000 --- a/core/udev/initcpio-hooks-udev +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - /usr/lib/udev/udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev deleted file mode 100644 index e33664459..000000000 --- a/core/udev/initcpio-install-udev +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -build() { - add_file "/etc/udev/udev.conf" - add_binary /usr/lib/udev/udevd - add_binary /usr/bin/udevadm - - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do - add_file "/usr/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/usr/lib/udev/$tool" - done - - add_runscript -} - -help() { - cat <<HELPEOF -This hook will use udev to create your root device node and detect the needed -modules for your root device. It is also required for firmware loading in -initramfs. It is recommended to use this hook. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/udev/udev.install b/core/udev/udev.install deleted file mode 100644 index 557efe9e1..000000000 --- a/core/udev/udev.install +++ /dev/null @@ -1,59 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 181-3)" -lt 0 ]; then - echo "udev changes:" - if [ "$(vercmp $2 168)" -lt 0 ]; then - echo " * Kernel 2.6.32 or newer is now required." - echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo " * Arch specific cd symlinks are now no longer created." - echo " * cd and net persistent rules will no longer be autogenerated," - echo " see <https://wiki.archlinux.org/index.php/Udev> for details." - echo " * Errors are now logged (possibly to the console) by default." - fi - if [ "$(vercmp $2 171)" -lt 0 ]; then - echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" - echo " blacklisting in MODULES no longer works." - echo " See 'man modprobe.conf' for a replacement to blacklisting." - echo " To disable a module mod1 on the kernel command line, use" - echo " mod1.disable=1" - echo " or" - echo " modprobe.blacklist=mod1" - echo " * The following modules are no longer unconditionally loaded:" - echo " pcspkr irtty-sir analog lp ppdev ide-generic" - echo " Add them to MODULES in rc.conf if you need them." - fi - if [ "$(vercmp $2 172)" -lt 0 ]; then - echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo " takes precedence." - echo " * kbd and rtc devices are no longer world readable." - echo " * rtc is no longer in the audio group and fb devices are no longer in" - echo " the video group, as permissions and ownership of fb devices are controlled" - echo " by X." - fi - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo " 'scanner' and 'video' groups. Beware of any changes." - echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - echo " * For security reasons, we no longer add devices to the 'storage' group. Use" - echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo " this functionality back." - echo " * We no longer create the static nodes on install needed for an initrd-less" - echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" - echo " installs." - fi - if [ "$(vercmp $2 175)" -lt 0 ]; then - echo " * devtmpfs support is now a hard requirement. Users of the official Arch" - echo " kernels have this enabled." - fi - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo " * udev-compat has been removed, and should be uninstalled." - echo " * Framebuffers are no longer blacklisted by default." - echo " * binaries moved from /sbin to /usr/bin" - fi - echo " * if your kernel does not provide /dev/loop-control, you need to manually" - echo " load the 'loop' module before using losetup" - fi -} diff --git a/extra/libxft/git_fixes.diff b/extra/libxft/git_fixes.diff deleted file mode 100644 index 3a7155271..000000000 --- a/extra/libxft/git_fixes.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001 -From: Mikael Magnusson <mikachu@gmail.com> -Date: Sun, 11 Mar 2012 01:41:55 +0000 -Subject: Fixup for 550b2f76401c2 which broke bold fonts - -The commit removed the line -AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden) -but failed to remove the #if lines that this commit removes, resulting -in that code never being executed. - -Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280 - -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/xftglyphs.c b/src/xftglyphs.c -index 4a3b9d6..2f3dc5a 100644 ---- a/src/xftglyphs.c -+++ b/src/xftglyphs.c -@@ -24,9 +24,7 @@ - #include <freetype/ftoutln.h> - #include <freetype/ftlcdfil.h> - --#if HAVE_FT_GLYPHSLOT_EMBOLDEN - #include <freetype/ftsynth.h> --#endif - - /* - * Validate the memory info for a font -@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display *dpy, - - glyphslot = face->glyph; - --#if HAVE_FT_GLYPHSLOT_EMBOLDEN - /* - * Embolden if required - */ - if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot); --#endif - - /* - * Compute glyph metrics from FreeType information --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch deleted file mode 100644 index 4e26fd87d..000000000 --- a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c ---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c 2012-05-26 21:49:27.000000000 +0300 -+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c 2012-05-26 21:55:39.000000000 +0300 -@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_ - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid); - --#ifndef WIN32 -- PL_uid = ids->uid; -- PL_euid = ids->euid; -- PL_gid = ids->gid; -- PL_egid = ids->egid; --#endif --#ifdef MP_MAINTAIN_PPID -- PL_ppid = ids->ppid; --#endif - } - diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch deleted file mode 100644 index 3eb345b66..000000000 --- a/extra/mod_perl/nolfs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: mod_perl-2.0.5/lib/Apache2/Build.pm -=================================================================== ---- mod_perl-2.0.5.orig/lib/Apache2/Build.pm 2011-02-02 21:23:47.000000000 +0100 -+++ mod_perl-2.0.5/lib/Apache2/Build.pm 2011-05-26 17:12:46.276946520 +0200 -@@ -2147,7 +2147,8 @@ sub has_large_files_conflict { - # with it is that we didn't have such a case yet, but may need to - # deal with it later - -- return $perl_lfs64 ^ $apr_lfs64; -+ return 0; -+ # $perl_lfs64 ^ $apr_lfs64; - } - - # if perl is built with uselargefiles, but apr not, the build won't diff --git a/extra/vlc/access_smb_link_to_smbclient.patch b/extra/vlc/access_smb_link_to_smbclient.patch deleted file mode 100644 index 3891108d4..000000000 --- a/extra/vlc/access_smb_link_to_smbclient.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd - -diff --git a/modules/access/Modules.am b/modules/access/Modules.am -index 81d8e78..be8c47b 100644 ---- a/modules/access/Modules.am -+++ b/modules/access/Modules.am -@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES = - - libaccess_smb_plugin_la_SOURCES = smb.c - libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) --libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) -+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) - if HAVE_WIN32 - libaccess_smb_plugin_la_LIBADD += -lmpr - endif diff --git a/extra/xournal/pdf-export-64.patch b/extra/xournal/pdf-export-64.patch deleted file mode 100644 index 9f7075c54..000000000 --- a/extra/xournal/pdf-export-64.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -aur old/src/xo-print.c new/src/xo-print.c ---- old/src/xo-print.c 2009-09-28 23:36:54.000000000 +0200 -+++ new/src/xo-print.c 2009-11-15 06:06:00.000000000 +0100 -@@ -761,7 +761,7 @@ - - make_xref(xref, xref->last+1, pdfbuf->len); - g_string_append_printf(pdfbuf, -- "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject " -+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject " - "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB " - "/BitsPerComponent 8 >> stream\n", - xref->last, zpix->len, width, height); -@@ -840,8 +840,10 @@ - gboolean fallback, is_binary; - guchar encoding[256]; - gushort glyphs[256]; -- int i, j, num, len1, len2; -- gsize len; -+ int i, j, num; -+ guint32 len1, len2; -+ guint32 tt_len; -+ gsize t1_len; - TrueTypeFont *ttfnt; - char *seg1, *seg2; - char *fontdata, *p; -@@ -862,14 +864,14 @@ - } - font->num_glyphs_used = num-1; - if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) { -- if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, -+ if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, - 0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) { - make_xref(xref, xref->last+1, pdfbuf->len); - nobj_fontprog = xref->last; - g_string_append_printf(pdfbuf, -- "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n", -- nobj_fontprog, (int)len, (int)len); -- g_string_append_len(pdfbuf, fontdata, len); -+ "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n", -+ nobj_fontprog, tt_len, tt_len); -+ g_string_append_len(pdfbuf, fontdata, tt_len); - g_string_append(pdfbuf, "endstream\nendobj\n"); - g_free(fontdata); - } -@@ -879,7 +881,7 @@ - else fallback = TRUE; - } else { - // embed the font file: Type1 case -- if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) { -+ if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) { - if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) { - is_binary = TRUE; - len1 = pfb_get_length((unsigned char *)fontdata+2); -@@ -898,7 +900,7 @@ - if (*p=='\n' || *p=='\r') p++; - if (*p=='\n' || *p=='\r') p++; - len1 = p-fontdata; -- p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END); -+ p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END); - if (p==NULL) fallback = TRUE; - else { - // rewind 512 zeros -@@ -936,7 +938,7 @@ - make_xref(xref, xref->last+1, pdfbuf->len); - nobj_fontprog = xref->last; - g_string_append_printf(pdfbuf, -- "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n", -+ "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n", - nobj_fontprog, len1+len2, len1, len2); - g_string_append_len(pdfbuf, seg1, len1); - g_string_append_len(pdfbuf, seg2, len2); -@@ -1258,7 +1260,7 @@ - tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1), - pg->width, pg->height); - g_string_append_printf(pdfbuf, -- "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n", -+ "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n", - n_obj_prefix, tmpstr->len, tmpstr->str); - g_string_free(tmpstr, TRUE); - g_string_prepend(pgstrm, "Q Q Q "); -@@ -1276,7 +1278,7 @@ - - make_xref(&xref, xref.last+1, pdfbuf->len); - g_string_append_printf(pdfbuf, -- "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n", -+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n", - xref.last, zpgstrm->len); - g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len); - g_string_free(zpgstrm, TRUE); diff --git a/extra/xournal/poppler-api.patch b/extra/xournal/poppler-api.patch deleted file mode 100644 index 9e33c7feb..000000000 --- a/extra/xournal/poppler-api.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -aur old/src/xo-file.c new/src/xo-file.c ---- old/src/xo-file.c 2009-09-29 09:36:05.000000000 +1000 -+++ new/src/xo-file.c 2011-10-06 03:11:17.307822836 +1100 -@@ -975,6 +975,140 @@ - g_free(req); - } - -+/* -+ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617 -+ * as a temporary workaround to poppler removing depreciated functions while we wait for -+ * upstream to rewrite against cairo -+ */ -+static void -+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf) -+{ -+ int cairo_width, cairo_height, cairo_rowstride; -+ unsigned char *pixbuf_data, *dst, *cairo_data; -+ int pixbuf_rowstride, pixbuf_n_channels; -+ unsigned int *src; -+ int x, y; -+ -+ cairo_width = cairo_image_surface_get_width (surface); -+ cairo_height = cairo_image_surface_get_height (surface); -+ cairo_rowstride = cairo_image_surface_get_stride (surface); -+ cairo_data = cairo_image_surface_get_data (surface); -+ -+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); -+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); -+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); -+ -+ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) -+ cairo_width = gdk_pixbuf_get_width (pixbuf); -+ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) -+ cairo_height = gdk_pixbuf_get_height (pixbuf); -+ for (y = 0; y < cairo_height; y++) -+ { -+ src = (unsigned int *) (cairo_data + y * cairo_rowstride); -+ dst = pixbuf_data + y * pixbuf_rowstride; -+ for (x = 0; x < cairo_width; x++) -+ { -+ dst[0] = (*src >> 16) & 0xff; -+ dst[1] = (*src >> 8) & 0xff; -+ dst[2] = (*src >> 0) & 0xff; -+ if (pixbuf_n_channels == 4) -+ dst[3] = (*src >> 24) & 0xff; -+ dst += pixbuf_n_channels; -+ src++; -+ } -+ } -+} -+ -+static void -+_poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ gboolean printing, -+ GdkPixbuf *pixbuf) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ src_width, src_height); -+ cr = cairo_create (surface); -+ cairo_save (cr); -+ switch (rotation) { -+ case 90: -+ cairo_translate (cr, src_x + src_width, -src_y); -+ break; -+ case 180: -+ cairo_translate (cr, src_x + src_width, src_y + src_height); -+ break; -+ case 270: -+ cairo_translate (cr, -src_x, src_y + src_height); -+ break; -+ default: -+ cairo_translate (cr, -src_x, -src_y); -+ } -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ if (rotation != 0) -+ cairo_rotate (cr, rotation * G_PI / 180.0); -+ -+ if (printing) -+ poppler_page_render_for_printing (page, cr); -+ else -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1., 1., 1.); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ copy_cairo_surface_to_pixbuf (surface, pixbuf); -+ cairo_surface_destroy (surface); -+} -+ -+/** -+ * poppler_page_render_to_pixbuf: -+ * @page: the page to render from -+ * @src_x: x coordinate of upper left corner -+ * @src_y: y coordinate of upper left corner -+ * @src_width: width of rectangle to render -+ * @src_height: height of rectangle to render -+ * @scale: scale specified as pixels per point -+ * @rotation: rotate the document by the specified degree -+ * @pixbuf: pixbuf to render into -+ * -+ * First scale the document to match the specified pixels per point, -+ * then render the rectangle given by the upper left corner at -+ * (src_x, src_y) and src_width and src_height. -+ * This function is for rendering a page that will be displayed. -+ * If you want to render a page that will be printed use -+ * poppler_page_render_to_pixbuf_for_printing() instead -+ * -+ * Deprecated: 0.16 -+ **/ -+void -+poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf) -+{ -+ g_return_if_fail (POPPLER_IS_PAGE (page)); -+ g_return_if_fail (scale > 0.0); -+ g_return_if_fail (pixbuf != NULL); -+ -+ _poppler_page_render_to_pixbuf (page, src_x, src_y, -+ src_width, src_height, -+ scale, rotation, -+ FALSE, -+ pixbuf); -+} - /* process a bg PDF request from the queue, and recurse */ - - gboolean bgpdf_scheduler_callback(gpointer data) -diff -aur old/src/xo-file.h new/src/xo-file.h ---- old/src/xo-file.h 2009-09-28 08:45:53.000000000 +1000 -+++ new/src/xo-file.h 2011-10-06 03:11:17.311156160 +1100 -@@ -36,3 +36,10 @@ - void init_config_default(void); - void load_config_from_file(void); - void save_config_to_file(void); -+ -+void poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf); diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install deleted file mode 100644 index c4ef46ba8..000000000 --- a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/libkgoogle/PKGBUILD b/kde-unstable/libkgoogle/PKGBUILD deleted file mode 100644 index 5ec2ef8cb..000000000 --- a/kde-unstable/libkgoogle/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 160216 2012-05-30 23:49:23Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkgoogle -pkgver=0.3.2 -pkgrel=1 -pkgdesc="A KDE-based library for accessing various Google services via their public API" -url='https://projects.kde.org/projects/kdereview/libkgoogle' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'qjson') -makedepends=('cmake' 'automoc4' 'boost') -replaces=('akonadi-google') -conflicts=('akonadi-google') -source=("http://www.progdan.cz/wp-content/uploads/${pkgname}-${pkgver}.tar.gz") -md5sums=('faa3af3bd402827b229c697b95865d1a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/libre-testing/hplip-libre/PKGBUILD b/libre-testing/hplip-libre/PKGBUILD deleted file mode 100644 index 02cae8862..000000000 --- a/libre-testing/hplip-libre/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Maintainer : Rémy Oudompheng <remy@archlinux.org> -# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> -# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> - -_pkgname=hplip -pkgname=hplip-libre -pkgver=3.12.4 -pkgrel=3 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" -arch=('i686' 'x86_64') -url="http://hplipopensource.com" -license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') -optdepends=('cups: for printing support' - 'dbus-python: for dbus support' - 'sane: for scanner support' - 'python-imaging: for commandline scanning support' - 'python-notify: for Desktop notification support' - 'rpcbind: for network support' - 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox') -replaces=('hpijs' "${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") -options=('!libtool') -install=hplip.install -source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('a063f76aa47edab55a3f31ff2558df07' - '2fe18f4091afb3dec200271dc7836128') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - export PYTHON=python2 - find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py - sed -i 's|python ./print.py|python2 ./print.py|' scan.py - sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py - sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py - sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - - # https://bugs.archlinux.org/task/30085 - hack found in Gentoo - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - - export AUTOMAKE='automake --foreign' - autoreconf --force --install - - ./configure --prefix=/usr \ - --enable-qt4 \ - --disable-foomatic-rip-hplip-install \ - --enable-foomatic-ppd-install \ - --enable-hpcups-install \ - --enable-new-hpcups \ - --enable-cups-ppd-install \ - --enable-cups-drv-install \ - --enable-hpijs-install \ - --enable-foomatic-drv-install \ - --enable-pp-build \ - --enable-udev-acl-rules - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} - # remove HAL .fdi file because HAL is no longer used - rm -rf "$pkgdir"/usr/share/hal - # move to /usr - mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ - rm "$pkgdir"/lib -r -} diff --git a/libre-testing/hplip-libre/hplip.install b/libre-testing/hplip-libre/hplip.install deleted file mode 100644 index cb0eaf8e8..000000000 --- a/libre-testing/hplip-libre/hplip.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - cat << EOF - -NOTE ----- -# If you want to use this driver with sane: -# echo "hpaio" >> /etc/sane.d/dll.conf - -EOF -} diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD deleted file mode 100644 index 9f5ef223b..000000000 --- a/libre/apache-ant-libre/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# Maintainer (Arch): Paul Mattal <paul@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> - -_pkgname=apache-ant -pkgname=apache-ant-libre -pkgver=1.8.2 - -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") - -pkgrel=3 -pkgdesc="A java-based build tool" -arch=('any') -license=('APACHE') -url="http://ant.apache.org/" -depends=('java-environment') -makedepends=('junit') -optdepends=('junit: to have JUnit on the classpath in javac tasks') -source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2 - ${_pkgname}.sh ${_pkgname}.csh - ant_diagnostics.patch) - -build() { - # This directory is what becomes - # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 - # which is what Arch uses - rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin - mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin - - cd "${srcdir}"/${_pkgname}-${pkgver} - ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional - sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist -} - -package() { - # install profile.d script - install -dm755 "${pkgdir}"/etc/profile.d - install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ - - # Get the ANT_HOME env var - source "${srcdir}"/${_pkgname}.sh - - cd "${srcdir}"/${_pkgname}-${pkgver}-bin - install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib} - - install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib - cp -Rp ./etc "${pkgdir}"/${ANT_HOME} - - # Do not copy Windows .bat/.cmd files - find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ - -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \; - - # symlink to junit so it's on the javac build path for ant - # matches behavior on ubuntu 9 and makes sense for compatibility - # http://bugs.archlinux.org/task/15229 - ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/ - - # fix python2 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py - - # The license says the NOTICE file should be redistributed for derivative - # works, so lets supply it. - cd "${srcdir}"/${_pkgname}-${pkgver} - install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname} - install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname} -} - -md5sums=('0d9e108afcd15b820150b8085c96d2b1' - '593ee6ebd9b8ec321534a028e686880f' - '475b684eb8202c09cbb51496cd8ee1e0' - 'cbaab423be40a6e63f0fde901b91eb50') diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch deleted file mode 100644 index 38148b45c..000000000 --- a/libre/apache-ant-libre/ant_diagnostics.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/main/org/apache/tools/ant/Diagnostics.java -+++ b/src/main/org/apache/tools/ant/Diagnostics.java -@@ -179,7 +179,10 @@ - * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) { -+ if (clazz.getProtectionDomain().getCodeSource() == null) { -+ return null; -+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@ - }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer(); - } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh deleted file mode 100644 index b6a6d5840..000000000 --- a/libre/apache-ant-libre/apache-ant.csh +++ /dev/null @@ -1,2 +0,0 @@ -setenv ANT_HOME /usr/share/java/apache-ant -setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh deleted file mode 100644 index ab602fb28..000000000 --- a/libre/apache-ant-libre/apache-ant.sh +++ /dev/null @@ -1,3 +0,0 @@ -export ANT_HOME=/usr/share/java/apache-ant -export PATH=$PATH:$ANT_HOME/bin - diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD deleted file mode 100644 index b8f1886d2..000000000 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ /dev/null @@ -1,224 +0,0 @@ -# $Id: PKGBUILD 71515 2012-05-27 22:12:34Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-libgbm') - -#_git=true -_gitdate=20111031 -_git=false - -if [ "${_git}" = "true" ]; then - #pkgver=7.10.99.git20110709 - pkgver=7.11 - else - pkgver=8.0.3 -fi - -pkgrel=3.1 -arch=('x86_64') -makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' - 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=('mesa-8.0.3-llvm-3.1-fixes.patch') -if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") - md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') -else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") - md5sums=('0082f4d17674155aa13bc611a5687788' - 'cc5ee15e306b8c15da6a478923797171') -fi -#options=('!buildflags') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - # for our llvm-config for 32 bit - export LLVM_CONFIG=/usr/bin/llvm-config32 - - # fix segfault with gfx cards > Ati R700 - export CFLAGS="${CFLAGS} -O1" - export CXXFLAGS="${CXXFLAGS} -O1" - - cd ${srcdir}/?esa-* - - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" - - autoreconf -vfi - - if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ - --enable-gallium-llvm \ - --disable-gallium-egl --enable-shared-glapi \ - --enable-shared-glapi \ - --enable-glx-tls \ - --enable-dri \ - --enable-gles1 \ - --enable-gles2 \ - --disable-egl \ - --enable-texture-float \ - --enable-shared-dricore \ - --enable-gbm \ - --enable-32-bit \ - --libdir=/usr/lib32 - # --enable-gallium-svga \ - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ - --enable-gallium-llvm \ - --disable-gallium-egl --enable-shared-glapi \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-gles1 \ - --enable-gles2 \ - --disable-egl \ - --enable-gbm \ - --enable-texture-float \ - --enable-shared-dricore \ - --enable-32-bit \ - --libdir=/usr/lib32 - fi - - make -} - -package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - #replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri') - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" - - bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" -} - -package_lib32-libglapi() { - depends=('lib32-glibc' 'libglapi') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" -} - -package_lib32-libgbm() { - depends=('lib32-glibc') - pkgdesc="Mesa gbm library (32-bit)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - bin/minstall lib32/libgbm.so* "${pkgdir}/usr/lib32/" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm" -} - -package_lib32-libgles() { - depends=('lib32-libglapi' 'libgles') - pkgdesc="Mesa GLES libraries (32-bit)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" -} - -#package_lib32-libegl() { -# depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl') -# pkgdesc="Mesa libEGL libraries (32-bit)" -# -# cd ${srcdir}/?esa-* -# make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install -# -# install -m755 -d "${pkgdir}/usr/lib32" -# install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" -# install -m755 -d "${pkgdir}/usr/lib32/egl" -# bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" -# bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" -# bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" -# -# install -m755 -d "${pkgdir}/usr/share/licenses/libegl" -# ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" -#} - -package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') - pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib32/libGL.so"* - rm -f "${pkgdir}/usr/lib32/libglapi.so"* - rm -f "${pkgdir}/usr/lib32/libgbm.so"* - rm -f "${pkgdir}/usr/lib32/libGLESv"* - rm -f "${pkgdir}/usr/lib32/libEGL"* - rm -rf "${pkgdir}/usr/lib32/egl" - rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,gbm.pc} - rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" -} - -package_lib32-ati-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" - conflicts=('xf86-video-ati<6.9.0-6') - - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - # classic mesa drivers for radeon,r200 - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -} - -package_lib32-intel-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel (32-bit)" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install -} - -package_lib32-nouveau-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -} - diff --git a/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index 922577aef..000000000 --- a/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } diff --git a/multilib-testing/lib32-xcb-util/PKGBUILD b/multilib-testing/lib32-xcb-util/PKGBUILD deleted file mode 100644 index 7f012e57f..000000000 --- a/multilib-testing/lib32-xcb-util/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 71728 2012-06-01 20:31:22Z lcarlier $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=xcb-util -pkgname=lib32-xcb-util -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding (32-bit)" -arch=('x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename) -makedepends=('gperf' 'gcc-multilib') -options=('!libtool') -source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/staging/db/PKGBUILD b/staging/db/PKGBUILD deleted file mode 100644 index c0a9f2192..000000000 --- a/staging/db/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160310 2012-05-31 21:26:09Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=db -pkgver=5.3.21 -pkgrel=1 -pkgdesc="The Berkeley DB embedded database system" -arch=('i686' 'x86_64') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" -license=('custom') -depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install -source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') - -build() { - cd "${srcdir}"/$pkgname-${pkgver}/build_unix - ../dist/configure --prefix=/usr --enable-compat185 \ - --enable-shared --enable-static --enable-cxx --enable-dbm - make LIBSO_LIBS=-lpthread -} - -package() { - cd "${srcdir}"/$pkgname-${pkgver}/build_unix - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/docs - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/staging/db/db.install b/staging/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/staging/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/staging/startup-notification/PKGBUILD b/staging/startup-notification/PKGBUILD deleted file mode 100644 index e20271ab6..000000000 --- a/staging/startup-notification/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 160257 2012-05-31 17:08:21Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=startup-notification -pkgver=0.12 -pkgrel=3 -pkgdesc="Monitor and display application startup" -arch=(i686 x86_64) -license=('LGPL') -depends=('libx11' 'xcb-util>=0.3.9') -options=('!libtool') -url="http://www.freedesktop.org" -source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.in - autoreconf --force --install - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/xcb-util-image/LICENSE b/staging/xcb-util-image/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/staging/xcb-util-image/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/staging/xcb-util-image/PKGBUILD b/staging/xcb-util-image/PKGBUILD deleted file mode 100644 index bab6a6427..000000000 --- a/staging/xcb-util-image/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160251 2012-05-31 16:57:38Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-image -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7' 'xcb-util>=0.3.9') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xcb-util-keysyms/LICENSE b/staging/xcb-util-keysyms/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/staging/xcb-util-keysyms/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/staging/xcb-util-keysyms/PKGBUILD b/staging/xcb-util-keysyms/PKGBUILD deleted file mode 100644 index 09de05c20..000000000 --- a/staging/xcb-util-keysyms/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160253 2012-05-31 16:59:59Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-keysyms -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xcb-util-wm/LICENSE b/staging/xcb-util-wm/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/staging/xcb-util-wm/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/staging/xcb-util-wm/PKGBUILD b/staging/xcb-util-wm/PKGBUILD deleted file mode 100644 index 212613b55..000000000 --- a/staging/xcb-util-wm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160255 2012-05-31 17:02:30Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-wm -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xcb-util/LICENSE b/staging/xcb-util/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/staging/xcb-util/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/staging/xcb-util/PKGBUILD b/staging/xcb-util/PKGBUILD deleted file mode 100644 index 373a55b3e..000000000 --- a/staging/xcb-util/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 160249 2012-05-31 16:52:23Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=xcb-util -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('gperf' 'xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD deleted file mode 100644 index 4844cee08..000000000 --- a/staging/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 160259 2012-05-31 17:10:59Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.19.0 -pkgrel=3 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') -makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD deleted file mode 100644 index ebab05be5..000000000 --- a/testing/bash/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# $Id: PKGBUILD 160232 2012-05-31 11:55:13Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=bash -_basever=4.2 -_patchlevel=029 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=1 -pkgdesc="The GNU Bourne Again shell" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/bash/bash.html" -groups=('base') -backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) -depends=('readline>=6.1' 'glibc') -provides=('sh') -install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} - dot.bashrc - dot.bash_profile - dot.bash_logout - system.bashrc - system.bash_logout) -if [ $_patchlevel -gt 000 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) - done -fi - -build() { - cd ${srcdir}/${pkgname}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) - done - - _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' - -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' - -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' - -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') - export CFLAGS="${CFLAGS} ${_bashconfig[@]}" - - ./configure --prefix=/usr --with-curses --enable-readline \ - --without-bash-malloc --with-installed-readline \ - --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -check() { - cd ${srcdir}/${pkgname}-$_basever - make check -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - # for now, bash is our default /bin/sh - cd ${pkgdir}/bin - ln -s bash sh - - install -dm755 ${pkgdir}/etc/skel/ - - # system-wide configuration files - install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc - install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout - - # user configuration file skeletons - install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc - install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile - install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout -} - -md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' - '027d6bd8f5f6a06b75bb7698cb478089' - '2902e0fee7a9168f3a4fd2ccd60ff047' - '42f4400ed2314bd7519c020d0187edc5' - '3546099a1b2f667adc9794f52e78e35b' - '472f536d7c9e8250dc4568ec4cfaf294' - '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' - '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' - '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' - 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' - 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' - 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' - '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' - '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' - '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' - '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' - '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' - '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' - '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' - 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' - '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' - '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' - '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' - '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' - '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' - 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' - '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' - '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' - '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' - '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c' - 'c7d2493e44490f01dd20bdc8feb0a6a7' - 'e4855dbc4b743618b54d408bd5878637' - '9f19c199dd8d1fa9254eebe738759272' - '600c8e90c2fb13cdbc7aa3f18566df03' - 'a6ed82daf034587aee2f2581ba5fe829' - '821620a0389df723644911c56796ca8c' - 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8' - 'ec444d229e8899fbaaf6fc7de2d82ae6' - 'b632fca3a4943825bfaf3bd29df6b27d') diff --git a/testing/bash/bash.install b/testing/bash/bash.install deleted file mode 100644 index bc75e9b6a..000000000 --- a/testing/bash/bash.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(bash.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout deleted file mode 100644 index 0e4e4f184..000000000 --- a/testing/bash/dot.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# ~/.bash_logout -# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile deleted file mode 100644 index 5545f007e..000000000 --- a/testing/bash/dot.bash_profile +++ /dev/null @@ -1,5 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc deleted file mode 100644 index a355b0cd3..000000000 --- a/testing/bash/dot.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout deleted file mode 100644 index a76e48e4a..000000000 --- a/testing/bash/system.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/bash.bash_logout -# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc deleted file mode 100644 index a2231e861..000000000 --- a/testing/bash/system.bashrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - - ;; - screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - ;; -esac - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/bluez/0001-udev-remove-deprecated-function.patch b/testing/bluez/0001-udev-remove-deprecated-function.patch deleted file mode 100644 index 7dadf5cd1..000000000 --- a/testing/bluez/0001-udev-remove-deprecated-function.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sun, 27 May 2012 00:53:36 +0200 -Subject: [PATCH] udev: remove deprecated function - -This function has in the past returned "/sys" unconditionally. As of udev-183 it -is gone, so just replace it with the string. ---- - tools/hid2hci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/hid2hci.c b/tools/hid2hci.c -index 45a3a3d..e3a5b2e 100644 ---- a/tools/hid2hci.c -+++ b/tools/hid2hci.c -@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) - if (udev == NULL) - goto exit; - -- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); -+ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); - udev_dev = udev_device_new_from_syspath(udev, syspath); - if (udev_dev == NULL) { - fprintf(stderr, "error: could not find '%s'\n", devpath); --- -1.7.10.2 - diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD deleted file mode 100644 index 5e5ffb7e5..000000000 --- a/testing/bluez/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 160191 2012-05-30 15:34:29Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> - -pkgname=bluez -pkgver=4.99 -pkgrel=6 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" -url="http://www.bluez.org/" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('dbus-core' 'python2' 'udev') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - '0001-udev-remove-deprecated-function.patch' - 'bluetooth.conf.d' - 'rc.bluetooth') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test \ - --with-systemdunitdir=/usr/lib/systemd/system - - patch -p1 -i ../0001-udev-remove-deprecated-function.patch - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth - - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input - - # fixed upstream in git - rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules -} -md5sums=('2387053eb5a7b02f37df4871df022a02' - '3175155fbaf73f01377f6c35b5c5e468' - '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/testing/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth deleted file mode 100644 index a46ee2abb..000000000 --- a/testing/bluez/rc.bluetooth +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -DUND_ENABLE="false" -PAND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -DUND_OPTIONS="" -PAND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD deleted file mode 100644 index 9a0ccd998..000000000 --- a/testing/btrfs-progs/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159628 2012-05-26 00:01:32Z dreisner $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -pkgname=btrfs-progs -pkgver=0.19.20120328 -pkgrel=3 -pkgdesc="btrfs filesystem utilities" -arch=(i686 x86_64) -depends=('glibc' 'e2fsprogs') -url="http://btrfs.wiki.kernel.org/" -replaces=('btrfs-progs-unstable') -conflicts=('btrfs-progs-unstable') -provides=('btrfs-progs-unstable') -license=('GPL2') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz - initcpio-install-btrfs - initcpio-hook-btrfs) -md5sums=('f4504e73cf9254779b78d5b2318ac570' - '3eae9bf1541e297fa72aa40ebf7320c6' - 'b09688a915a0ec8f40e2f5aacbabc9ad') - -build() { - cd $srcdir/$pkgname-$pkgver - make CFLAGS="$CFLAGS" -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - # fix manpage - mkdir -p $pkgdir/usr/share/ - mv $pkgdir/usr/man $pkgdir/usr/share/man - mkdir -p ${pkgdir}/sbin - ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs - - # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" -} diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs deleted file mode 100644 index 7965d0a8a..000000000 --- a/testing/btrfs-progs/initcpio-hook-btrfs +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - btrfs device scan -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs deleted file mode 100644 index a70a324ed..000000000 --- a/testing/btrfs-progs/initcpio-install-btrfs +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -build() { - add_all_modules btrfs - add_binary btrfs - add_runscript -} - -help() { - cat <<HELPEOF -This hook provides support for multi-device btrfs volumes. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/cairo-perl/PKGBUILD b/testing/cairo-perl/PKGBUILD deleted file mode 100644 index 4ee10f99c..000000000 --- a/testing/cairo-perl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159821 2012-05-27 07:41:53Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cairo-perl -pkgver=1.082 -pkgrel=2 -pkgdesc="Perl wrappers for cairo" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('cairo' 'perl') -makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz - testsuite.patch) -md5sums=('cfd61e519ff20023979c255d4040fe06' - '6a3ceac304a5a53f8fdd5652d98f6855') - -build() { - cd "${srcdir}/Cairo-${pkgver}" - patch -Np1 -i "${srcdir}/testsuite.patch" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Cairo-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Cairo-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/cairo-perl/testsuite.patch b/testing/cairo-perl/testsuite.patch deleted file mode 100644 index 59cb58f28..000000000 --- a/testing/cairo-perl/testsuite.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 21dd8a0600cbfac46723c7745b377fce94c8bdc3 Mon Sep 17 00:00:00 2001 -From: Torsten Schönfeld <kaffeetisch@gmx.de> -Date: Sat, 31 Mar 2012 10:34:11 +0000 -Subject: Fix compiling and testing against older versions of cairo - ---- -(limited to 't/CairoPath.t') - -diff --git a/t/CairoPath.t b/t/CairoPath.t -index e515172..770e464 100644 ---- a/t/CairoPath.t -+++ b/t/CairoPath.t -@@ -11,11 +11,17 @@ use strict; - use warnings; - use Cairo; - --use Test::More tests => 6; -+use Test::More; - - use constant IMG_WIDTH => 256; - use constant IMG_HEIGHT => 256; - -+if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) { -+ plan tests => 6; -+} else { -+ plan skip_all => 'path behavior not predictable on cairo < 1.4'; -+} -+ - my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT); - my $cr = Cairo::Context->create ($surf); - --- -cgit v0.9.0.2 -From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001 -From: Torsten Schönfeld <kaffeetisch@gmx.de> -Date: Sat, 07 Apr 2012 18:01:31 +0000 -Subject: Make t/CairoPath.t more robust - -The end of a path that took a round trip into cairo and back might differ -for different versions of cairo. Hence, compare only the beginning with -the expected path. ---- -diff --git a/t/CairoPath.t b/t/CairoPath.t -index 770e464..27a3aad 100644 ---- a/t/CairoPath.t -+++ b/t/CairoPath.t -@@ -11,17 +11,11 @@ use strict; - use warnings; - use Cairo; - --use Test::More; -+use Test::More tests => 18; - - use constant IMG_WIDTH => 256; - use constant IMG_HEIGHT => 256; - --if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) { -- plan tests => 6; --} else { -- plan skip_all => 'path behavior not predictable on cairo < 1.4'; --} -- - my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT); - my $cr = Cairo::Context->create ($surf); - -@@ -40,14 +34,7 @@ my $expected_path = [ - ]; - - my $path = $cr->copy_path; --is_deeply ($path, $expected_path); -- --sub paths_agree { -- my ($cr, $path, $expected_path) = @_; -- $cr->new_path; -- $cr->append_path ($path); -- is_deeply ($cr->copy_path, $expected_path); --} -+paths_agree ($path, $expected_path); - - # Modifying single point values. - foreach ($path, $expected_path) { -@@ -57,21 +44,21 @@ foreach ($path, $expected_path) { - $_->[2]{points}[2][0] = 99; - $_->[2]{points}[2][1] = 1010; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Modifying single points. - foreach ($path, $expected_path) { - $_->[1]{points}[0] = [333, 444]; - $_->[2]{points}[2] = [77, 88]; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Replacing all points. - foreach ($path, $expected_path) { - $_->[1]{points} = [[3333, 4444]]; - $_->[2]{points} = [[55, 66], [77, 88], [99, 1010]]; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Replacing and adding path segments. - my @cloned_path = @{$path}; -@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) { - type => 'line-to', - points => [[23, 42]] }; - } --paths_agree ($cr, \@cloned_path, $expected_path); -+path_round_trip_ok ($cr, \@cloned_path, $expected_path); - - # Passing bare arrays into Cairo. - $cr->new_path; - $cr->append_path ($expected_path); --is_deeply ($cr->copy_path, $expected_path); -+paths_agree ($cr->copy_path, $expected_path); -+ -+sub path_round_trip_ok { -+ my ($cr, $path, $expected_path) = @_; -+ $cr->new_path; -+ $cr->append_path ($path); -+ paths_agree ($cr->copy_path, $expected_path); -+} -+ -+sub paths_agree { -+ my ($path, $expected_path) = @_; -+ # Only the first three entries seem to be reliable across cairo versions. -+ for (0..2) { -+ is_deeply ($path->[$_], $expected_path->[$_]); -+ } -+} --- -cgit v0.9.0.2 diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD deleted file mode 100644 index 187290ab2..000000000 --- a/testing/claws-mail-extra-plugins/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 159823 2012-05-27 07:41:56Z bluewind $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Mildred <mildred593 at online dot fr> - -pkgname=claws-mail-extra-plugins -pkgver=3.8.0 -pkgrel=3 -pkgdesc="Extra plugins for claws-mail" -url="http://www.claws-mail.org/plugins.php?branch=EXT" -license=('GPL3') -arch=('i686' 'x86_64') -depends=('claws-mail>=3.8.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') -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') -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=('4776f6e0357a694f384349ac73b6da52') - -build() { - cd "$srcdir/claws-mail-extra-plugins-$pkgver" - - # fix for python2 - export PYTHON="/usr/bin/python2" - - # fix gdata plugin build - sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure - - 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/testing/consolekit/PKGBUILD b/testing/consolekit/PKGBUILD deleted file mode 100644 index 1292d8fec..000000000 --- a/testing/consolekit/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 159964 2012-05-27 13:10:42Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=consolekit -pkgver=0.4.6 -pkgrel=4 -pkgdesc="A framework for defining and tracking users, login sessions, and seats" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/ConsoleKit" -license=('GPL') -depends=('polkit' 'zlib' 'libx11' 'dbus-glib') -makedepends=('pkgconfig' 'xmlto' 'docbook-xsl') -options=(!libtool) -#source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2 -# this has not been released yet, so this is a snapshot -source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2 - pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) -md5sums=('810990b607e338f06a6396c92b8a4a06' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') - -build() { - cd "$srcdir/ConsoleKit-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/ConsoleKit \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-pam-module \ - --with-pam-module-dir=/usr/lib/security \ - --enable-docbook-docs \ - --enable-udev-acl - make -} - -package() { - cd "$srcdir/ConsoleKit-$pkgver" - make DESTDIR="$pkgdir" install - install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/" - - # install the logrotate config - install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit" - - install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf" - - rm -rf "${pkgdir}/var/run" -} diff --git a/testing/consolekit/consolekit.logrotate b/testing/consolekit/consolekit.logrotate deleted file mode 100644 index 7c5346ef8..000000000 --- a/testing/consolekit/consolekit.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/ConsoleKit/history { - missingok - notifempty - delaycompress -} diff --git a/testing/consolekit/consolekit.tmpfiles.conf b/testing/consolekit/consolekit.tmpfiles.conf deleted file mode 100644 index 4ec125110..000000000 --- a/testing/consolekit/consolekit.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/ConsoleKit 0755 - - - diff --git a/testing/consolekit/pam-foreground-compat.ck b/testing/consolekit/pam-foreground-compat.ck deleted file mode 100644 index 7f6b122d5..000000000 --- a/testing/consolekit/pam-foreground-compat.ck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD deleted file mode 100644 index 4f2269db3..000000000 --- a/testing/cryptsetup/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159622 2012-05-25 23:50:39Z dreisner $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=cryptsetup -pkgver=1.4.2 -pkgrel=2 -pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" -arch=(i686 x86_64) -license=('GPL') -url="http://code.google.com/p/cryptsetup/" -groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.7') -options=('!libtool' '!emptydirs') -source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 - http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc - encrypt_hook - encrypt_install) -sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' - '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' - 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' - 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') - -build() { - cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}"/$pkgname-${pkgver} - make DESTDIR="${pkgdir}" install - # install hook - install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt - install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt -} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook deleted file mode 100644 index 372b7ba57..000000000 --- a/testing/cryptsetup/encrypt_hook +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - modprobe -a -q dm-crypt >/dev/null 2>&1 - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ -n "$cryptkey" ]; then - IFS=: read ckdev ckarg1 ckarg2 <<EOF -$cryptkey -EOF - - if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then - case ${ckarg1} in - *[!0-9]*) - # Use a file on the device - # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path - mkdir /ckey - mount -r -t "$ckarg1" "$resolved" /ckey - dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - IFS=: read cryptdev cryptname cryptoptions <<EOF -$cryptdevice -EOF - else - DEPRECATED_CRYPT=1 - cryptdev="${root}" - cryptname="root" - fi - - warn_deprecated() { - echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" - echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." - } - - for cryptopt in ${cryptoptions//,/ }; do - case ${cryptopt} in - allow-discards) - echo "Enabling TRIM/discard support." - cryptargs="${cryptargs} --allow-discards" - ;; - *) - echo "Encryption option '${cryptopt}' not known, ignoring." >&2 - ;; - esac - done - - if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then - if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "A password is required to access the ${cryptname} volume:" - - #loop until we get a real password - while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="cryptsetup create $cryptname $resolved $cryptargs" - IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF -$crypto -EOF - [ -n "$c_hash" ] && exe="$exe --hash '$c_hash'" - [ -n "$c_cipher" ] && exe="$exe --cipher '$c_cipher'" - [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'" - [ -n "$c_offset" ] && exe="$exe --offset '$c_offset'" - [ -n "$c_skip" ] && exe="$exe --skip '$c_skip'" - if [ -f "$ckeyfile" ]; then - exe="$exe --key-file $ckeyfile" - else - exe="$exe --verify-passphrase" - echo "" - echo "A password is required to access the ${cryptname} volume:" - fi - eval "$exe $CSQUIET" - - if [ $? -ne 0 ]; then - err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" - exit 1 - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - else - err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." - fi - fi - rm -f ${ckeyfile} -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install deleted file mode 100644 index 38e5ddc57..000000000 --- a/testing/cryptsetup/encrypt_install +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -build() { - local mod - - add_module dm-crypt - if [[ $CRYPTO_MODULES ]]; then - for mod in $CRYPTO_MODULES; do - add_module "$mod" - done - else - add_all_modules '/crypto/' - fi - - add_binary "cryptsetup" - add_binary "dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook allows for an encrypted root device. Users should specify the device -to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, -where 'device' is the path to the raw device, and 'dmname' is the name given to -the device after unlocking, and will be available as /dev/mapper/dmname. - -For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on -the kernel cmdline, where 'device' represents the raw block device where the key -exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is -the absolute path of the keyfile within the device. - -Without specifying a keyfile, you will be prompted for the password at runtime. -This means you must have a keyboard available to input it, and you may need -the keymap hook as well to ensure that the keyboard is using the layout you -expect. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/db/PKGBUILD b/testing/db/PKGBUILD deleted file mode 100644 index c68344b0f..000000000 --- a/testing/db/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 160337 2012-06-01 10:23:18Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=db -pkgver=5.3.21 -pkgrel=1 -pkgdesc="The Berkeley DB embedded database system" -arch=('i686' 'x86_64') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" -license=('custom') -depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install -source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') - -build() { - cd "${srcdir}"/$pkgname-${pkgver}/build_unix - ../dist/configure --prefix=/usr --enable-compat185 \ - --enable-shared --enable-static --enable-cxx --enable-dbm - make LIBSO_LIBS=-lpthread -} - -package() { - cd "${srcdir}"/$pkgname-${pkgver}/build_unix - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/docs - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/db/db.install b/testing/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/testing/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD deleted file mode 100644 index a3c1db830..000000000 --- a/testing/dmraid/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 159630 2012-05-26 00:03:09Z dreisner $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributor: Urs Wolfer <uwolfer @ fwo.ch> - -pkgname=dmraid -pkgver=1.0.0.rc16.3 -pkgrel=5 -pkgdesc="Device mapper RAID interface" -url="http://people.redhat.com/~heinzm/sw/dmraid/" -conflicts=('mkinitcpio<0.7') -depends=('device-mapper>=2.0.54') -arch=('i686' 'x86_64') -license=('GPL') -source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 - http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 - dmraid_install - dmraid_hook) -install=dmraid.install -md5sums=('819338fcef98e8e25819f0516722beeb' - '2297d23cee1aef23ec6ad8d6d1870356' - 'faec669dc85f87187b45b5d3968efe2c') - -build() { - cd "$pkgname/1.0.0.rc16-3/$pkgname" - ./configure --enable-led --enable-intel_led - make -} - -package() { - cd "$pkgname/1.0.0.rc16-3/$pkgname" - make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install - mkdir -p "$pkgdir"/var/lock/dmraid - chmod 1777 "$pkgdir"/var/lock/ - install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid - install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid - # fix permissions - chmod 644 "$pkgdir"/usr/lib/libdmraid.a - chmod 644 "$pkgdir"/usr/include/dmraid/* -} diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install deleted file mode 100644 index 64899e785..000000000 --- a/testing/dmraid/dmraid.install +++ /dev/null @@ -1,14 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then - # important upgrade notice - echo ">>>" - echo ">>> IMPORTANT DMRAID UPGRADE NOTICE" - echo ">>> -------------------------------" - echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:" - echo ">>> You need to add an additional 'p' in front of your number." - echo ">>> e.g. <yourname><number> --> <yourname>p<number>" - echo ">>> firsthd1 --> firsthdp1" - echo ">>> Please change your bootloader and fstab accordingly." - echo ">>>" - fi -} diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook deleted file mode 100644 index 37283e83e..000000000 --- a/testing/dmraid/dmraid_hook +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 - msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I - if [ "$quiet" = "y" ]; then - dmraid -ay -I -Z >/dev/null - else - dmraid -ay -I -Z - fi -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install deleted file mode 100644 index d3238c1f7..000000000 --- a/testing/dmraid/dmraid_install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -build() { - add_module 'dm-mod' - add_module 'dm-mirror' - - add_binary 'dmraid' - add_binary 'dmsetup' - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for a dmraid root device. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/e2fsprogs/MIT-LICENSE b/testing/e2fsprogs/MIT-LICENSE deleted file mode 100644 index d849b28f2..000000000 --- a/testing/e2fsprogs/MIT-LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu> -Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org> -Copyright (c) 2001 Alcove <http://www.alcove.com/> -Copyright (c) 1997 Klee Dienes -Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk> - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject -to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD deleted file mode 100644 index d9e0bc575..000000000 --- a/testing/e2fsprogs/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 159257 2012-05-19 19:11:50Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=e2fsprogs -pkgver=1.42.3 -pkgrel=1 -pkgdesc="Ext2/3/4 filesystem utilities" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'MIT') -url="http://e2fsprogs.sourceforge.net" -groups=('base') -depends=('sh' 'util-linux') -makedepends=('bc') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'MIT-LICENSE') -backup=('etc/mke2fs.conf') -install=${pkgname}.install -sha1sums=('0da8c787604876fe23b0f608389c3854ae1a2420' - 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in - - ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ - --enable-elf-shlibs --disable-fsck --disable-uuidd \ - --disable-libuuid --disable-libblkid - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-libs - - sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" - - # remove references to build directory - sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" - sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" - - # install MIT license - install -Dm644 "${srcdir}/MIT-LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" -} diff --git a/testing/e2fsprogs/e2fsprogs.install b/testing/e2fsprogs/e2fsprogs.install deleted file mode 100644 index 1a7fe20d7..000000000 --- a/testing/e2fsprogs/e2fsprogs.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libext2fs.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 -} - -post_upgrade() { - post_install $1 -} - -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/testing/e2fsprogs/mke2fs.conf b/testing/e2fsprogs/mke2fs.conf deleted file mode 100644 index 92464e3b4..000000000 --- a/testing/e2fsprogs/mke2fs.conf +++ /dev/null @@ -1,26 +0,0 @@ -[defaults] - base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr - blocksize = 4096 - inode_size = 128 - inode_ratio = 16384 - -[fs_types] - small = { - blocksize = 1024 - inode_size = 128 - inode_ratio = 4096 - } - floppy = { - blocksize = 1024 - inode_size = 128 - inode_ratio = 8192 - } - news = { - inode_ratio = 4096 - } - largefile = { - inode_ratio = 1048576 - } - largefile4 = { - inode_ratio = 4194304 - } diff --git a/testing/frozen-bubble/PKGBUILD b/testing/frozen-bubble/PKGBUILD deleted file mode 100644 index 961fd48ae..000000000 --- a/testing/frozen-bubble/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159825 2012-05-27 07:41:59Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> - -pkgname=frozen-bubble -_pkgver=2.2.1-beta1 -pkgver=${_pkgver/-/} -pkgrel=4 -pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" -arch=(i686 x86_64) -url="http://www.frozen-bubble.org" -license=(GPL2) -depends=(perl-sdl perl-ipc-system-simple perl-compress-bzip2 perl-file-which) -makedepends=(perl-file-slurp perl-locale-maketext-lexicon) -options=('!emptydirs') -source=(http://www.frozen-bubble.org/data/$pkgname-$_pkgver.tar.bz2 \ - frozen-bubble.desktop) -md5sums=('825cc23ed806838b9d86de9982a5687a' - '01b10b77ba6ad856f5c199121c582272') - -build() { - cd "$srcdir/$pkgname-$_pkgver" - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build test -} - -package() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build install destdir="$pkgdir" - - install -D -m644 share/icons/frozen-bubble-icon-64x64.png "$pkgdir/usr/share/pixmaps/frozen-bubble.png" - install -D -m644 "$srcdir/frozen-bubble.desktop" "$pkgdir/usr/share/applications/frozen-bubble.desktop" -} diff --git a/testing/frozen-bubble/frozen-bubble.desktop b/testing/frozen-bubble/frozen-bubble.desktop deleted file mode 100644 index 76a7bcd88..000000000 --- a/testing/frozen-bubble/frozen-bubble.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Frozen Bubble -Icon=frozen-bubble.png -Exec=/usr/bin/vendor_perl/frozen-bubble -Terminal=false -Categories=Game; diff --git a/testing/gconf-perl/PKGBUILD b/testing/gconf-perl/PKGBUILD deleted file mode 100644 index 8c5621fe4..000000000 --- a/testing/gconf-perl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159827 2012-05-27 07:42:01Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gconf-perl -pkgver=1.044 -pkgrel=7 -pkgdesc="Gnome2-GConf perl bindings for gconf" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('glib-perl' 'gconf' 'perl') -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz - disable-orbit.patch) -md5sums=('ea386003b18f067524833b0eeb271330' - '14852fc936ce7b552eb204913d55fd1c') - -build() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - patch -Np1 -i "${srcdir}/disable-orbit.patch" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - dbus-launch --exit-with-session make test -} - -package() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gconf-perl/disable-orbit.patch b/testing/gconf-perl/disable-orbit.patch deleted file mode 100644 index da526ec2e..000000000 --- a/testing/gconf-perl/disable-orbit.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Disable gconf_engine_key_is_writable - This symbol is not available in libgconf when it is configured without - ORBit support, which is currently the case in Debian. -Author: Colin Watson <cjwatson@ubuntu.com> -Bug-Debian: http://bugs.debian.org/649055 -Forwarded: no -Last-Update: 2011-11-17 - -Index: b/xs/GConfEngine.xs -=================================================================== ---- a/xs/GConfEngine.xs -+++ b/xs/GConfEngine.xs -@@ -350,6 +350,8 @@ - if (err) - gperl_croak_gerror (NULL, err); - -+#if 0 /* requires gconf to be configured with ORBit support */ -+ - ##gboolean gconf_engine_key_is_writable (GConfEngine *conf, - ## const gchar *key, - ## GError **err); -@@ -366,6 +368,8 @@ - OUTPUT: - RETVAL - -+#endif -+ - guint - gconf_engine_notify_add (engine, namespace_section, func, data=NULL) - GConfEngine * engine diff --git a/testing/glade-perl/PKGBUILD b/testing/glade-perl/PKGBUILD deleted file mode 100644 index 9473c968a..000000000 --- a/testing/glade-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 159829 2012-05-27 07:42:06Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=glade-perl -_realname=Gtk2-GladeXML -pkgver=1.007 -pkgrel=6 -pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('libglade' 'gtk2-perl' 'perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('e6ca234e2a9f0221263acd2a593c583b') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/glib-perl/PKGBUILD b/testing/glib-perl/PKGBUILD deleted file mode 100644 index 84e6e5037..000000000 --- a/testing/glib-perl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159831 2012-05-27 07:42:08Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=glib-perl -pkgver=1.260 -pkgrel=1 -pkgdesc="Perl wrappers for glib 2.x, including GObject" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('glib2>=2.24.1' 'perl>=5.14') -makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('faa052bdf6e9b87ea30b630c2806e71e') - -build() { - cd "${srcdir}/Glib-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Glib-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Glib-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-perl/PKGBUILD b/testing/gnome-perl/PKGBUILD deleted file mode 100644 index 2a3ea831a..000000000 --- a/testing/gnome-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 159833 2012-05-27 07:42:10Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-perl -_realname=Gnome2 -pkgver=1.042 -pkgrel=8 -pkgdesc="Perl bindings for libgnome" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('eb7b624114e45e54e022a633ffc1cce6') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD deleted file mode 100644 index b621753ac..000000000 --- a/testing/gnome-session/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 160710 2012-06-04 09:14:43Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-session -pkgver=3.4.2 -pkgrel=2 -pkgdesc="The GNOME Session Handler" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' - 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' - 'startup-notification' 'upower') -makedepends=('intltool' 'mesa' 'xtrans') -options=('!emptydirs') -install=gnome-session.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-session-3.3.1-llvmpipe.patch timeout.patch) -sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356' - '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' - '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782') - -build() { - cd $pkgname-$pkgver - - # Allow software rendering - patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch - - # Increase timeout, for slow machines - patch -Np1 -i ../timeout.patch - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile --enable-systemd - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch deleted file mode 100644 index 40da1c9b7..000000000 --- a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility ---- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 -+++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 -@@ -20,4 +20,4 @@ - - # Gallium has softpipe and llvmpipe - -softpipe ---llvmpipe -+#llvmpipe diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/testing/gnome-session/gnome-session.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-session/timeout.patch b/testing/gnome-session/timeout.patch deleted file mode 100644 index 20500206b..000000000 --- a/testing/gnome-session/timeout.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c ---- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-04 11:06:35.911690067 +0200 -@@ -30,7 +30,7 @@ - #include <X11/Xatom.h> - - /* Wait up to this long for a running check to finish */ --#define PROPERTY_CHANGE_TIMEOUT 5000 -+#define PROPERTY_CHANGE_TIMEOUT 10000 - - /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ - #define NO_ACCEL 0 diff --git a/testing/gnome-vfs-perl/PKGBUILD b/testing/gnome-vfs-perl/PKGBUILD deleted file mode 100644 index bc9889609..000000000 --- a/testing/gnome-vfs-perl/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 159835 2012-05-27 07:42:12Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-vfs-perl -_realname=Gnome2-VFS -pkgver=1.081 -pkgrel=5 -pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gtk2-perl' 'gnome-vfs' 'perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('3d220cbbe9f1ebc78d7047593f9cd633') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnomecanvas-perl/PKGBUILD b/testing/gnomecanvas-perl/PKGBUILD deleted file mode 100644 index ace4e1d03..000000000 --- a/testing/gnomecanvas-perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 159837 2012-05-27 07:42:14Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnomecanvas-perl -_realname=Gnome2-Canvas -pkgver=1.002 -pkgrel=10 -pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gtk2-perl' 'libgnomecanvas' 'perl') -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('93405a987ba4bbd03c2f91592b88f5cb') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/gnumeric/PKGBUILD b/testing/gnumeric/PKGBUILD deleted file mode 100644 index 8b88c8cd6..000000000 --- a/testing/gnumeric/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 159839 2012-05-27 07:42:16Z bluewind $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=gnumeric -pkgver=1.10.17 -pkgrel=2 -pkgdesc="A GNOME Spreadsheet Program" -arch=('i686' 'x86_64') -url="http://www.gnome.org/projects/gnumeric/" -license=('GPL') -depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') -optdepends=('pygobject: for python plugin support' - 'psiconv: for Psion 5 file support' - 'yelp: for viewing the help manual') -install=gnumeric.install -options=('libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Remove invalid mime type. (FS#26338) - sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-schemas-install --enable-ssindex - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}/etc/gconf" -} diff --git a/testing/gnumeric/gnumeric.install b/testing/gnumeric/gnumeric.install deleted file mode 100644 index 50ee0a7e2..000000000 --- a/testing/gnumeric/gnumeric.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=gnumeric - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} diff --git a/testing/gpm/PKGBUILD b/testing/gpm/PKGBUILD deleted file mode 100644 index 6f925253c..000000000 --- a/testing/gpm/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 160095 2012-05-29 22:27:52Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gpm -pkgver=1.20.6 -pkgrel=8 -pkgdesc="A mouse server for the console and xterm" -arch=('i686' 'x86_64') -url="http://www.nico.schottelius.org/software/gpm/" -license=('GPL') -depends=('ncurses' 'bash') -backup=('etc/conf.d/gpm') -options=('!makeflags') -install=gpm.install -source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ - gpm gpm.conf.d gpm.sh gpm.service) -sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' - '19e1feb1493373512a77801699df012d186336ea' - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' - '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '2db35b5f587b8dd21f9943610e7dd70469f888c7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" - install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" - install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" - -# library fixes - cd "${pkgdir}/usr/lib/" - ln -s libgpm.so.2.* libgpm.so - chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* -} diff --git a/testing/gpm/gpm b/testing/gpm/gpm deleted file mode 100755 index 7b5213dd7..000000000 --- a/testing/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gpm/gpm.conf.d b/testing/gpm/gpm.conf.d deleted file mode 100644 index ab43bb7eb..000000000 --- a/testing/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice -t imps2" diff --git a/testing/gpm/gpm.install b/testing/gpm/gpm.install deleted file mode 100644 index 2a1519a6c..000000000 --- a/testing/gpm/gpm.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=/usr/share/info -file=gpm.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/testing/gpm/gpm.service b/testing/gpm/gpm.service deleted file mode 100644 index 3e52af729..000000000 --- a/testing/gpm/gpm.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=GPM daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/gpm diff --git a/testing/gpm/gpm.sh b/testing/gpm/gpm.sh deleted file mode 100755 index af35a5f33..000000000 --- a/testing/gpm/gpm.sh +++ /dev/null @@ -1,3 +0,0 @@ -case $( /usr/bin/tty ) in - /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;; -esac diff --git a/testing/graphicsmagick/PKGBUILD b/testing/graphicsmagick/PKGBUILD deleted file mode 100644 index 82457af4a..000000000 --- a/testing/graphicsmagick/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 159841 2012-05-27 07:42:18Z bluewind $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Anton Leontiev <bunder@t-25.ru> - -pkgname=graphicsmagick -pkgver=1.3.15 -pkgrel=2 -pkgdesc='Image processing system' -url='http://www.graphicsmagick.org/' -arch=('i686' 'x86_64') -license=('MIT') -makedepends=('perl') -depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' - 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546') - -build() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - # fix typemap bug - # https://rt.cpan.org/Public/Bug/Display.html?id=70150 - # http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap - echo 'Graphics::Magick T_PTROBJ' > typemap - - ./configure \ - --prefix=/usr \ - --with-perl \ - --enable-shared \ - --disable-static \ - --with-gs-font-dir=/usr/share/fonts/Type1 \ - - make -} - -package() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Install MIT license - install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt" - - # Install perl bindings - # The patching was introduced in order to build perl module without installing package itself and - # not to introduce unnecessary path into LD_RUN_PATH - cd PerlMagick - sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL - perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}" - sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile - make - make install - - # Remove perllocal.pod and .packlist - rm -rf "${pkgdir}/usr/lib/perl5/core_perl" - rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist" -} diff --git a/testing/graphviz/LICENSE b/testing/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/testing/graphviz/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/testing/graphviz/PKGBUILD b/testing/graphviz/PKGBUILD deleted file mode 100644 index 2b25b62d9..000000000 --- a/testing/graphviz/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 159843 2012-05-27 07:42:21Z bluewind $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=graphviz -pkgver=2.28.0 -pkgrel=10 -pkgdesc='Graph visualization software' -url='http://www.graphviz.org/' -license=('custom:EPL') -arch=('i686' 'x86_64') -depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') -optdepends=('mono: sharp bindings' - 'guile: guile bindings' - 'lua: lua bindings' - 'ocaml: ocaml bindings' - 'perl: perl bindings' - 'php: php bindings' - 'python2: python bindings' - 'r: r bindings' - 'ruby: ruby bindings' - 'tcl: tcl bindings' - 'qt: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' - 'e78277e502c29abb74b9587a5dc951ec392554ea') - -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed \ - -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ - -e '/CONFIG/s:site:vendor:' \ - -i config/config_ruby.rb - - sed '/LIBPOSTFIX="64"/d' -i configure - export PYTHON=python2 - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # cf. http://www.graphviz.org/License.php - install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE -} diff --git a/testing/graphviz/install b/testing/graphviz/install deleted file mode 100644 index 65fba522b..000000000 --- a/testing/graphviz/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/testing/gtk2-perl/PKGBUILD b/testing/gtk2-perl/PKGBUILD deleted file mode 100644 index cdd9c242f..000000000 --- a/testing/gtk2-perl/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159845 2012-05-27 07:42:23Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=gtk2-perl -pkgver=1.244 -pkgrel=1 -pkgdesc="Perl bindings for GTK+ 2.x" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gtk2' 'pango-perl') -checkdepends=('ttf-dejavu' 'xorg-server-xvfb') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz) -md5sums=('191fda807f44a7c82d699838bf544bca') - -build() { - cd "${srcdir}/Gtk2-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Gtk2-${pkgver}" - LD_PRELOAD="" Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make test - kill $! -} - -package() { - cd "${srcdir}/Gtk2-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD deleted file mode 100644 index ec3d955e0..000000000 --- a/testing/gvfs/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 159966 2012-05-27 13:10:45Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.12.3 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') -url="http://www.gnome.org" -options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2') - -build() { - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/usr/share/bash-completion/completions - make -} - -package_gvfs() { - pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') - optdepends=('gvfs-afc: AFC (mobile devices) support' - 'gvfs-smb: SMB/CIFS (Windows client) support' - 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' - 'gvfs-obexftp: ObexFTP (bluetooth) support' - 'gvfs-afp: Apple Filing Protocol (AFP) support') - install=gvfs.install - - cd "$pkgbase-$pkgver" - sed -e 's/^am__append_4/#am__append_4/' \ - -e 's/^am__append_5/#am__append_5/' \ - -i monitor/Makefile - make DESTDIR="$pkgdir" install - - cd "$pkgdir" - rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} - rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount - rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml - rm usr/share/GConf/gsettings/gvfs-smb.convert -} - -package_gvfs-smb() { - pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') - install=gvfs-smb.install - - cd "$pkgbase-$pkgver/daemon" - install -m755 -d "$pkgdir/usr/lib/gvfs" - install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - - install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" - - install -Dm644 org.gnome.system.smb.gschema.xml \ - "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" - install -Dm644 gvfs-smb.convert \ - "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" -} - -package_gvfs-afc() { - pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=$pkgver" 'libimobiledevice') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" - - cd "$srcdir/$pkgbase-$pkgver/monitor/afc" - make DESTDIR="$pkgdir" install -} - -package_gvfs-gphoto2() { - pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" - - cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" - make DESTDIR="$pkgdir" install -} - -package_gvfs-obexftp() { - pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" -} - -package_gvfs-afp() { - pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" - depends=("gvfs=$pkgver") - install=gvfs-module.install - install -m755 -d "$pkgdir/usr/lib/gvfs" - install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - - cd "$pkgbase-$pkgver/daemon" - install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" - install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" -} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install deleted file mode 100644 index 09d1f11ec..000000000 --- a/testing/gvfs/gvfs-module.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install deleted file mode 100644 index da6a2ab6d..000000000 --- a/testing/gvfs/gvfs-smb.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install deleted file mode 100644 index 3482d99e3..000000000 --- a/testing/gvfs/gvfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD deleted file mode 100644 index 5c69c66c5..000000000 --- a/testing/imagemagick/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 160328 2012-06-01 05:36:53Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.7.5 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - perlmagick.rpath.patch) -sha1sums=('44b307c97c9bc27f60963306c82e2de5e37dcfb5' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --install - patch -p0 -i ../perlmagick.rpath.patch - - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw --without-lqr - make -} - -check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check -} - -package_imagemagick() { - pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext') - optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/quantization-table.xml' - 'etc/ImageMagick/sRGB.icc' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') - options=('!docs' 'libtool' '!emptydirs') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - -#Cleaning - find "${pkgdir}" -name '*.bs' -delete - rm -f "${pkgdir}"/usr/lib/*.la -} - -package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - - cd "${srcdir}"/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/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/testing/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/testing/irssi/PKGBUILD b/testing/irssi/PKGBUILD deleted file mode 100644 index 7996ffff3..000000000 --- a/testing/irssi/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159849 2012-05-27 07:42:28Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dan McGee <dan@archlinux.org> - -pkgname=irssi -pkgver=0.8.15 -pkgrel=6 -pkgdesc="Modular text mode IRC client with Perl scripting" -arch=('i686' 'x86_64') -url="http://irssi.org/" -license=('GPL') -depends=('glib2' 'openssl') -optdepends=('perl-libwww: for the scriptassist script') -backup=('etc/irssi.conf') -source=("http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2") -options=('!libtool') -md5sums=('1dcb3f511b88df94b0c996f36668c7da') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --enable-ipv6 \ - --with-proxy \ - --sysconfdir=/etc \ - --with-perl-lib=vendor - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD deleted file mode 100644 index 5a0656731..000000000 --- a/testing/java7-openjdk/PKGBUILD +++ /dev/null @@ -1,353 +0,0 @@ -# $Id: PKGBUILD 160312 2012-05-31 21:40:36Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Guillaume ALAUX <guillaume@archlinux.org> - -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 -pkgbase=java7-openjdk -_java_ver=7 -_updatever=u4 -_openjdk_build=b21 -_openjdk_date=27_jun_2011 -_icedtea_ver=2.2 -_date=20110922 - -# check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=3231f3e9c517 -_HOTSPOT_CHANGESET=bfe5efd70bce -_JAXP_CHANGESET=0036fe6fe7dc -_JAXWS_CHANGESET=abfb890c262a -_JDK_CHANGESET=839d0155f7cc -_LANGTOOLS_CHANGESET=f855bdb37537 -_OPENJDK_CHANGESET=49a6fc8f712f - -_bootstrap=0 # 0/1 for quick build or full bootstrap - -pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org" -license=('custom') -options=('!emptydirs') -makedepends=('jdk7-openjdk' 'libxp' 'libxslt' - 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' - 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? -[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') - -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 -source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} - ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz - fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff - openjdk7_nonreparenting-wm.diff - jdk7-openjdk.profile - jdk7-openjdk.profile.csh - jre7-openjdk.profile - jre7-openjdk.profile.csh) -sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5' - '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130' - '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54' - '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274' - '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2' - 'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a' - '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7' - 'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19' - '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514' - '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' - 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' - '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' - 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' - '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') - -noextract=("${_OPENJDK_CHANGESET}.tar.gz" - "${_CORBA_CHANGESET}.tar.gz" - "${_JAXP_CHANGESET}.tar.gz" - "${_JAXWS_CHANGESET}.tar.gz" - "${_JDK_CHANGESET}.tar.gz" - "${_LANGTOOLS_CHANGESET}.tar.gz" - "${_HOTSPOT_CHANGESET}.tar.gz") - - _jvmdir=/usr/lib/jvm/java-7-openjdk - - [ "$CARCH" = "x86_64" ] && _JARCH=amd64 - [ "$CARCH" = "i686" ] && _JARCH=i386 - -build() { - cd "${srcdir}/icedtea-${_icedtea_ver}" - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh - - unset MAKEFLAGS # parallel build is currently broken - - export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" - export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" - - . /etc/profile.d/apache-ant.sh - - cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" - - if [ "$_bootstrap" = "1" ]; then - BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" - else - BOOTSTRAPOPT="--disable-bootstrap" - fi - - ./configure \ - $BOOTSTRAPOPT \ - --with-parallel-jobs="${MAKEFLAGS/-j}" \ - --disable-tests \ - --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \ - --with-jdk-home=${JAVA_HOME} \ - --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ - --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ - --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ - --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ - --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ - --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ - --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ - --enable-pulse-java \ - --enable-nss \ - --with-rhino \ - --with-abs-install-dir=${_jvmdir} - #--help - #--enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR - - make -} - -check() { - cd "${srcdir}/icedtea-${_icedtea_ver}" - make -k check -} - -package_jre7-openjdk-headless() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" - depends=('libjpeg-turbo' 'lcms2' 'nss' - 'ca-certificates-java' 'java-rhino') - optdepends=('libcups: needed for Java Mauve support - libmawt.so' - 'fontconfig: needed for Java Mauve support - libmawt.so') - provides=('java-runtime-headless=7') - conflicts=('openjdk6') - # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre.sh - etc/profile.d/jre.csh - etc/java-7-openjdk/calendars.properties - etc/java-7-openjdk/content-types.properties - etc/java-7-openjdk/cursors/cursors.properties - etc/java-7-openjdk/flavormap.properties - etc/java-7-openjdk/fontconfig.bfc - etc/java-7-openjdk/fontconfig.properties - etc/java-7-openjdk/jvm.cfg - etc/java-7-openjdk/logging.properties - etc/java-7-openjdk/management/jmxremote.access - etc/java-7-openjdk/management/jmxremote.password - etc/java-7-openjdk/management/management.properties - etc/java-7-openjdk/management/snmp.acl - etc/java-7-openjdk/net.properties - etc/java-7-openjdk/psfont.properties.ja - etc/java-7-openjdk/psfontj2d.properties - etc/java-7-openjdk/security/java.policy - etc/java-7-openjdk/security/java.security - etc/java-7-openjdk/security/nss.cfg - etc/java-7-openjdk/sound.properties - etc/java-7-openjdk/tz.properties) - install=jre7-openjdk-headless.install - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" - - mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties - mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc - rm -f lib/fontconfig.*.bfc - rm -f lib/fontconfig.*.properties.src - rm -f lib/fontconfig.properties.src - - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre - - # Install man pages - pushd ../../j2re-image/man - install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ - install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 - install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 - popd - - # more files that belong to the desktop package - mkdir ${srcdir}/tmp-desktop-jre - for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do - dirname=`dirname $file` - install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true - # mv file from fakeinstall to pkgdir - mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file - done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt - - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ - for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin - done - popd - - # Link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" - - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh - install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh - - # Install license - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ - install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ - ${pkgdir}/usr/share/licenses/${pkgbase} - - # Put some more files under backup control - install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ - # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ - for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do - ln -vsf /etc/java-7-openjdk/`basename $file` . - done - # some more - install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ - ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . - popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management - ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security - ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . - popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ - ln -vsf /etc/java-7-openjdk/jvm.cfg . - popd -} - -package_jre7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" - depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') - optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' - 'alsa-lib: for basic sound support' - 'giflib: for gif format support' - 'libpulse: for advanced sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage' - 'libxtst: linked in xawt/libmawt.so - desktop usage') - install=jre7-openjdk.install - provides=('java-runtime=7') - conflicts=('openjdk6') - - mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} - # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin - install -m755 -d ${pkgdir}/usr/bin/ - for file in *; do - ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin - done - popd - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" - - # Install icons and menu entries - for s in 16 24 32 48 ; do - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ - install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ - ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png - done - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications -} - -package_jdk7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" - depends=('jre7-openjdk') - provides=('java-environment=7') - conflicts=('java-environment') - # replaces=('openjdk6') - backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) - - cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" - - # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ - - cp -a demo include lib sample ${pkgdir}/${_jvmdir} - - # 'bin' files - pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ - ${pkgdir}/usr/bin/ \ - ${pkgdir}/usr/share/man/{,ja/}man1/ - - # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page - for b in $(ls | grep -v java-rmi.cgi); do - if [ -e ../jre/bin/${b} ]; then - # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} - else - # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} - # Copy man page - install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 - install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 - # Link from /bin/ - ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} - fi - done - popd - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications - - # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi - - # Set some variables - install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh - install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh -} - -package_openjdk7-src() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" - - install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip -} diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff deleted file mode 100644 index 7a3db9567..000000000 --- a/testing/java7-openjdk/fix_corba_cmds_path.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ - # others have it in /usr/bin. - SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) -- NAWK = $(USRBIN_PATH)gawk -+ NAWK = $(UTILS_COMMAND_PATH)gawk - # Intrinsic unix command, with backslash-escaped character interpretation - ECHO = /bin/echo -e - # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff deleted file mode 100644 index fa08db629..000000000 --- a/testing/java7-openjdk/fontconfig-paths.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 -+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 -@@ -275,73 +275,61 @@ - - # Font File Names - --filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf --filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf --filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf --filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf -- --filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf --filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf --filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf --filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -- --filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf --filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf --filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf --filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf -- --filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf -- --filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf --filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf --filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf --filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf --filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf --filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf --filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf --filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf --filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf --filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf --filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf --filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf -- --filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf --filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf --filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf --filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf --#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf --filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf --filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf --filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf --filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf --filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf -- --filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf --filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf --filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf --filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf --filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf --filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf --filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf --filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf --filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf --filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf --filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf --filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf -- --# AWT X11 font paths --awtfontpath.latin-1=/usr/share/fonts/X11/Type1 --awtfontpath.umingcn=/usr/share/fonts/truetype/arphic --awtfontpath.uminghk=/usr/share/fonts/truetype/arphic --awtfontpath.umingtw=/usr/share/fonts/truetype/arphic --awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic --awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy --awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi --awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami --awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic --awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk --awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts -+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf -+ -+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf -+ -+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf -+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf -+ -+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc -+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf -+ -+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf -+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf -+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf -+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf -+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf -+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf -+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf -+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf -+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf -+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf -+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf -+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf -+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf -+ -+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf -+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf -+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf -+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf -+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf -+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf -+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf -+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf -+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf -+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf -+ -+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf -+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf -+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf -+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf -+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf -+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf -+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf -+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf -+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf -+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf -+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf -+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf -+ diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile deleted file mode 100644 index 91265cc86..000000000 --- a/testing/java7-openjdk/jdk7-openjdk.profile +++ /dev/null @@ -1,6 +0,0 @@ -export J2SDKDIR=/usr/lib/jvm/java-7-openjdk -export J2REDIR=$J2SDKDIR/jre -export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7.sh diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh deleted file mode 100644 index cc7dc8ab1..000000000 --- a/testing/java7-openjdk/jdk7-openjdk.profile.csh +++ /dev/null @@ -1 +0,0 @@ -setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/testing/java7-openjdk/jre7-openjdk-headless.install b/testing/java7-openjdk/jre7-openjdk-headless.install deleted file mode 100644 index 45f52fe32..000000000 --- a/testing/java7-openjdk/jre7-openjdk-headless.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -} - -post_upgrade() { - if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore - fi -} - -#post_remove() { -# -#} diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install deleted file mode 100644 index d98e79ec5..000000000 --- a/testing/java7-openjdk/jre7-openjdk.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre.sh" -# update-desktop-database -q -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} - - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -# update-desktop-database -q -} diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile deleted file mode 100644 index c86ce857a..000000000 --- a/testing/java7-openjdk/jre7-openjdk.profile +++ /dev/null @@ -1,5 +0,0 @@ -export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre -export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} - -# enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh deleted file mode 100644 index a9aed27d1..000000000 --- a/testing/java7-openjdk/jre7-openjdk.profile.csh +++ /dev/null @@ -1,5 +0,0 @@ -setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" -setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" - -# enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff deleted file mode 100644 index 6cac91dd6..000000000 --- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,7 +91,7 @@ - CHMOD = $(UTILS_COMMAND_PATH)chmod - CMP = $(UTILS_USR_BIN_PATH)cmp - COMM = $(UTILS_USR_BIN_PATH)comm --COMPRESS = $(UTILS_USR_BIN_PATH)compress -+COMPRESS = $(UTILS_COMMAND_PATH)compress - CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio - CUT = $(UTILS_USR_BIN_PATH)cut -@@ -101,13 +101,13 @@ - DIRNAME = $(UTILS_USR_BIN_PATH)dirname - DUMP = $(UTILS_CCS_BIN_PATH)dump - ECHO = $(UTILS_COMMAND_PATH)echo --EGREP = $(UTILS_COMMAND_PATH)egrep -+EGREP = $(UTILS_USR_BIN_PATH)egrep - EXPR = $(UTILS_USR_BIN_PATH)expr - FILE = $(UTILS_USR_BIN_PATH)file - FIND = $(UTILS_USR_BIN_PATH)find - FMT = $(UTILS_COMMAND_PATH)fmt - GDB = $(UTILS_USR_BIN_PATH)gdb --GREP = $(UTILS_COMMAND_PATH)grep -+GREP = $(UTILS_USR_BIN_PATH)grep - GUNZIP = $(UTILS_COMMAND_PATH)gunzip - # GZIP is used for solaris. Linux and windows use tar czf - GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -140,7 +140,7 @@ - TAIL = $(UTILS_USR_BIN_PATH)tail - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test --TOUCH = $(UTILS_COMMAND_PATH)touch -+TOUCH = $(UTILS_USR_BIN_PATH)touch - TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff deleted file mode 100644 index 22d54fc42..000000000 --- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 -@@ -103,7 +103,8 @@ - COMPIZ_WM = 12, - LG3D_WM = 13, - CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -583,7 +584,7 @@ - // TODO: according to wikipedia, compiz is now reparenting. This should - // probably be updated. - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -771,9 +772,17 @@ - * supports WIN or _NET wm spec. - */ - else if (l_net_protocol.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } else if (win.active()) { -- awt_wmgr = XWM.OTHER_WM; -+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } else { -+ awt_wmgr = XWM.OTHER_WM; -+ } - } - /* - * Check for legacy WMs. -@@ -784,6 +793,8 @@ - awt_wmgr = XWM.MOTIF_WM; - } else if (isOpenLook()) { - awt_wmgr = XWM.OPENLOOK_WM; -+ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; - } else { - awt_wmgr = XWM.OTHER_WM; - } -@@ -1298,6 +1309,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; diff --git a/testing/kdebindings-perlkde/PKGBUILD b/testing/kdebindings-perlkde/PKGBUILD deleted file mode 100644 index 054279f8c..000000000 --- a/testing/kdebindings-perlkde/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159851 2012-05-27 07:42:30Z bluewind $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlkde -pkgver=4.8.3 -pkgrel=2 -pkgdesc="Perl bindings for the KDE libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -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=('bfc1c3a86789832cf7747dfc854d586d86c10a99') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlkde-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/kdebindings-perlqt/PKGBUILD b/testing/kdebindings-perlqt/PKGBUILD deleted file mode 100644 index 36a711acd..000000000 --- a/testing/kdebindings-perlqt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159853 2012-05-27 07:42:34Z bluewind $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlqt -pkgver=4.8.3 -pkgrel=2 -pkgdesc="Perl bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -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=('d0d0d5da1fd9c50bd19ff2bb49d6a71a2d97759f') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlqt-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libatasmart/PKGBUILD b/testing/libatasmart/PKGBUILD deleted file mode 100644 index 15d9e756d..000000000 --- a/testing/libatasmart/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 159970 2012-05-27 13:10:54Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libatasmart -pkgver=0.18 -pkgrel=2 -pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('udev') -url="http://0pointer.de/blog/projects/being-smart.html" -options=('!libtool') -source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz") -md5sums=('dc22b7acda1c2230f55ae98737e8b159') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libcanberra/PKGBUILD b/testing/libcanberra/PKGBUILD deleted file mode 100644 index 890b6fc19..000000000 --- a/testing/libcanberra/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 159972 2012-05-27 13:10:57Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libcanberra -pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) -pkgver=0.28 -pkgrel=5 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" -arch=(i686 x86_64) -license=('LGPL') -depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb') -makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3') -options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - libcanberra.xinit) -sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c' - '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - make -} - -package_libcanberra() { - install=libcanberra.install - optdepends=("$pkgbase-pulse: PulseAudio driver" - "$pkgbase-gstreamer: GStreamer driver") - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install - rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la - rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la - - install -d "${pkgdir}/usr/share/gconf" - mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/" - - install -D "${srcdir}/libcanberra.xinit" \ - "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" - - # Split plugins - for _p in pulse gstreamer; do - mkdir $_p-plugin - mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin - done -} - -package_libcanberra-pulse() { - pkgdesc="PulseAudio plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" - mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" -} - -package_libcanberra-gstreamer() { - pkgdesc="GStreamer plugin for libcanberra" - depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" - mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" -} diff --git a/testing/libcanberra/libcanberra.install b/testing/libcanberra/libcanberra.install deleted file mode 100644 index 7f5012199..000000000 --- a/testing/libcanberra/libcanberra.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=libcanberra - -post_install() { - if [ -x usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --install ${pkgname} - fi -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - pre_remove - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if [ -x usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} diff --git a/testing/libcanberra/libcanberra.xinit b/testing/libcanberra/libcanberra.xinit deleted file mode 100644 index 2511e9f8a..000000000 --- a/testing/libcanberra/libcanberra.xinit +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome) # Done by gnome-settings-daemon - ;; - *) - # Extra check in case DESKTOP_SESSION is not set correctly - if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then - if [[ -z $GTK_MODULES ]]; then - GTK_MODULES="canberra-gtk-module" - else - GTK_MODULES="$GTK_MODULES:canberra-gtk-module" - fi - export GTK_MODULES - fi - ;; -esac diff --git a/testing/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD deleted file mode 100644 index b8d6ea75e..000000000 --- a/testing/libpipeline/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 160037 2012-05-28 11:30:14Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=libpipeline -pkgver=1.2.1 -pkgrel=1 -pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" -arch=('i686' 'x86_64') -url="http://libpipeline.nongnu.org/" -license=('GPL') -depends=('glibc') -options=('!libtool') -source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) -md5sums=('20896c919eca4acb3d2f13012fb7ba02') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/testing/libproxy/PKGBUILD b/testing/libproxy/PKGBUILD deleted file mode 100644 index ca6d9e2d0..000000000 --- a/testing/libproxy/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libproxy -pkgver=0.4.7 -pkgrel=2 -pkgdesc="A library that provides automatic proxy configuration management" -arch=(i686 x86_64) -license=('LGPL') -depends=('gcc-libs') -optdepends=('kdelibs: KDE configuration module' - 'networkmanager: NetworkManager configuration module' - 'perl: Perl bindings' - 'python2: Python bindings') -makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') -url="http://libproxy.googlecode.com" -source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz - libproxy-0.4.7-unistd.patch) -options=('!libtool') -md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5' - 'e90c03f296e553ace347b46f4fea3625') - -build() { - cd "${srcdir}" - - # Fix build with GCC 4.7 (patch from Fedora) - patch -d "${pkgname}-${pkgver}" -Np1 -i \ - "${srcdir}/libproxy-0.4.7-unistd.patch" - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ - -DCMAKE_SKIP_RPATH=ON \ - -DPERL_VENDORINSTALL=yes \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_WEBKIT=OFF \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ - -DCMAKE_C_FLAGS="${CFLAGS}" - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libproxy/libproxy-0.4.7-unistd.patch b/testing/libproxy/libproxy-0.4.7-unistd.patch deleted file mode 100644 index 803f81970..000000000 --- a/testing/libproxy/libproxy-0.4.7-unistd.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- libproxy-0.4.7/libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027 +0000 -+++ libproxy-0.4.7/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 -@@ -27,6 +27,7 @@ - #define close _close - #endif - #include <fcntl.h> // For ::open() -+#include <unistd.h> // For ::read() and ::close() - #include <cstring> // For memcpy() - #include <sstream> // For int/string conversion (using stringstream) - #include <cstdio> // For sscanf() ---- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig 2012-02-28 21:06:01.552943358 +0000 -+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include <sys/stat.h> -+#include <unistd.h> - #include <cstdlib> - #include <map> - #include <fstream> ---- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28 21:06:11.637943033 +0000 -+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ******************************************************************************/ - -+#include <unistd.h> // for ::gethostname() - #include <cstring> // ? - - #include "../extension_pacrunner.hpp" ---- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28 21:06:29.615943614 +0000 -+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - ******************************************************************************/ - -+#include <unistd.h> // for ::gethostname() - #include "../extension_pacrunner.hpp" - using namespace libproxy; - diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD deleted file mode 100644 index 800d1542b..000000000 --- a/testing/libusbx/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 160333 2012-06-01 09:33:39Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=libusbx -pkgver=1.0.11 -pkgrel=2 -depends=('glibc') -pkgdesc="Library that provides generic access to USB device" -arch=(i686 x86_64) -url="http://libusbx.org" -license=('LGPL') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -options=(!libtool) -replaces=('libusb1' 'libusb') -provides=("libusb=$pkgver") -conflicts=("libusb") - -md5sums=('9aaab6aee72f65900cc731ecbffb4cf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD deleted file mode 100644 index ec4162aa4..000000000 --- a/testing/lighttpd/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 160272 2012-05-31 20:35:57Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=lighttpd -pkgver=1.4.31 -pkgrel=1 -pkgdesc='A secure, fast, compliant and very flexible web-server' -license=('custom') -arch=('i686' 'x86_64') -url="http://www.lighttpd.net/" -depends=('pcre' 'bzip2' 'libldap' 'util-linux') -makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig') -optdepends=('libxml2: mod_webdav' - 'lua: mod_cml/mod_magnet' - 'libmysqlclient: mod_mysql_vhost' - 'sqlite: mod_webdav') -backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') -options=('!libtool' 'emptydirs') -install='lighttpd.install' -source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" - "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') -sha256sums=('8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2' - '0ba44866f6ebdf6fefc8efba89240eacff075b5d1b80e0d7a9e0479491ff01a7' - '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17' - '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' - 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' - 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' - '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr \ - --libdir=/usr/lib/lighttpd/ \ - --sysconfdir=/etc/lighttpd \ - --with-mysql \ - --with-ldap \ - --with-attr \ - --with-openssl \ - --with-kerberos5 \ - --without-fam \ - --with-webdav-props \ - --with-webdav-locks \ - --with-gdbm \ - --with-memcache \ - --with-lua - make -} - -check() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd - install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd - install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf - install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ - install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf - install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service - - pushd doc/config >/dev/null - find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; - popd >/dev/null - - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} diff --git a/testing/lighttpd/lighttpd.conf b/testing/lighttpd/lighttpd.conf deleted file mode 100644 index ed192352a..000000000 --- a/testing/lighttpd/lighttpd.conf +++ /dev/null @@ -1,12 +0,0 @@ -# This is a minimal example config -# See /usr/share/doc/lighttpd -# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions - -server.port = 80 -server.username = "http" -server.groupname = "http" -server.document-root = "/srv/http" -server.errorlog = "/var/log/lighttpd/error.log" -dir-listing.activate = "enable" -index-file.names = ( "index.html" ) -mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" ) diff --git a/testing/lighttpd/lighttpd.install b/testing/lighttpd/lighttpd.install deleted file mode 100644 index 6b471f633..000000000 --- a/testing/lighttpd/lighttpd.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - if [[ ! -d run/lighttpd ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf - fi -} - -post_upgrade() { - post_install -} diff --git a/testing/lighttpd/lighttpd.logrotate.d b/testing/lighttpd/lighttpd.logrotate.d deleted file mode 100644 index 76f98785c..000000000 --- a/testing/lighttpd/lighttpd.logrotate.d +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/lighttpd/*log { - missingok - copytruncate - notifempty - sharedscripts - postrotate - /usr/bin/killall -HUP lighttpd-angel &>/dev/null || true - endscript -} diff --git a/testing/lighttpd/lighttpd.rc.d b/testing/lighttpd/lighttpd.rc.d deleted file mode 100644 index c2c41b818..000000000 --- a/testing/lighttpd/lighttpd.rc.d +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -pid_file='/run/lighttpd/lighttpd-angel.pid' - -get_pid() { - if [ -r "${pid_file}" ]; then - cat "${pid_file}" - else - pgrep -f /usr/sbin/lighttpd-angel - fi -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/lighttpd/lighttpd.conf ]; then - stat_append '(/etc/lighttpd/lighttpd.conf not found)' - stat_die - fi - - /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_append '(error in /etc/lighttpd/lighttpd.conf)' - stat_die - fi - - stat_done -} - -start() { - stat_busy 'Starting lighttpd' - - local PID=$(get_pid) - if [ -z "$PID" ]; then - nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & - if [ $? -gt 0 ]; then - stat_die - else - echo $! > "${pid_file}" - add_daemon lighttpd - stat_done - fi - else - stat_die - fi -} - -stop() { - stat_busy 'Stopping lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -gracefull-stop() { - stat_busy 'Stopping lighttpd gracefully' - local PID=$(get_pid) - [ -n "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - [ -f "${pid_file}" ] && rm -f "${pid_file}" - rm_daemon lighttpd - stat_done - fi -} - -reload() { - stat_busy 'Reloading lighttpd' - local PID=$(get_pid) - [ -n "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_die - else - stat_done - fi -} - - -case "$1" in - start) - test_config - start - ;; - stop) - test_config - stop - ;; - gracefull-stop) - test_config - stop - ;; - reload) - test_config - reload - ;; - restart) - test_config - stop - while [ -n "$(get_pid)" ]; do - sleep 1 - done - start - ;; - status) - stat_busy 'Checking lighttpd status' - ck_status lighttpd - ;; - *) - echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" -esac - -exit 0 diff --git a/testing/lighttpd/lighttpd.service b/testing/lighttpd/lighttpd.service deleted file mode 100644 index b80db7695..000000000 --- a/testing/lighttpd/lighttpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=A secure, fast, compliant and very flexible web-server -After=syslog.target network.target - -[Service] -PrivateTmp=true -ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf -ExecReload=/bin/kill -HUP $MAINPID -KillSignal=SIGINT - -[Install] -WantedBy=multi-user.target diff --git a/testing/lighttpd/lighttpd.tmpfiles b/testing/lighttpd/lighttpd.tmpfiles deleted file mode 100644 index e39cd425d..000000000 --- a/testing/lighttpd/lighttpd.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /run/lighttpd 755 http http - -d /var/cache/lighttpd 755 http http 10d diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/testing/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index 9f483f7d9..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 159974 2012-05-27 13:10:59Z dreisner $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=6 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} - lvm2_install - lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '3e1680f9b76ce9150d08865d99db90fd15532271' - 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${pkgver}" - unset LDFLAGS - - # libudev.so.1.0.0 compat - sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ - tools/dmsetup.c \ - lib/misc/lvm-wrappers.c - - ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index e69b3349a..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - local pvdev - - modprobe -q dm-mod >/dev/null 2>&1 - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - for pvdev in ${lvmwait//,/ }; do - poll_device ${pvdev} ${rootdelay} - done - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && lvm vgscan - - if [ -n "$quiet" ]; then - lvm vgchange --sysinit -a y >/dev/null - else - lvm vgchange --sysinit -a y - fi -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 145ce49b2..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -build() { - local mod - for mod in dm-mod dm-snapshot dm-mirror; do - add_module "$mod" - done - - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for an LVM2 root device. - -The optional lvmwait= parameter followed by a comma-separated -list of device names can be given on the command line. -It will cause the hook to wait until all given devices exist -before trying to scan and activate any volume groups. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/testing/mesa/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD deleted file mode 100644 index 03a02db43..000000000 --- a/testing/mesa/PKGBUILD +++ /dev/null @@ -1,268 +0,0 @@ -# $Id: PKGBUILD 159976 2012-05-27 13:11:02Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') - -#_git=true -_gitdate=20111031 -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110709 - #pkgver=7.11 - else - pkgver=8.0.3 -fi -pkgrel=2 -arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE - mesa-8.0.3-llvm-3.1-fixes.patch) -if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" - #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') - -build() { - cd ${srcdir}/?esa-* - - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" - -if [ "${_git}" = "true" ]; then - autoreconf -vfi - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore - #--enable-gbm \ - # --enable-gallium-svga \ - - else - autoreconf -vfi - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore -fi - - make -} - -package_libgl() { - depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" - - cd src/mesa/drivers/dri - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_osmesa() { - depends=('mesa') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa -} - -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" -} - -package_libgbm() { - depends=('glibc') - pkgdesc="Mesa gbm library" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" -} - -package_libgles() { - depends=('libglapi' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - cd ${srcdir}/?esa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/egl" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" -} - -package_khrplatform-devel() { - #depends=('') - pkgdesc="Khronos platform development package" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/include/KHR" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - - install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" -} - -package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libglapi.so"* - rm -f "${pkgdir}/usr/lib/libgbm.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f "${pkgdir}/usr/lib/libOSMesa"* - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" - conflicts=('xf86-video-ati<6.9.0-6') - - # classic mesa drivers for radeon,r200 - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600 - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -} - -package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -} - -package_svga-dri() { - depends=("mesa=${pkgver}") - pkgdesc="Gallium3D VMware guest GL driver" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install -} diff --git a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index a567b5926..000000000 --- a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } - - diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index 32cb89cd7..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 160402 2012-06-01 18:19:59Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=mkinitcpio-busybox -pkgver=1.20.1 -pkgrel=1 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -options=('!buildflags') -source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" - 'config') -sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9' - 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') - -build() { - cd "$srcdir/busybox-$pkgver" - - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config - - make -} - -package() { - install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index ed84c5383..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,1020 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.20.0 -# Sun May 13 11:33:40 2012 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -# CONFIG_FEATURE_SYSTEMD is not set -# CONFIG_FEATURE_RTMINMAX is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SMALL=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -CONFIG_FEATURE_SEAMLESS_GZ=y -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -CONFIG_GZIP_FAST=0 -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_GROUPS is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_SUSV3 is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_WHO is not set -# CONFIG_USERS is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -CONFIG_CLEAR=y -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set -# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -# CONFIG_MOUNT is not set -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set -# CONFIG_FEATURE_MOUNT_FLAGS is not set -# CONFIG_FEATURE_MOUNT_FSTAB is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_SETSERIAL is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_WHOIS is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_LSOF is not set -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -# CONFIG_SMEMCAP is not set -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_LONG=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_IDLE_TIMEOUT is not set -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/mkinitcpio-nfs-utils/PKGBUILD b/testing/mkinitcpio-nfs-utils/PKGBUILD deleted file mode 100644 index adb7cb42c..000000000 --- a/testing/mkinitcpio-nfs-utils/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 159792 2012-05-27 04:23:02Z dreisner $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=mkinitcpio-nfs-utils -pkgver=0.3 -pkgrel=3 -pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/" -license=('GPL2') -depends=('glibc') -source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz" - 'initcpio-install-net' - 'initcpio-hook-net') -sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939' - '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861' - '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e') - -build() { - make -C "$pkgname-$pkgver" -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - # override hooks, they need updates - install -m644 "$srcdir/initcpio-install-net" "$pkgdir/usr/lib/initcpio/install/net" - install -m644 "$srcdir/initcpio-hook-net" "$pkgdir/usr/lib/initcpio/hooks/net" -} diff --git a/testing/mkinitcpio-nfs-utils/initcpio-hook-net b/testing/mkinitcpio-nfs-utils/initcpio-hook-net deleted file mode 100644 index 4d1ebb956..000000000 --- a/testing/mkinitcpio-nfs-utils/initcpio-hook-net +++ /dev/null @@ -1,90 +0,0 @@ -# vim: set ft=sh: -run_hook() { - local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver - # These variables will be parsed from /tmp/net-*.conf generated by ipconfig - local DEVICE - local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 - local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH - local filename - # /tmp/net-*.conf - - if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then - ip="${nfsaddrs}" - fi - - if [ -n "${ip}" ]; then - if [ -n "${BOOTIF}" ]; then - bootif_mac=${BOOTIF#01-} - bootif_mac=${bootif_mac//-/:} - for i in /sys/class/net/*/address; do - read net_mac < ${i} - if [ "${bootif_mac}" == "${net_mac}" ]; then - bootif_dev=${i#/sys/class/net/} - bootif_dev=${bootif_dev%/address} - break - fi - done - ip="${ip}::${bootif_dev}" - fi - - # setup network and save some values - ipconfig "ip=${ip}" - - for conf in /tmp/net-*.conf; do - [ -f "$conf" ] && . "$conf" - done - - # calculate nfs_server, nfs_path and nfs_option for later nfs mount - if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then - # parse ROOTPATH if defined by dhcp server - if [ -n "${ROOTPATH}" ]; then - line="${ROOTPATH}" - nfs_server="${line%%:*}" - [ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}" - defaultserver="${nfs_server}" - line="${line#*:}" - nfs_path="${line}" - defaultrootpath="${nfs_path}" - else - # define a default ROOTPATH - if [ "${ROOTPATH}" = "" ]; then - defaultrootpath="/tftpboot/${IPV4ADDR}" - fi - fi - - # parse nfsroot if present (overrides ROOTPATH) - if [ -n "${nfsroot}" ]; then - line="${nfsroot}" - nfs_server="${line%%:*}" - [ -z "${nfs_server}" ] && nfs_server="${defaultserver}" - line="${line#*:}" - nfs_path="${line%%,*}" - line="${line#"${nfs_path}"}" - [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}" - nfs_option="${line#","}" - fi - - # ensure root and filesystem type are set proper for nfs boot - root="/dev/nfs" - rootfstype="nfs" - - echo "NFS-Mount: ${nfs_server}:${nfs_path}" - - # set mount handler for NFS - mount_handler="nfs_mount_handler" - fi - fi -} - -nfs_mount_handler() { - if [ -z "$nfs_server" -o -z "$nfs_path" ]; then - err "Unable to mount root filesystem over NFS: wrong parameters." - echo "You are being dropped to a recovery shell" - echo " Type 'exit' to try and continue booting" - launch_interactive_shell - msg "Trying to continue (this will most likely fail) ..." - fi - nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/mkinitcpio-nfs-utils/initcpio-install-net b/testing/mkinitcpio-nfs-utils/initcpio-install-net deleted file mode 100644 index 7030e2d64..000000000 --- a/testing/mkinitcpio-nfs-utils/initcpio-install-net +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -build() { - add_checked_modules '/drivers/net/' - - add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig" - add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for a network device. -Detection will take place at runtime. To minimize the modules -in the image, add the autodetect hook too. -For pcmcia net devices please use pcmcia hook too. - -Kernel Parameters: -An interface spec can be either short form, which is just the name of -an interface (eth0 or whatever), or long form. The long form consists -of up to seven elements, separated by colons: - -ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> -nfsaddrs= is an alias to ip= and can be used too. - -<client-ip> IP address of the client. If empty, the address will - either be determined by RARP/BOOTP/DHCP. What protocol - is used de- pends on the <autoconf> parameter. If this - parameter is not empty, autoconf will be used. - -<server-ip> IP address of the NFS server. If RARP is used to - determine the client address and this parameter is NOT - empty only replies from the specified server are - accepted. To use different RARP and NFS server, - specify your RARP server here (or leave it blank), and - specify your NFS server in the 'nfsroot' parameter - (see above). If this entry is blank the address of the - server is used which answered the RARP/BOOTP/DHCP - request. - -<gw-ip> IP address of a gateway if the server is on a different - subnet. If this entry is empty no gateway is used and the - server is assumed to be on the local network, unless a - value has been received by BOOTP/DHCP. - -<netmask> Netmask for local network interface. If this is empty, - the netmask is derived from the client IP address assuming - classful addressing, unless overridden in BOOTP/DHCP reply. - -<hostname> Name of the client. If empty, the client IP address is - used in ASCII notation, or the value received by - BOOTP/DHCP. - -<device> Name of network device to use. If this is empty, all - devices are used for RARP/BOOTP/DHCP requests, and the - first one we receive a reply on is configured. If you - have only one device, you can safely leave this blank. - -<autoconf> Method to use for autoconfiguration. If this is either - 'rarp', 'bootp', or 'dhcp' the specified protocol is - used. If the value is 'both', 'all' or empty, all - protocols are used. 'off', 'static' or 'none' means - no autoconfiguration. -Examples: -ip=127.0.0.1:::::lo:none --> Enable the loopback interface. -ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface. -ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration. - -nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>] - -If the 'nfsroot' parameter is NOT given on the command line, the default -"/tftpboot/%s" will be used. - -<server-ip> Specifies the IP address of the NFS server. If this field - is not given, the default address as determined by the - 'ip' variable (see below) is used. One use of this - parameter is for example to allow using different servers - for RARP and NFS. Usually you can leave this blank. - -<root-dir> Name of the directory on the server to mount as root. If - there is a "%s" token in the string, the token will be - replaced by the ASCII-representation of the client's IP - address. - -<nfs-options> Standard NFS options. All options are separated by commas. - If the options field is not given, the following defaults - will be used: - port = as given by server portmap daemon - rsize = 1024 - wsize = 1024 - timeo = 7 - retrans = 3 - acregmin = 3 - acregmax = 60 - acdirmin = 30 - acdirmax = 60 - flags = hard, nointr, noposix, cto, ac - -root=/dev/nfs - -If you don't use nfsroot= parameter you need to set root=/dev/nfs -to boot from a nfs root by autoconfiguration. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/mod_perl/PKGBUILD b/testing/mod_perl/PKGBUILD deleted file mode 100644 index 10b87ba4e..000000000 --- a/testing/mod_perl/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 159857 2012-05-27 07:42:42Z bluewind $ -# Maintainer: -# Contributor: Firmicus <francois.archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=mod_perl -pkgver=2.0.6 -pkgrel=1 -pkgdesc="Apache module that embeds the Perl interpreter within the server" -arch=('i686' 'x86_64') -url="http://perl.apache.org/" -license=('APACHE') -depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') -options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz - mod_perl-2.0.6-nolfs.patch - mod_perl-2.0.6-perl-5.16-fixes.patch) -sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc' - '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08' - 'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Patch from openSUSE to fix segfaults on i686 (FS#25008): - # avoid a conflict between apache's LARGEFILE64_SOURCE and perl's - # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl - # structures to be invalid if only the apache flags are used - patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" - - # Fix build with Perl 5.16 - # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached - patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make install DESTDIR="$pkgdir" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/mod_perl/mod_perl-2.0.6-nolfs.patch b/testing/mod_perl/mod_perl-2.0.6-nolfs.patch deleted file mode 100644 index 13e5cccee..000000000 --- a/testing/mod_perl/mod_perl-2.0.6-nolfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/lib/Apache2/Build.pm mod_perl-2.0.6/lib/Apache2/Build.pm ---- mod_perl-2.0.6.orig/lib/Apache2/Build.pm 2012-05-26 22:31:00.000000000 +0300 -+++ mod_perl-2.0.6/lib/Apache2/Build.pm 2012-05-26 22:31:32.000000000 +0300 -@@ -2207,7 +2207,8 @@ sub has_large_files_conflict { - # with it is that we didn't have such a case yet, but may need to - # deal with it later - -- return $perl_lfs64 ^ $apr_lfs64; -+ return 0; -+ # $perl_lfs64 ^ $apr_lfs64; - } - - # if perl is built with uselargefiles, but apr not, the build won't diff --git a/testing/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/testing/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch deleted file mode 100644 index 4e26fd87d..000000000 --- a/testing/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c ---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c 2012-05-26 21:49:27.000000000 +0300 -+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c 2012-05-26 21:55:39.000000000 +0300 -@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_ - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid); - --#ifndef WIN32 -- PL_uid = ids->uid; -- PL_euid = ids->euid; -- PL_gid = ids->gid; -- PL_egid = ids->egid; --#endif --#ifdef MP_MAINTAIN_PPID -- PL_ppid = ids->ppid; --#endif - } - diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD deleted file mode 100644 index 25fb440d9..000000000 --- a/testing/net-snmp/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 159859 2012-05-27 07:42:44Z bluewind $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=net-snmp -pkgver=5.7.1 -pkgrel=3 -pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" -arch=('i686' 'x86_64') -url="http://www.net-snmp.org/" -license=('BSD') -depends=('openssl' 'libnl' 'pciutils') -makedepends=('python2-distribute') -optdepends=('perl-term-readkey: for snmpcheck application' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' - 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 - patch -Np1 -i "$srcdir/libnl32.patch" - autoreconf -f -i - - sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility \ - --enable-ipv6 \ - --with-python-modules \ - --with-default-snmp-version="3" \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-logfile="/var/log/snmpd.log" \ - --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static - make NETSNMP_DONT_CHECK_VERSION=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install - install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch deleted file mode 100644 index d93d7ef67..000000000 --- a/testing/net-snmp/libnl32.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 -@@ -566,8 +566,9 @@ - static int - tcpTable_load_netlink(void) - { -+ int err; - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -575,10 +576,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -590,10 +591,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -604,9 +605,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -655,7 +656,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); -diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 ---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 -@@ -224,8 +224,9 @@ - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" - NETSNMP_SEARCH_LIBS( -- nl_connect, nl, -+ nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) - ;; - esac diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd deleted file mode 100644 index 926b09bbf..000000000 --- a/testing/net-snmp/snmpd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to snmpd -# -SNMPD_ARGS="" - diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc deleted file mode 100644 index b00c09f4f..000000000 --- a/testing/net-snmp/snmpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/snmpd - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/snmpd.pid - add_daemon snmpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Net-SNMP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/snmpd.pid - rm_daemon snmpd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD deleted file mode 100644 index 6639dc5ee..000000000 --- a/testing/openldap/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# $Id: PKGBUILD 160339 2012-06-01 10:23:21Z stephane $ -# Maintainer: - -pkgbase=openldap -pkgname=('libldap' 'openldap') -pkgver=2.4.31 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.openldap.org/" -license=('custom') -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') -source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default - ntlm.patch - mutex-end-of-struct-sigsegv.patch) -sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' - 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' - 'd89b8a533045123f1ab46c9c430cf132d58a20a4' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' - '694269dad78c7a806649c2d7f57bb7e503df3af1') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.patch - patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch - - sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in - sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h - sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf - sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in - - LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" - ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ - --enable-ipv6 --enable-syslog --enable-local \ - --enable-bdb --enable-hdb \ - --enable-crypt --enable-dynamic \ - --with-threads --disable-wrappers \ - --without-fetch \ - --enable-spasswd --with-cyrus-sasl \ - --enable-overlays=mod --enable-modules=yes - make -} - -check() { - cd "${srcdir}"/${pkgbase}-${pkgver} - make test -} - -package_libldap() { - pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" - depends=('libsasl' 'e2fsprogs') - backup=('etc/openldap/ldap.conf') - options=('!libtool') - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in include libraries doc/man/man3 ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 - ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_openldap() { - pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" - depends=("libldap>=${pkgver}" 'libltdl' 'util-linux') - backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') - options=('!libtool' 'emptydirs') - install=openldap.install - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in clients servers doc/man/man{1,5,8} ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 - rm -r "${pkgdir}"/run - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd - - chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - - install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap - install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d - install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd - install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch deleted file mode 100644 index e8996386a..000000000 --- a/testing/openldap/mutex-end-of-struct-sigsegv.patch +++ /dev/null @@ -1,293 +0,0 @@ - libraries/libldap/init.c | 8 ++- - libraries/libldap/ldap-int.h | 198 ++++++++++++++++++++++-------------------- - 2 files changed, 110 insertions(+), 96 deletions(-) - -diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c -index 39292d2..9d37e64 100644 ---- a/libraries/libldap/init.c -+++ b/libraries/libldap/init.c -@@ -36,7 +36,13 @@ - #include "lutil.h" - - struct ldapoptions ldap_int_global_options = -- { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG }; -+ { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE -+ LDAP_LDO_NULLARG -+ LDAP_LDO_CONNECTIONLESS_NULLARG -+ LDAP_LDO_TLS_NULLARG -+ LDAP_LDO_SASL_NULLARG -+ LDAP_LDO_GSSAPI_NULLARG -+ LDAP_LDO_MUTEX_NULLARG }; - - #define ATTR_NONE 0 - #define ATTR_BOOL 1 -diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h -index f8e6126..ac6c9e5 100644 ---- a/libraries/libldap/ldap-int.h -+++ b/libraries/libldap/ldap-int.h -@@ -185,29 +185,59 @@ struct ldapoptions { - #define LDAP_TRASHED_SESSION 0xFF - int ldo_debug; - --#ifdef LDAP_R_COMPILE -- ldap_pvt_thread_mutex_t ldo_mutex; --#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL --#else --#define LDAP_LDO_MUTEX_NULLARG --#endif -+ ber_int_t ldo_version; -+ ber_int_t ldo_deref; -+ ber_int_t ldo_timelimit; -+ ber_int_t ldo_sizelimit; -+ -+ /* per API call timeout */ -+ struct timeval ldo_tm_api; -+ struct timeval ldo_tm_net; -+ -+ LDAPURLDesc *ldo_defludp; -+ int ldo_defport; -+ char* ldo_defbase; -+ char* ldo_defbinddn; /* bind dn */ -+ -+ /* -+ * Per connection tcp-keepalive settings (Linux only, -+ * ignored where unsupported) -+ */ -+ ber_int_t ldo_keepalive_idle; -+ ber_int_t ldo_keepalive_probes; -+ ber_int_t ldo_keepalive_interval; -+ -+ int ldo_refhoplimit; /* limit on referral nesting */ -+ -+ /* LDAPv3 server and client controls */ -+ LDAPControl **ldo_sctrls; -+ LDAPControl **ldo_cctrls; -+ -+ /* LDAP rebind callback function */ -+ LDAP_REBIND_PROC *ldo_rebind_proc; -+ void *ldo_rebind_params; -+ LDAP_NEXTREF_PROC *ldo_nextref_proc; -+ void *ldo_nextref_params; -+ LDAP_URLLIST_PROC *ldo_urllist_proc; -+ void *ldo_urllist_params; -+ -+ /* LDAP connection callback stack */ -+ ldaplist *ldo_conn_cbs; -+ -+ LDAP_BOOLEANS ldo_booleans; /* boolean options */ -+ -+#define LDAP_LDO_NULLARG ,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0 - - #ifdef LDAP_CONNECTIONLESS - #define LDAP_IS_UDP(ld) ((ld)->ld_options.ldo_is_udp) - void* ldo_peer; /* struct sockaddr* */ - char* ldo_cldapdn; - int ldo_is_udp; -+#define LDAP_LDO_CONNECTIONLESS_NULLARG ,0,0,0 -+#else -+#define LDAP_LDO_CONNECTIONLESS_NULLARG - #endif - -- /* per API call timeout */ -- struct timeval ldo_tm_api; -- struct timeval ldo_tm_net; -- -- ber_int_t ldo_version; -- ber_int_t ldo_deref; -- ber_int_t ldo_timelimit; -- ber_int_t ldo_sizelimit; -- - #ifdef HAVE_TLS - /* tls context */ - void *ldo_tls_ctx; -@@ -226,16 +256,12 @@ struct ldapoptions { - int ldo_tls_mode; - int ldo_tls_require_cert; - int ldo_tls_impl; --#ifdef HAVE_OPENSSL_CRL - int ldo_tls_crlcheck; --#endif -+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0 -+#else -+#define LDAP_LDO_TLS_NULLARG - #endif - -- LDAPURLDesc *ldo_defludp; -- int ldo_defport; -- char* ldo_defbase; -- char* ldo_defbinddn; /* bind dn */ -- - #ifdef HAVE_CYRUS_SASL - char* ldo_def_sasl_mech; /* SASL Mechanism(s) */ - char* ldo_def_sasl_realm; /* SASL realm */ -@@ -244,6 +270,9 @@ struct ldapoptions { - - /* SASL Security Properties */ - struct sasl_security_properties ldo_sasl_secprops; -+#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0} -+#else -+#define LDAP_LDO_SASL_NULLARG - #endif - - #ifdef HAVE_GSSAPI -@@ -253,34 +282,17 @@ struct ldapoptions { - #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT 0x0001 - #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL 0x0002 - unsigned ldo_gssapi_options; -+#define LDAP_LDO_GSSAPI_NULLARG ,0,0 -+#else -+#define LDAP_LDO_GSSAPI_NULLARG - #endif - -- /* -- * Per connection tcp-keepalive settings (Linux only, -- * ignored where unsupported) -- */ -- ber_int_t ldo_keepalive_idle; -- ber_int_t ldo_keepalive_probes; -- ber_int_t ldo_keepalive_interval; -- -- int ldo_refhoplimit; /* limit on referral nesting */ -- -- /* LDAPv3 server and client controls */ -- LDAPControl **ldo_sctrls; -- LDAPControl **ldo_cctrls; -- -- /* LDAP rebind callback function */ -- LDAP_REBIND_PROC *ldo_rebind_proc; -- void *ldo_rebind_params; -- LDAP_NEXTREF_PROC *ldo_nextref_proc; -- void *ldo_nextref_params; -- LDAP_URLLIST_PROC *ldo_urllist_proc; -- void *ldo_urllist_params; -- -- /* LDAP connection callback stack */ -- ldaplist *ldo_conn_cbs; -- -- LDAP_BOOLEANS ldo_booleans; /* boolean options */ -+#ifdef LDAP_R_COMPILE -+ ldap_pvt_thread_mutex_t ldo_mutex; -+#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL -+#else -+#define LDAP_LDO_MUTEX_NULLARG -+#endif - }; - - -@@ -375,6 +387,46 @@ struct ldap_common { - Sockbuf *ldc_sb; /* socket descriptor & buffer */ - #define ld_sb ldc->ldc_sb - -+ unsigned short ldc_lberoptions; -+#define ld_lberoptions ldc->ldc_lberoptions -+ -+ /* protected by msgid_mutex */ -+ ber_len_t ldc_msgid; -+#define ld_msgid ldc->ldc_msgid -+ -+ /* do not mess with these */ -+ /* protected by req_mutex */ -+ LDAPRequest *ldc_requests; /* list of outstanding requests */ -+ /* protected by res_mutex */ -+ LDAPMessage *ldc_responses; /* list of outstanding responses */ -+#define ld_requests ldc->ldc_requests -+#define ld_responses ldc->ldc_responses -+ -+ /* protected by abandon_mutex */ -+ ber_len_t ldc_nabandoned; -+ ber_int_t *ldc_abandoned; /* array of abandoned requests */ -+#define ld_nabandoned ldc->ldc_nabandoned -+#define ld_abandoned ldc->ldc_abandoned -+ -+ /* unused by libldap */ -+ LDAPCache *ldc_cache; /* non-null if cache is initialized */ -+#define ld_cache ldc->ldc_cache -+ -+ /* do not mess with the rest though */ -+ -+ /* protected by conn_mutex */ -+ LDAPConn *ldc_defconn; /* default connection */ -+#define ld_defconn ldc->ldc_defconn -+ LDAPConn *ldc_conns; /* list of server connections */ -+#define ld_conns ldc->ldc_conns -+ void *ldc_selectinfo;/* platform specifics for select */ -+#define ld_selectinfo ldc->ldc_selectinfo -+ -+ /* ldap_common refcnt - free only if 0 */ -+ /* protected by ldc_mutex */ -+ unsigned int ldc_refcnt; -+#define ld_ldcrefcnt ldc->ldc_refcnt -+ - /* protected by ldo_mutex */ - struct ldapoptions ldc_options; - #define ld_options ldc->ldc_options -@@ -403,66 +455,22 @@ struct ldap_common { - #define ld_urllist_params ld_options.ldo_urllist_params - - #define ld_version ld_options.ldo_version --#ifdef LDAP_R_COMPILE --#define ld_ldopts_mutex ld_options.ldo_mutex --#endif -- -- unsigned short ldc_lberoptions; --#define ld_lberoptions ldc->ldc_lberoptions -- -- /* protected by msgid_mutex */ -- ber_len_t ldc_msgid; --#define ld_msgid ldc->ldc_msgid -- -- /* do not mess with these */ -- /* protected by req_mutex */ -- LDAPRequest *ldc_requests; /* list of outstanding requests */ -- /* protected by res_mutex */ -- LDAPMessage *ldc_responses; /* list of outstanding responses */ --#define ld_requests ldc->ldc_requests --#define ld_responses ldc->ldc_responses - - #ifdef LDAP_R_COMPILE -+ ldap_pvt_thread_mutex_t ldc_mutex; - ldap_pvt_thread_mutex_t ldc_msgid_mutex; - ldap_pvt_thread_mutex_t ldc_conn_mutex; - ldap_pvt_thread_mutex_t ldc_req_mutex; - ldap_pvt_thread_mutex_t ldc_res_mutex; - ldap_pvt_thread_mutex_t ldc_abandon_mutex; -+#define ld_ldopts_mutex ld_options.ldo_mutex -+#define ld_ldcmutex ldc->ldc_mutex - #define ld_msgid_mutex ldc->ldc_msgid_mutex - #define ld_conn_mutex ldc->ldc_conn_mutex - #define ld_req_mutex ldc->ldc_req_mutex - #define ld_res_mutex ldc->ldc_res_mutex - #define ld_abandon_mutex ldc->ldc_abandon_mutex - #endif -- -- /* protected by abandon_mutex */ -- ber_len_t ldc_nabandoned; -- ber_int_t *ldc_abandoned; /* array of abandoned requests */ --#define ld_nabandoned ldc->ldc_nabandoned --#define ld_abandoned ldc->ldc_abandoned -- -- /* unused by libldap */ -- LDAPCache *ldc_cache; /* non-null if cache is initialized */ --#define ld_cache ldc->ldc_cache -- -- /* do not mess with the rest though */ -- -- /* protected by conn_mutex */ -- LDAPConn *ldc_defconn; /* default connection */ --#define ld_defconn ldc->ldc_defconn -- LDAPConn *ldc_conns; /* list of server connections */ --#define ld_conns ldc->ldc_conns -- void *ldc_selectinfo;/* platform specifics for select */ --#define ld_selectinfo ldc->ldc_selectinfo -- -- /* ldap_common refcnt - free only if 0 */ --#ifdef LDAP_R_COMPILE -- ldap_pvt_thread_mutex_t ldc_mutex; --#define ld_ldcmutex ldc->ldc_mutex --#endif -- /* protected by ldc_mutex */ -- unsigned int ldc_refcnt; --#define ld_ldcrefcnt ldc->ldc_refcnt - }; - - struct ldap { diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/testing/openldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+#include <ac/socket.h> -+#include <ac/string.h> -+#include <ac/time.h> -+#include <ac/errno.h> -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install deleted file mode 100644 index cf3cb9f25..000000000 --- a/testing/openldap/openldap.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install(){ - groupadd -g 439 ldap &>/dev/null - useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null - chown -R ldap:ldap var/lib/openldap &>/dev/null -} - -post_upgrade(){ - getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null - getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null - chown -R ldap:ldap var/lib/openldap &>/dev/null -} - -post_remove(){ - if getent passwd ldap >/dev/null 2>&1; then - userdel ldap - fi - if getent group ldap >/dev/null 2>&1; then - groupdel ldap - fi -} diff --git a/testing/openldap/slapd b/testing/openldap/slapd deleted file mode 100755 index 4f212da66..000000000 --- a/testing/openldap/slapd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd - -PID=`pidof -o %PPID /usr/sbin/slapd` -case "$1" in - start) - stat_busy "Starting OpenLDAP" - [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap - if [ -z "$PID" ]; then - if [ -z "$SLAPD_SERVICES" ]; then - /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS - else - /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS - fi - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - add_daemon slapd - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenLDAP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/openldap/slapd.pid - rm -f /run/openldap/slapd.args - rm_daemon slapd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default deleted file mode 100644 index 72ae2a6a7..000000000 --- a/testing/openldap/slapd.default +++ /dev/null @@ -1,6 +0,0 @@ -# slapd normally serves ldap only on all TCP-ports 389. slapd can also -# service requests on TCP-port 636 (ldaps) and requests via unix -# sockets. -# Example usage: -#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" -SLAPD_OPTIONS="" diff --git a/testing/pango-perl/PKGBUILD b/testing/pango-perl/PKGBUILD deleted file mode 100644 index bfb81f5c8..000000000 --- a/testing/pango-perl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159861 2012-05-27 07:42:46Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pango-perl -pkgver=1.223 -pkgrel=2 -pkgdesc="Perl bindings for Pango" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('pango' 'glib-perl' 'cairo-perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz) -md5sums=('628a6de54f47b6791c6b45edfb835215') - -build() { - cd "${srcdir}/Pango-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Pango-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Pango-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-async-interrupt/PKGBUILD b/testing/perl-async-interrupt/PKGBUILD deleted file mode 100644 index 073e0083f..000000000 --- a/testing/perl-async-interrupt/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159863 2012-05-27 07:42:49Z bluewind $ - -pkgname=perl-async-interrupt -_ver=1.1 -pkgver=1.10 -pkgrel=2 -pkgdesc='allow C/XS libraries to interrupt perl asynchronously' -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=(perl-common-sense) -url=https://metacpan.org/release/Async-Interrupt -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") -md5sums=(18f19b1537ecf5d6195a6a243110e64b) -sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" - -build() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps - unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL - make -) - -check() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 - unset PERL5LIB - make test -) - -package() -( - cd "$_dir" - make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/testing/perl-bit-vector/PKGBUILD b/testing/perl-bit-vector/PKGBUILD deleted file mode 100644 index 4c4637971..000000000 --- a/testing/perl-bit-vector/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159865 2012-05-27 07:42:51Z bluewind $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: K. Piche <kpiche@rogers.com> - -pkgname=perl-bit-vector -_cpanname=Bit-Vector -pkgver=7.2 -pkgrel=2 -pkgdesc='Efficient bit vector, set of integers and "big int" math library' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_cpanname}/" -depends=('perl-carp-clan' 'perl') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') - -build() { - cd "${srcdir}/${_cpanname}-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_cpanname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_cpanname}-$pkgver" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/perl-compress-bzip2/PKGBUILD b/testing/perl-compress-bzip2/PKGBUILD deleted file mode 100644 index f2e538497..000000000 --- a/testing/perl-compress-bzip2/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 159867 2012-05-27 07:42:53Z bluewind $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=perl-compress-bzip2 -_realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 -pkgdesc="Interface to Bzip2 compression library" -arch=(i686 x86_64) -license=(GPL2) -depends=(perl bzip2) -url="http://search.cpan.org/dist/Compress-Bzip2" -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') - -build() { - cd "$srcdir/$_realname-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/perl-crypt-openssl-bignum/PKGBUILD b/testing/perl-crypt-openssl-bignum/PKGBUILD deleted file mode 100644 index e5f881bcc..000000000 --- a/testing/perl-crypt-openssl-bignum/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-bignum -pkgver=0.04 -pkgrel=7 -pkgdesc="OpenSSL's multiprecision integer arithmetic " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" -depends=('perl' 'openssl') -license=('GPL') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz) -md5sums=('9369ef722b0705c0604998559988eb18') - -build() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - - -check() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/testing/perl-crypt-openssl-random/PKGBUILD b/testing/perl-crypt-openssl-random/PKGBUILD deleted file mode 100644 index 24ebde127..000000000 --- a/testing/perl-crypt-openssl-random/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=7 -pkgdesc="Interface to OpenSSL PRNG methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" -depends=('perl' 'openssl') -license=('GPL') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') - -build() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/testing/perl-crypt-openssl-rsa/PKGBUILD b/testing/perl-crypt-openssl-rsa/PKGBUILD deleted file mode 100644 index 3a44bf936..000000000 --- a/testing/perl-crypt-openssl-rsa/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 56402 2011-10-07 09:48:12Z spupykin $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-rsa -pkgver=0.28 -pkgrel=3 -pkgdesc="Interface to OpenSSL RSA methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" -depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum') -license=('GPL') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz") -md5sums=('86217a5036fc63779c30420b5fd84129') - -build() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/testing/perl-crypt-ssleay/PKGBUILD b/testing/perl-crypt-ssleay/PKGBUILD deleted file mode 100644 index 4b6f39cc7..000000000 --- a/testing/perl-crypt-ssleay/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159875 2012-05-27 07:43:02Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-crypt-ssleay -pkgver=0.58 -pkgrel=4 -pkgdesc="OpenSSL glue that provides LWP https support" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-SSLeay" -license=('GPL' 'PerlArtistic') -depends=('openssl') -options=('!emptydirs') -source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) -md5sums=('fbf3d12e58462cee00ea63239c0b13c7') - -build() { - cd "${srcdir}/Crypt-SSLeay-${pkgver}" - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make test -} - -package() { - cd "${srcdir}/Crypt-SSLeay-${pkgver}" - make install DESTDIR="${pkgdir}" - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/testing/perl-dbd-mysql/PKGBUILD b/testing/perl-dbd-mysql/PKGBUILD deleted file mode 100644 index fe8b7f8e4..000000000 --- a/testing/perl-dbd-mysql/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 159877 2012-05-27 07:43:04Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Eric Johnson <eric@coding-zone.com> - -pkgname=perl-dbd-mysql -_realname=DBD-mysql -pkgver=4.020 -pkgrel=3 -pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0') -makedepends=('mysql') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('a2bf8808bbd45298e84dde06afbd58e9') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - mkdir -p /tmp/mysql_test - mysql_install_db \ - --basedir=/usr \ - --datadir=/tmp/mysql_test - mysqld -P 17999 \ - --socket=/tmp/socket.mysql \ - --datadir=/tmp/mysql_test & - sleep 10 - DAEMON_PORT=$! - make test || true - kill -9 $DAEMON_PORT -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-dbd-sqlite/PKGBUILD b/testing/perl-dbd-sqlite/PKGBUILD deleted file mode 100644 index 907a7b46f..000000000 --- a/testing/perl-dbd-sqlite/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159879 2012-05-27 07:43:07Z bluewind $ -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: francois at archlinux dot org - -pkgname=perl-dbd-sqlite -_cpanname=DBD-SQLite -pkgver=1.35 -pkgrel=2 -pkgdesc="Self-contained RDBMS in a DBI driver" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('d9752e4a26fa54e74aa893dafd02ceda') - -build() { - cd "${srcdir}/${_cpanname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_cpanname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_cpanname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-dbi/PKGBUILD b/testing/perl-dbi/PKGBUILD deleted file mode 100644 index c50e67eea..000000000 --- a/testing/perl-dbi/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159881 2012-05-27 07:43:09Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Matt Thompson <mattt@defunct.ca> - -pkgname=perl-dbi -_realname=DBI -pkgver=1.618 -pkgrel=2 -pkgdesc="Database independent interface for Perl" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('5ad29b56f7457f22bd1ca1c871b30719') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} - -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/perl-digest-nilsimsa/PKGBUILD b/testing/perl-digest-nilsimsa/PKGBUILD deleted file mode 100644 index 3fe80e211..000000000 --- a/testing/perl-digest-nilsimsa/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159883 2012-05-27 07:43:11Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-digest-nilsimsa -_realname=Digest-Nilsimsa -pkgver=0.06 -pkgrel=8 -pkgdesc="Perl version of Nilsimsa code" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -replaces=('digest-nilsimsa') -provides=('digest-nilsimsa') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) -md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/perl-digest-sha1/PKGBUILD b/testing/perl-digest-sha1/PKGBUILD deleted file mode 100644 index 273f9fdf0..000000000 --- a/testing/perl-digest-sha1/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 159885 2012-05-27 07:43:14Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-digest-sha1 -_realname=Digest-SHA1 -pkgver=2.13 -pkgrel=3 -pkgdesc="Perl interface to the SHA-1 Algorithm" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -replaces=('digest-sha1') -provides=('digest-sha1') -md5sums=('bd22388f268434f2b24f64e28bf1aa35') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/perl-ev/PKGBUILD b/testing/perl-ev/PKGBUILD deleted file mode 100644 index 08c4440b8..000000000 --- a/testing/perl-ev/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159887 2012-05-27 07:43:16Z bluewind $ - -pkgname=perl-ev -pkgver=4.11 -pkgrel=2 -pkgdesc='perl interface to libev, a high performance full-featured event loop' -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=(perl-common-sense) -url=https://metacpan.org/release/EV -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz") -md5sums=(405c6d74f9dff12918b12560c1a57877) -sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8) -_dir="$srcdir/EV-$pkgver" - -build() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps - unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL - make -) - -check() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 - unset PERL5LIB - make test -) - -package() -( - cd "$_dir" - make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/testing/perl-event/PKGBUILD b/testing/perl-event/PKGBUILD deleted file mode 100644 index 70dd2f8f8..000000000 --- a/testing/perl-event/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159889 2012-05-27 07:43:19Z bluewind $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: François Charette <francois.archlinux.org> - -pkgname=perl-event -_srcname=Event -pkgver=1.20 -pkgrel=2 -pkgdesc="Framework for GUI events" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -url="http://search.cpan.org/dist/${_srcname}/" -depends=('perl') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) -md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134') - -build() { - cd "${srcdir}/${_srcname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_srcname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_srcname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-fcgi/PKGBUILD b/testing/perl-fcgi/PKGBUILD deleted file mode 100644 index afc59222a..000000000 --- a/testing/perl-fcgi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159891 2012-05-27 07:43:22Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-fcgi -pkgver=0.74 -pkgrel=3 -pkgdesc="Fast CGI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/FCGI" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz") -md5sums=('462a77a0072480fea791a4d3095eb486') - -build() { - cd "${srcdir}/FCGI-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/FCGI-${pkgver}" - make test -} - -package() { - cd "${srcdir}/FCGI-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-guard/PKGBUILD b/testing/perl-guard/PKGBUILD deleted file mode 100644 index cda13ee20..000000000 --- a/testing/perl-guard/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 159893 2012-05-27 07:43:24Z bluewind $ - -pkgname=perl-guard -pkgver=1.022 -pkgrel=2 -pkgdesc="safe cleanup blocks" -arch=(i686 x86_64) -license=(custom:unknown) -options=(!emptydirs) -depends=('perl') -url=https://metacpan.org/release/Guard -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${pkgver}" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/testing/perl-html-parser/PKGBUILD b/testing/perl-html-parser/PKGBUILD deleted file mode 100644 index 9cfb9e1ec..000000000 --- a/testing/perl-html-parser/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159895 2012-05-27 07:43:26Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis -# Contributor: Firmicus <francois.archlinux.org> - -pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.69 -pkgrel=2 -pkgdesc="Perl HTML parser class" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/perl-libintl-perl/PKGBUILD b/testing/perl-libintl-perl/PKGBUILD deleted file mode 100644 index 563650c5b..000000000 --- a/testing/perl-libintl-perl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159897 2012-05-27 07:43:29Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=perl-libintl-perl -_realname=libintl-perl -pkgver=1.20 -pkgrel=4 -pkgdesc="Perl Module: Localization support" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) -md5sums=('cb36f58a7d2e15974f25b35381548b1b') - -build() { - cd "${srcdir}/${_realname}-$pkgver" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_realname}-$pkgver" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-list-moreutils/PKGBUILD b/testing/perl-list-moreutils/PKGBUILD deleted file mode 100644 index a2d61bb02..000000000 --- a/testing/perl-list-moreutils/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 159899 2012-05-27 07:43:32Z bluewind $ -# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> -# Generator : pbjam 0.01 - -pkgname=perl-list-moreutils -pkgver=0.33 -pkgrel=3 -pkgdesc="Provide the stuff missing in List::Util" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30') -url=http://search.cpan.org/dist/List-MoreUtils -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") -md5sums=(8a33c84028cc2ff3e92c92434b326c0f) -sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${pkgver}" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/testing/perl-locale-gettext/PKGBUILD b/testing/perl-locale-gettext/PKGBUILD deleted file mode 100644 index de33f166c..000000000 --- a/testing/perl-locale-gettext/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 159901 2012-05-27 07:43:35Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Mark Rosenstand <mark@borkware.net> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=perl-locale-gettext -_realname=gettext -pkgver=1.05 -pkgrel=9 -pkgdesc="Permits access from Perl to the gettext() family of functions" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl') -options=(!emptydirs) -source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz" - 'compatibility-with-POSIX-module.patch') -md5sums=('f3d3f474a1458f37174c410dfef61a46' - '854302f34d01a2f8ae739187788973dd') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete -} diff --git a/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch b/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch deleted file mode 100644 index ad675516b..000000000 --- a/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/gettext.pm 2005-05-31 20:11:16.000000000 -0700 -+++ b/gettext.pm 2009-10-07 12:39:42.000000000 -0700 -@@ -32,6 +32,7 @@ - =cut - - use Carp; -+use POSIX qw(:locale_h); - - require Exporter; - require DynaLoader; diff --git a/testing/perl-net-dns/PKGBUILD b/testing/perl-net-dns/PKGBUILD deleted file mode 100644 index 04c05b521..000000000 --- a/testing/perl-net-dns/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159903 2012-05-27 07:43:37Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-net-dns -_realname=Net-DNS -pkgver=0.68 -pkgrel=2 -pkgdesc="Perl Module: Interface to the DNS resolver." -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-digest-hmac' 'perl-net-ip' 'perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) -md5sums=('05c0f6955747758bb5c9578d9bc6c3a5') - -build() { - cd "$srcdir/${_realname}-${pkgver}" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/${_realname}-${pkgver}" - make test -} - -package() { - cd "$srcdir/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/testing/perl-net-ssleay/PKGBUILD b/testing/perl-net-ssleay/PKGBUILD deleted file mode 100644 index 85a7aa2c9..000000000 --- a/testing/perl-net-ssleay/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 159905 2012-05-27 07:43:40Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-net-ssleay -_cpanname=Net-SSLeay -pkgver=1.48 -pkgrel=2 -pkgdesc="Perl extension for using OpenSSL" -arch=('i686' 'x86_64') -license=('custom:BSD') -url="http://search.cpan.org/dist/${_cpanname}/" -depends=('openssl') -options=(!emptydirs) -replaces=('net-ssleay') -provides=('net-ssleay') -source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('4e10d9da28f26732e37807820bf72af5') - -build() { - cd ${srcdir}/${_cpanname}-${pkgver} - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor - make -} - -package() { - cd ${srcdir}/${_cpanname}-${pkgver} - - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/perl-netaddr-ip/PKGBUILD b/testing/perl-netaddr-ip/PKGBUILD deleted file mode 100644 index eafbe00ba..000000000 --- a/testing/perl-netaddr-ip/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159907 2012-05-27 07:43:42Z bluewind $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgname=perl-netaddr-ip -_realname=NetAddr-IP -pkgver=4.058 -pkgrel=2 -pkgdesc="Perl module to manage IP addresses and subnets" -arch=(i686 x86_64) -license=('PerlArtistic' 'GPL') -depends=('perl') -options=('!emptydirs') -url="http://search.cpan.org/dist/${_realname}/" -source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('8829958dd84a8b36e3cd10347564739d') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD deleted file mode 100644 index 7270328c8..000000000 --- a/testing/perl-sdl/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159909 2012-05-27 07:43:45Z bluewind $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=perl-sdl -pkgver=2.536 -pkgrel=1 -pkgdesc="Simple DirectMedia Layer for Perl" -arch=(i686 x86_64) -license=(LGPL) -url="http://sdl.perl.org" -depends=(perl-alien-sdl perl-tie-simple - sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg) -#makedepends=(perl-yaml) -options=('!emptydirs') -replaces=(sdl_perl) -conflicts=(sdl_perl) -provides=("sdl_perl=$pkgver") -# http://search.cpan.org/dist/SDL/ -_author=FROGGS -source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz) -md5sums=('5c682e8a96cd655e959497b034b978ce') - -build() { - cd "$srcdir/SDL-$pkgver" - # Perl selects the proper CFLAGS set for binary modules - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/SDL-$pkgver" - perl Build test || true -} - -package() { - cd "$srcdir/SDL-$pkgver" - perl Build install destdir="$pkgdir" -} diff --git a/testing/perl-socket6/PKGBUILD b/testing/perl-socket6/PKGBUILD deleted file mode 100644 index 88c8acc07..000000000 --- a/testing/perl-socket6/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Generator : CPANPLUS::Dist::Arch 1.18 - -pkgname='perl-socket6' -pkgver='0.23' -pkgrel='2' -pkgdesc="getaddrinfo/getnameinfo support module" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -depends=('perl') -makedepends=() -url='http://search.cpan.org/dist/Socket6' -source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') -md5sums=('2c02adb13c449d48d232bb704ddbd492') -sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} - -check() { - cd "$_distdir" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - make test - ) -} - -package() { - cd "$_distdir" - make install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/testing/perl-template-toolkit/PKGBUILD b/testing/perl-template-toolkit/PKGBUILD deleted file mode 100644 index fdce31abc..000000000 --- a/testing/perl-template-toolkit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Firmicus <francois.archlinux.org> -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: FJ <joostef@gmail.com> - -pkgname=perl-template-toolkit -_realname=Template-Toolkit -pkgver=2.22 -pkgrel=5 -pkgdesc="Perl template processing system" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) -md5sums=('d98277f6420e5da6b93d99a8db2b3934') - -build() { - cd ${srcdir}/${_realname}-$pkgver - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd ${srcdir}/${_realname}-$pkgver - make install DESTDIR=${startdir}/pkg - - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete -} diff --git a/testing/perl-term-readkey/PKGBUILD b/testing/perl-term-readkey/PKGBUILD deleted file mode 100644 index 1ac17eed4..000000000 --- a/testing/perl-term-readkey/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159915 2012-05-27 07:43:53Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgname=perl-term-readkey -_realname=TermReadKey -pkgver=2.30.02 -pkgrel=2 -pkgdesc="Provides simple control over terminal driver modes" -arch=('i686' 'x86_64') -license=('custom') -depends=('perl' 'glibc') -url="http://search.cpan.org/~stsi/${_realname}/" -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) -md5sums=('69b92c8ddca8691c83823c683cd9838a') - -build() { - cd "${srcdir}/TermReadKey-$pkgver" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/TermReadKey-$pkgver" - make test -} - -package() { - cd "${srcdir}/TermReadKey-$pkgver" - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Term/ReadKey/ReadKey.so" - install -d "${pkgdir}/usr/share/licenses/$pkgname/" - head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/testing/perl-text-iconv/PKGBUILD b/testing/perl-text-iconv/PKGBUILD deleted file mode 100644 index 3e82c6a35..000000000 --- a/testing/perl-text-iconv/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159917 2012-05-27 07:43:56Z bluewind $ -# Maintainer: -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-text-iconv -_realname=Text-Iconv -pkgver=1.7 -pkgrel=7 -pkgdesc="Interface to iconv codeset conversion" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_realname}/" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) -md5sums=('81b26e069eaebb084e91ea3c009b67ae') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/perl-time-hires/PKGBUILD b/testing/perl-time-hires/PKGBUILD deleted file mode 100644 index 5fc364c84..000000000 --- a/testing/perl-time-hires/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159919 2012-05-27 07:43:58Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: mezcal <fila at pruda dot com> - -pkgname=perl-time-hires -pkgver=1.9725 -pkgrel=2 -pkgdesc="Perl module: high resolution time, sleep, and alarm" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/Time-HiRes/" -depends=('perl') -options=(!emptydirs) -source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz") -md5sums=('cb1108c076d26f3d2fed0bb91313135a') - -build() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -check() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - make test -} - -package() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-tk/PKGBUILD b/testing/perl-tk/PKGBUILD deleted file mode 100644 index 61478cacc..000000000 --- a/testing/perl-tk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159921 2012-05-27 07:44:00Z bluewind $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> -# Contributor: Jason Chu <jchu@xentac.net> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=perl-tk -_cpanname=Tk -pkgver=804.030 -pkgrel=3 -pkgdesc="A graphical user interface toolkit for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('PerlArtistic' 'GPL' 'custom') -depends=('libpng' 'libjpeg' 'tk' 'perl') -options=('!emptydirs') -replaces=('perltk') -provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') - -build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -#check() { -# cd "$srcdir/${_cpanname}-$pkgver" -# make test -#} - -package() { - cd "$srcdir/${_cpanname}-$pkgver" - make install DESTDIR="$pkgdir" - - # license - install -D -m644 pTk/license.terms \ - "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" - install -D -m644 pTk/Tix.license \ - "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" -} diff --git a/testing/perl-unicode-string/PKGBUILD b/testing/perl-unicode-string/PKGBUILD deleted file mode 100644 index 830d34085..000000000 --- a/testing/perl-unicode-string/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159923 2012-05-27 07:44:03Z bluewind $ -# Maintainer: James Rayner <iphitus@gmail.com> -# Contributor: Andrew Simmons <andrew.simmons@gmail.com> - -pkgname=perl-unicode-string -_realname=Unicode-String -pkgver=2.09 -pkgrel=7 -pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('553e68e603723bf7c631f8701ab0d678') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # in stall module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-xml-parser/PKGBUILD b/testing/perl-xml-parser/PKGBUILD deleted file mode 100644 index c787c36fb..000000000 --- a/testing/perl-xml-parser/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159925 2012-05-27 07:44:05Z bluewind $ -# Maintainer: -# Contributor: firmicus <francois@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: herb <hrose@archlinux.org> - -pkgname=perl-xml-parser -_realname=XML-Parser -pkgver=2.41 -pkgrel=3 -pkgdesc="Expat-based XML parser module for perl" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl' 'expat') -replaces=('perlxml') -provides=("perlxml=${pkgver}") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") -md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist. - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete -} diff --git a/testing/perl-yaml-syck/PKGBUILD b/testing/perl-yaml-syck/PKGBUILD deleted file mode 100644 index 43045f658..000000000 --- a/testing/perl-yaml-syck/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 159927 2012-05-27 07:44:09Z bluewind $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: kevin <kevin@archlinux.org> - -pkgname=perl-yaml-syck -_realname=YAML-Syck -pkgver=1.20 -pkgrel=2 -pkgdesc="Fast, lightweight YAML loader and dumper" -arch=('i686' 'x86_64') -license=('custom') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('8f6d04ee5817b8479e1234264a8d458d') - -build() { - cd "${srcdir}/${_realname}-$pkgver" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_realname}-$pkgver" - make install DESTDIR="${pkgdir}" - - # license. - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch deleted file mode 100644 index 1404460df..000000000 --- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch +++ /dev/null @@ -1,83 +0,0 @@ -From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 28 Apr 2011 09:18:54 +0300 -Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in - EU::CBuilder - -Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), -CFLAGS and LDFLAGS from the environment have overridden the Config.pm -ccflags and ldflags settings. This can cause binary incompatibilities -between the core Perl and extensions built with EU::CBuilder. - -Append to the Config.pm values rather than overriding them. ---- - .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- - dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -index b572312..2255c51 100644 ---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -@@ -40,11 +40,13 @@ sub new { - $self->{config}{$k} = $v unless exists $self->{config}{$k}; - } - $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; -- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; -+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) -+ if defined $ENV{CFLAGS}; - $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; - $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; - $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; -- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; -+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) -+ if defined $ENV{LDFLAGS}; - - unless ( exists $self->{config}{cxx} ) { - my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); -diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t -index c3bf6b5..1bb15aa 100644 ---- a/dist/ExtUtils-CBuilder/t/04-base.t -+++ b/dist/ExtUtils-CBuilder/t/04-base.t -@@ -1,7 +1,7 @@ - #! perl -w - - use strict; --use Test::More tests => 50; -+use Test::More tests => 64; - use Config; - use Cwd; - use File::Path qw( mkpath ); -@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, - "_prepare_mksymlists_args(): got expected arguments for Mksymlists", - ); - -+my %testvars = ( -+ CFLAGS => 'ccflags', -+ LDFLAGS => 'ldflags', -+); -+ -+while (my ($VAR, $var) = each %testvars) { -+ local $ENV{$VAR}; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "honours $var from Config.pm"); -+ -+ $ENV{$VAR} = "-foo -bar"; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, -+ "honours $VAR from the environment"); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "doesn't override $var from Config.pm with $VAR from the environment"); -+} -+ - ##### - - for ($source_file, $object_file, $lib_file) { --- -1.7.4.4 - diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog deleted file mode 100644 index 9add39e20..000000000 --- a/testing/perl/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -2011-06-22 Angel Velasquez <angvp@archlinux.org> - * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS - * Fixed #FS22197, FS#22441, FS#24767 - * Rebuilt perl 5.14.1-2 against db 5.2.28 - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Fixed #FS24660 - * Rebuilt against db 5.2.28 - -2011-05-16 Angel Velasquez <angvp@archlinux.org> - * perl 5.14.0 - * Removed patch for h2ph warning from 5.12.3 - * Removed provides array, you can use corelist -v 5.14.0 to know the - modules included with the perl core, through Module::CoreList (thx j3nnn1 - for the tip) - -2010-11-07 kevin <kevin@archlinux.org> - - * perl 5.12.2-1 - - Using /usr/bin/*_perl for script directories - -2010-11-06 kevin <kevin@archlinux.org> - - - Removed otherlibdirs directive from Configure - - Removed /usr/*/perl5/site_perl/5.10.1 from INC - - Finally removed legacy dirs /usr/lib/perl5/current and - /usr/lib/perl5/site_perl/current from @INC - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-2 - - Francois updated the provides array. - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-1 - -2010-05-16 kevin <kevin@archlinux.org> - - * perl 5.12.0-2 - -2010-05-12 kevin <kevin@archlinux.org> - - - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. - This makes the loop variables unnecessary so the script no longer - pollutes the user's environment. - - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support - user built modules. - -2010-05-09 kevin <kevin@archlinux.org> - - * perl 5.12.0-1 - - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, - path points to non-existant directories - -2010-05-07 kevin <kevin@archlinux.org> - - - Added this changelog. - - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. - This removes the duplicates and versioned directory entries. - - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix - Fix FS#13808, binaries don't follow FHS. - - Stopped using versioned directories in sitelib and sitearch. - - -# vim: set ft=changelog ts=4 sw=4 et: diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD deleted file mode 100644 index 316c1b0f5..000000000 --- a/testing/perl/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 159947 2012-05-27 08:08:09Z bluewind $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: kevin <kevin.archlinux.org> -# Contributor: judd <jvinet.zeroflux.org> -# Contributor: francois <francois.archlinux.org> -pkgname=perl -pkgver=5.16.0 -pkgrel=2 -pkgdesc="A highly capable, feature-rich programming language" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://www.perl.org" -groups=('base') -depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') -changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -perlbin.sh -perlbin.csh -provides.pl) -install=perl.install -options=('makeflags' '!purge') -md5sums=('15a2f95fb27231e10998240f13acf961' - '5ed2542fdb9a60682f215bd33701e61a' - '1f0cbbee783e8a6d32f01be5118e0d5e' - '999c3eea6464860704abbb055a0f0896') - -# workaround to let the integrity check find the correct provides array -if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then - true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) -fi - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [ "${CARCH}" = "x86_64" ]; then - # for x86_64 - arch_opts="-Dcccdlflags='-fPIC'" - else - # for i686 - arch_opts="" - fi - - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ - -Dprivlib=/usr/share/perl5/core_perl \ - -Darchlib=/usr/lib/perl5/core_perl \ - -Dsitelib=/usr/share/perl5/site_perl \ - -Dsitearch=/usr/lib/perl5/site_perl \ - -Dvendorlib=/usr/share/perl5/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dscriptdir=/usr/bin/core_perl \ - -Dsitescript=/usr/bin/site_perl \ - -Dvendorscript=/usr/bin/vendor_perl \ - -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ - -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness -# make test -} - -package() { - # hack to work around makepkg running the subshell in check_sanity() - new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) - provides=(${new_provides[@]}) - - cd ${srcdir}/${pkgname}-${pkgver} - make install - - ### Perl Settings ### - # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. - sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ - -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl - - ### CPAN Settings ### - # Set CPAN default config to use the site directories. - sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm - - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - - # Profile script to set paths to perl scripts. - install -D -m755 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh - # Profile script to set paths to perl scripts on csh. (FS#22441) - install -D -m755 ${srcdir}/perlbin.csh \ - ${pkgdir}/etc/profile.d/perlbin.csh - - (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" - - # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ - # (FS#16488) - rm -f $pkgdir/usr/share/perl5/core_perl/*.pod - for d in $pkgdir/usr/share/perl5/core_perl/*; do - if [ -d $d -a $(basename $d) != "pod" ]; then - find $d -name *.pod -delete - fi - done - find $pkgdir/usr/lib -name *.pod -delete - find $pkgdir -name .packlist -delete -} diff --git a/testing/perl/digest_eval_hole.diff b/testing/perl/digest_eval_hole.diff deleted file mode 100644 index 47904137b..000000000 --- a/testing/perl/digest_eval_hole.diff +++ /dev/null @@ -1,61 +0,0 @@ -From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001 -From: "Michael G. Schwern" <schwern@pobox.com> -Date: Mon, 3 Oct 2011 19:05:29 +0100 -Subject: Close the eval "require $module" security hole in - Digest->new($algorithm) - -Also the filter was incomplete. - -Bug-Debian: http://bugs.debian.org/644108 - -Patch-Name: fixes/digest_eval_hole.diff ---- - cpan/Digest/Digest.pm | 6 ++++-- - cpan/Digest/t/security.t | 14 ++++++++++++++ - 2 files changed, 18 insertions(+), 2 deletions(-) - create mode 100644 cpan/Digest/t/security.t - -diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm -index 384dfc8..d714434 100644 ---- a/cpan/Digest/Digest.pm -+++ b/cpan/Digest/Digest.pm -@@ -24,7 +24,7 @@ sub new - shift; # class ignored - my $algorithm = shift; - my $impl = $MMAP{$algorithm} || do { -- $algorithm =~ s/\W+//; -+ $algorithm =~ s/\W+//g; - "Digest::$algorithm"; - }; - $impl = [$impl] unless ref($impl); -@@ -35,7 +35,9 @@ sub new - ($class, @args) = @$class if ref($class); - no strict 'refs'; - unless (exists ${"$class\::"}{"VERSION"}) { -- eval "require $class"; -+ my $pm_file = $class . ".pm"; -+ $pm_file =~ s{::}{/}g; -+ eval { require $pm_file }; - if ($@) { - $err ||= $@; - next; -diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t -new file mode 100644 -index 0000000..5cba122 ---- /dev/null -+++ b/cpan/Digest/t/security.t -@@ -0,0 +1,14 @@ -+#!/usr/bin/env perl -+ -+# Digest->new() had an exploitable eval -+ -+use strict; -+use warnings; -+ -+use Test::More tests => 1; -+ -+use Digest; -+ -+$LOL::PWNED = 0; -+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; -+is $LOL::PWNED, 0; diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/testing/perl/fix-h2ph-and-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 -From: Robin Barker <rmbarker@cpan.org> -Date: Thu, 22 Apr 2010 11:51:20 +0100 -Subject: [PATCH 1/1] Fix h2ph and test - ---- - lib/h2ph.t | 12 ++++++++++-- - utils/h2ph.PL | 28 +++++++++++++++++++++++----- - 2 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/lib/h2ph.t b/lib/h2ph.t -index 27dd7b9..8d62d46 100644 ---- a/lib/h2ph.t -+++ b/lib/h2ph.t -@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { - exit 0; - } - --plan(4); -+plan(5); - - # quickly compare two text files - sub txt_compare { -@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', - stderr => 1 ); - like( $result, qr/syntax OK$/, "output compiles"); - -+$result = runperl( progfile => '_h2ph_pre.ph', -+ switches => ['-c'], -+ stderr => 1 ); -+like( $result, qr/syntax OK$/, "preamble compiles"); -+ - $result = runperl( switches => ["-w"], -- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); -+ stderr => 1, -+ prog => <<'PROG' ); -+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); -+PROG - is( $result, '', "output free of warnings" ); - - # cleanup -diff --git a/utils/h2ph.PL b/utils/h2ph.PL -index 8f56db4..1255807 100644 ---- a/utils/h2ph.PL -+++ b/utils/h2ph.PL -@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { - exit $Exit; - - sub expr { -- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. -+ if (/\b__asm__\b/) { # freak out -+ $new = '"(assembly code)"'; -+ return -+ } - my $joined_args; - if(keys(%curargs)) { - $joined_args = join('|', keys(%curargs)); -@@ -770,7 +773,7 @@ sub inc_dirs - sub build_preamble_if_necessary - { - # Increment $VERSION every time this function is modified: -- my $VERSION = 2; -+ my $VERSION = 3; - my $preamble = "$Dest_dir/_h2ph_pre.ph"; - - # Can we skip building the preamble file? -@@ -798,7 +801,16 @@ sub build_preamble_if_necessary - # parenthesized value: d=(v) - $define{$_} = $1; - } -- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { -+ if (/^(\w+)\((\w)\)$/) { -+ my($macro, $arg) = ($1, $2); -+ my $def = $define{$_}; -+ $def =~ s/$arg/\$\{$arg\}/g; -+ print PREAMBLE <<DEFINE; -+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } -+ -+DEFINE -+ } elsif -+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { - # float: - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; -@@ -807,8 +819,14 @@ sub build_preamble_if_necessary - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; - } elsif ($define{$_} =~ /^\w+$/) { -- print PREAMBLE -- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; -+ my $def = $define{$_}; -+ if ($isatype{$def}) { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; -+ } else { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { &$def } }\n\n"; -+ } - } else { - print PREAMBLE - "unless (defined &$_) { sub $_() { \"", --- -1.6.5.2.74.g610f9.dirty - diff --git a/testing/perl/perl.install b/testing/perl/perl.install deleted file mode 100644 index a355c5bbe..000000000 --- a/testing/perl/perl.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -post_install() { - for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do - [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver - [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver - [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver - done - return 0 -} - diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh deleted file mode 100644 index 535f0b18d..000000000 --- a/testing/perl/perlbin.csh +++ /dev/null @@ -1,15 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh deleted file mode 100755 index 20f830436..000000000 --- a/testing/perl/perlbin.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl - -export PATH - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 - diff --git a/testing/perl/provides.pl b/testing/perl/provides.pl deleted file mode 100644 index d2cdc762e..000000000 --- a/testing/perl/provides.pl +++ /dev/null @@ -1,299 +0,0 @@ -# provides.pl -## -# Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. You can run it before building perl -# or you can run it after building perl. Required modules are in core -# for perl 5.13 and above. It might be nice if this didn't require -# HTTP::Tiny and maybe just used wget or curl. -# -# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at -# cpanmetadb.plackperl.org to cross-reference module files to their -# providing CPAN distribution. Thank you Miyagawa! -# -# - Justin "juster" Davis <jrcd83@gmail.com> - -use warnings 'FATAL' => 'all'; -use strict; - -package Common; - -sub evalver -{ - my ($path, $mod) = @_; - - open my $fh, '<', $path or die "open $path: $!"; - - my $m = ($mod - ? qr/(?:\$${mod}::VERSION|\$VERSION)/ - : qr/\$VERSION/); - - while (my $ln = <$fh>) { - next unless $ln =~ /\s*$m\s*=\s*.+/; - chomp $ln; - my $ver = do { no strict; eval $ln }; - return $ver unless $@; - die qq{$path:$. bad version string in "$ln"\n}; - } - - close $fh; - return undef; -} - - -#----------------------------------------------------------------------------- - -package Dists; - -sub maindistfile -{ - my ($dist, $dir) = @_; - - # libpath is the modern style, installing modules under lib/ - # with dirs matching the name components. - my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm"; - - # dumbpath is an old style where there's no subdirs and just - # a .pm file. - my $dumbpath = $dist; - $dumbpath =~ s/\A.+-//; - $dumbpath .= ".pm"; - - my @paths = ($libpath, $dumbpath); - # Some modules (with simple names like XSLoader, lib, etc) are - # generated by Makefile.PL. Search through their generating code. - push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0; - - for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; } - return undef; -} - -sub module_ver -{ - my ($dist, $dir) = @_; - - my $path = maindistfile($dist, $dir) or return undef; - - my $mod = $dist; - $mod =~ s/-/::/g; - my $ver = Common::evalver($path, $mod); - unless ($ver) { - warn "failed to find version in module file for $dist\n"; - return undef; - } - - return $ver; -} - -sub changelog_ver -{ - my ($dist, $dir) = @_; - - my $path; - for my $tmp (glob "$dir/{Changes,ChangeLog}") { - if (-f $tmp) { $path = $tmp; last; } - } - return undef unless $path; - - open my $fh, '<', $path or die "open: $!"; - while (<$fh>) { - return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/; - return $1 if /\A\s*version\s+([0-9._]+)/i; - } - close $fh; - - return undef; -} - -# for some reason podlators has a VERSION file with perl code in it -sub verfile_ver -{ - my ($dist, $dir) = @_; - - my $path = "$dir/VERSION"; - return undef unless -f $path; # no warning, only podlaters has it - - return Common::evalver($path); -} - -# scans a directory full of nicely separated dist. directories. -sub scan_distroot -{ - my ($distroot) = @_; - opendir my $cpand, "$distroot" or die "failed to open $distroot"; - my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand; - closedir $cpand; - - my @found; - for my $dist (@dists) { - my $distdir = "$distroot/$dist"; - my $ver = (module_ver($dist, $distdir) - || changelog_ver($dist, $distdir) - || verfile_ver($dist, $distdir)); - - if ($ver) { push @found, [ $dist, $ver ]; } - else { warn "failed to find version for $dist\n"; } - } - return @found; -} - -sub find -{ - my ($srcdir) = @_; - return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}"; -} - -#----------------------------------------------------------------------------- - -package Modules; - -use HTTP::Tiny qw(); -use File::Find qw(); -use File::stat; - -*findfile = *File::Find::find; - -sub cpan_provider -{ - my ($module) = @_; - my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module"; - my $http = HTTP::Tiny->new; - my $resp = $http->get($url); - return undef unless $resp->{'success'}; - - my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m - or return undef; - - my $dist = $cpanpath; - $dist =~ s{\A.+/}{}; # remove author directory - $dist =~ s{-[^-]+\z}{}; # remove version and extension - return ($dist eq 'perl' ? undef : $dist); -} - -sub find -{ - my ($srcdir) = @_; - my $libdir = "$srcdir/lib/"; - die "failed to find $libdir directory" unless -d $libdir; - - # Find only the module files that have not changed since perl - # was extracted. We don't want the files perl just recently - # installed into lib/. We processed those already. - my @modfiles; - my $finder = sub { - return unless /[.]pm\z/; - return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules - push @modfiles, $_; - }; - findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); - - # First we have to find what the oldest ctime actually is. - my $oldest = time; - @modfiles = map { - my $modfile = $_; - my $ctime = (stat $modfile)->ctime; - $oldest = $ctime if $ctime < $oldest; - [ $modfile, $ctime ]; # save ctime for later - } @modfiles; - - # Then we filter out any file that was created more than a - # few seconds after that. Process the rest. - my @mods; - for my $modfile (@modfiles) { - my ($mod, $ctime) = @$modfile; - next if $ctime - $oldest > 5; # ignore newer files - - my $path = $mod; - $mod =~ s{[.]pm\z}{}; - $mod =~ s{\A$libdir}{}; - $mod =~ s{/}{::}g; - - my $ver = Common::evalver($path, $mod) || q{}; - push @mods, [ $mod, $ver ]; - } - - # Convert modules names to the dist names who provide them. - my %seen; - my @dists; - for my $modref (@mods) { - my ($mod, $ver) = @$modref; - my $dist = cpan_provider($mod) or next; # filter out core modules - next if $seen{$dist}++; # avoid duplicate dists - push @dists, [ $dist, $ver ]; - } - return @dists; -} - -#----------------------------------------------------------------------------- - -package Dist2Pkg; - -sub name -{ - my ($name) = @_; - my $orig = $name; - - # Package names should be lowercase and consist of alphanumeric - # characters only (and hyphens!)... - $name =~ tr/A-Z/a-z/; - $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap) - $name =~ tr/-a-z0-9+//cd; # Delete all other chars. - $name =~ tr/-/-/s; - - # Delete leading or trailing hyphens... - $name =~ s/\A-|-\z//g; - - die qq{Dist. name '$orig' completely violates packaging standards} - unless $name; - - return "perl-$name"; -} - -sub version -{ - my ($version) = @_; - - # Package versions should be numbers and decimal points only... - $version =~ tr/-/./; - $version =~ tr/_0-9.-//cd; - - # Remove developer versions because pacman has no special logic - # to compare them to regular versions like perl does. - $version =~ s/_[^_]+\z//; - - $version =~ tr/_//d; # delete other underscores - $version =~ tr/././s; # only one period at a time - $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period - - return $version; -} - -#----------------------------------------------------------------------------- - -package main; - -my %CPANNAME = ('List-Util' => 'Scalar-List-Utils', - 'Text-Tabs' => 'Text-Tabs+Wrap', - 'Cwd' => 'PathTools'); - -my $perldir = shift or die "Usage: $0 [path to perl source directory]\n"; -die "$perldir is not a valid directory." unless -d $perldir; - -my @dists = (Dists::find($perldir), Modules::find($perldir)); -for my $dist (@dists) { - my $name = $dist->[0]; - $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name}; -} - -my @pkgs = map { - my ($name, $ver) = @$_; - $name = Dist2Pkg::name($name); - $ver = Dist2Pkg::version($ver); - [ $name, $ver ]; -} @dists; - -@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs; - -for my $pkg (@pkgs) { - my ($name, $ver) = @$pkg; - print "$name=$ver\n"; -} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD deleted file mode 100644 index db0d28e55..000000000 --- a/testing/php/PKGBUILD +++ /dev/null @@ -1,347 +0,0 @@ -# $Id: PKGBUILD 160226 2012-05-31 10:48:16Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=php -pkgname=('php' - 'php-cgi' - 'php-apache' - 'php-fpm' - 'php-embed' - 'php-pear' - 'php-enchant' - 'php-gd' - 'php-intl' - 'php-ldap' - 'php-mcrypt' - 'php-mssql' - 'php-odbc' - 'php-pgsql' - 'php-pspell' - 'php-snmp' - 'php-sqlite' - 'php-tidy' - 'php-xsl') -pkgver=5.4.3 -pkgrel=4 -arch=('i686' 'x86_64') -license=('PHP') -url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' - 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('51f9488bf8682399b802c48656315cac' - '0b0bc7a917fc592bdf11dcd3c5c255e9' - 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'aabda9f3f2f8b9d8fdc9558c31c718db' - '825e580dd5708d959b50944afa1b12b6' - 'f56b5bb7e93c802ae8519182fbea3387' - '86c73d481f3099e740e602869bacf637' - 'c60343df74f8e1afb13b084d5c0e47ed') - -build() { - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ - --config-cache \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --localstatedir=/var \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --disable-rpath \ - --mandir=/usr/share/man \ - --without-pear \ - " - - phpextensions="--enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-dba=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd-native-ttf \ - --enable-intl=shared \ - --enable-mbstring \ - --enable-phar=shared \ - --enable-posix=shared \ - --enable-shmop=shared \ - --enable-soap=shared \ - --enable-sockets=shared \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --enable-zip=shared \ - --with-bz2=shared \ - --with-curl=shared \ - --with-db4=/usr \ - --with-enchant=shared,/usr \ - --with-freetype-dir=/usr \ - --with-gd=shared \ - --with-gdbm \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-iconv=shared \ - --with-icu-dir=/usr \ - --with-imap-ssl \ - --with-imap=shared \ - --with-jpeg-dir=/usr \ - --with-vpx-dir=/usr \ - --with-ldap=shared \ - --with-ldap-sasl \ - --with-mcrypt=shared \ - --with-mhash \ - --with-mssql=shared \ - --with-mysql-sock=/var/run/mysqld/mysqld.sock \ - --with-mysql=shared,mysqlnd \ - --with-mysqli=shared,mysqlnd \ - --with-openssl=shared \ - --with-pcre-regex=/usr \ - --with-pdo-mysql=shared,mysqlnd \ - --with-pdo-odbc=shared,unixODBC,/usr \ - --with-pdo-pgsql=shared \ - --with-pdo-sqlite=shared,/usr \ - --with-pgsql=shared \ - --with-png-dir=/usr \ - --with-pspell=shared \ - --with-snmp=shared \ - --with-sqlite3=shared,/usr \ - --with-tidy=shared \ - --with-unixODBC=shared,/usr \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - --with-zlib \ - " - - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR - - cd ${srcdir}/${pkgbase}-${pkgver} - - # adjust paths - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # php - mkdir ${srcdir}/build-php - cd ${srcdir}/build-php - ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - ${phpextensions} - make - - # cgi and fcgi - # reuse the previous run; this will save us a lot of time - cp -a ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ - --disable-cli \ - --enable-cgi \ - ${phpextensions} - make - - # apache - cp -a ${srcdir}/build-php ${srcdir}/build-apache - cd ${srcdir}/build-apache - ./configure ${phpconfig} \ - --disable-cli \ - --with-apxs2 \ - ${phpextensions} - make - - # fpm - cp -a ${srcdir}/build-php ${srcdir}/build-fpm - cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ - --disable-cli \ - --enable-fpm \ - --with-fpm-user=http \ - --with-fpm-group=http \ - ${phpextensions} - make - - # embed - cp -a ${srcdir}/build-php ${srcdir}/build-embed - cd ${srcdir}/build-embed - ./configure ${phpconfig} \ - --disable-cli \ - --enable-embed=shared \ - ${phpextensions} - make - - # pear - cp -a ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear \ - ${phpextensions} - make -} - -# check() { -# cd ${srcdir}/build-php -# make test -# } - -package_php() { - pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'curl') - replaces=('php-fileinfo' 'php-gmp' 'php-curl') - provides=('php-fileinfo' 'php-gmp' 'php-curl') - conflicts=('php-fileinfo' 'php-gmp' 'php-curl') - backup=('etc/php/php.ini') - - cd ${srcdir}/build-php - make -j1 INSTALL_ROOT=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/pear - # install php.ini - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ - - # remove static modules - rm -f ${pkgdir}/usr/lib/php/modules/*.a - # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so - # remove empty directory - rmdir ${pkgdir}/usr/include/php/include -} - -package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php') - - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi -} - -package_php-apache() { - pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache') - backup=('etc/httpd/conf/extra/php5_module.conf') - - install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf -} - -package_php-fpm() { - pkgdesc='FastCGI Process Manager for PHP' - depends=('php') - backup=('etc/php/php-fpm.conf') - install='php-fpm.install' - - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf - install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm - install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm - install -d -m755 ${pkgdir}/etc/php/fpm.d - install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf - install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service -} - -package_php-embed() { - pkgdesc='Embed SAPI for PHP' - depends=('php') - - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h -} - -package_php-pear() { - pkgdesc='PHP Extension and Application Repository' - depends=('php') - backup=('etc/php/pear.conf') - - cd ${srcdir}/build-pear - make install-pear INSTALL_ROOT=${pkgdir} - rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry} -} - -package_php-enchant() { - depends=('php' 'enchant') - pkgdesc='enchant module for PHP' - install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so -} - -package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') - pkgdesc='gd module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so -} - -package_php-intl() { - depends=('php' 'icu') - pkgdesc='intl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so -} - -package_php-ldap() { - depends=('php' 'libldap') - pkgdesc='ldap module for PHP' - install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so -} - -package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libltdl') - pkgdesc='mcrypt module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so -} - -package_php-mssql() { - depends=('php' 'freetds') - pkgdesc='mssql module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so -} - -package_php-odbc() { - depends=('php' 'unixodbc') - pkgdesc='ODBC modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so - install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so -} - -package_php-pgsql() { - depends=('php' 'postgresql-libs') - pkgdesc='PostgreSQL modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so - install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so -} - -package_php-pspell() { - depends=('php' 'aspell') - pkgdesc='pspell module for PHP' - install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so -} - -package_php-snmp() { - depends=('php' 'net-snmp') - pkgdesc='snmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so -} - -package_php-sqlite() { - depends=('php' 'sqlite') - pkgdesc='sqlite module for PHP' - install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so - install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so -} - -package_php-tidy() { - depends=('php' 'tidyhtml') - pkgdesc='tidy module for PHP' - install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so -} - -package_php-xsl() { - depends=('php' 'libxslt') - pkgdesc='xsl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so -} diff --git a/testing/php/apache.conf b/testing/php/apache.conf deleted file mode 100644 index c3ca0aad5..000000000 --- a/testing/php/apache.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Required modules: dir_module, php5_module - -<IfModule dir_module> - <IfModule php5_module> - DirectoryIndex index.php index.html - <FilesMatch "\.php$"> - SetHandler application/x-httpd-php - </FilesMatch> - <FilesMatch "\.phps$"> - SetHandler application/x-httpd-php-source - </FilesMatch> - </IfModule> -</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm deleted file mode 100644 index ac2d92a36..000000000 --- a/testing/php/logrotate.d.php-fpm +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/php-fpm.log { - missingok - notifempty - delaycompress - postrotate - kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch deleted file mode 100644 index 0b17182fd..000000000 --- a/testing/php/php-fpm.conf.in.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 -@@ -12,7 +12,7 @@ - ; Relative path can also be used. They will be prefixed by: - ; - the global prefix if it's been set (-p arguement) - ; - @prefix@ otherwise --;include=etc/fpm.d/*.conf -+;include=/etc/php/fpm.d/*.conf - - ;;;;;;;;;;;;;;;;;; - ; Global Options ; -@@ -22,7 +22,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = /run/php-fpm/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -140,7 +140,8 @@ - ; specific port; - ; '/path/to/unix/socket' - to listen on a unix socket. - ; Note: This value is mandatory. --listen = 127.0.0.1:9000 -+;listen = 127.0.0.1:9000 -+listen = /run/php-fpm/php-fpm.sock - - ; Set listen(2) backlog. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -151,9 +152,9 @@ - ; BSD-derived systems allow connections regardless of permissions. - ; Default Values: user and group are set as the running user - ; mode is set to 0666 --;listen.owner = @php_fpm_user@ --;listen.group = @php_fpm_group@ --;listen.mode = 0666 -+listen.owner = @php_fpm_user@ -+listen.group = @php_fpm_group@ -+listen.mode = 0660 - - ; List of ipv4 addresses of FastCGI clients which are allowed to connect. - ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -@@ -442,7 +443,7 @@ - ; Chdir to this directory at the start. - ; Note: relative path can be used. - ; Default Value: current directory or / when chroot --;chdir = /var/www -+;chdir = /srv/http - - ; Redirect worker stdout and stderr into main error log. If not set, stdout and - ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php-fpm.install b/testing/php/php-fpm.install deleted file mode 100644 index 41fc37c22..000000000 --- a/testing/php/php-fpm.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - if [[ ! -d run/php-fpm ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf - fi -} - -post_upgrade() { - post_install -} diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service deleted file mode 100644 index e29f7c236..000000000 --- a/testing/php/php-fpm.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=FastCGI Process Manager for PHP -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/run/php-fpm/php-fpm.pid -PrivateTmp=true -ExecStart=/usr/sbin/php-fpm -ExecReload=/bin/kill -USR2 $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/php/php-fpm.tmpfiles b/testing/php/php-fpm.tmpfiles deleted file mode 100644 index 801e74f1e..000000000 --- a/testing/php/php-fpm.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/php-fpm 755 root root diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch deleted file mode 100644 index bbaae2152..000000000 --- a/testing/php/php.ini.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- php.ini-production 2012-03-29 06:17:59.000000000 +0200 -+++ php.ini-production 2012-03-30 10:46:21.181340861 +0200 -@@ -305,7 +305,7 @@ - ; or per-virtualhost web server configuration file. This directive is - ; *NOT* affected by whether Safe Mode is turned On or Off. - ; http://php.net/open-basedir --;open_basedir = -+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ - - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. This directive is -@@ -702,7 +702,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:/usr/share/pear" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -725,7 +725,7 @@ - - ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir --; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules/" - ; On windows: - ; extension_dir = "ext" - -@@ -859,51 +859,47 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. - ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. --; --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_fileinfo.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_intl.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_exif.dll ; Must be after mbstring as it depends on it --;extension=php_mysql.dll --;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client --;extension=php_openssl.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_pspell.dll --;extension=php_shmop.dll -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php --;extension=php_snmp.dll -- --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite3.dll --;extension=php_sybase_ct.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_zip.dll -+;extension=bcmath.so -+;extension=bz2.so -+;extension=calendar.so -+extension=curl.so -+;extension=dba.so -+;extension=enchant.so -+;extension=exif.so -+;extension=ftp.so -+;extension=gd.so -+extension=gettext.so -+;extension=gmp.so -+;extension=iconv.so -+;extension=imap.so -+;extension=intl.so -+;extension=ldap.so -+;extension=mcrypt.so -+;extension=mssql.so -+;extension=mysqli.so -+;extension=mysql.so -+;extension=odbc.so -+;extension=openssl.so -+;extension=pdo_mysql.so -+;extension=pdo_odbc.so -+;extension=pdo_pgsql.so -+;extension=pdo_sqlite.so -+;extension=pgsql.so -+;extension=phar.so -+;extension=posix.so -+;extension=pspell.so -+;extension=shmop.so -+;extension=snmp.so -+;extension=soap.so -+;extension=sockets.so -+;extension=sqlite3.so -+;extension=sysvmsg.so -+;extension=sysvsem.so -+;extension=sysvshm.so -+;extension=tidy.so -+;extension=xmlrpc.so -+;extension=xsl.so -+;extension=zip.so - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm deleted file mode 100644 index 3b3ec20de..000000000 --- a/testing/php/rc.d.php-fpm +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -wait_for_pid () { - try=0 - while test $try -lt 35 ; do - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - stat_append '.' - try=`expr $try + 1` - sleep 1 - done -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/php/php-fpm.conf ]; then - stat_append '(/etc/php/php-fpm.conf not found)' - stat_die - fi - - local test=$(/usr/sbin/php-fpm -t 2>&1) - if [ $? -gt 0 ]; then - stat_append '(error in /etc/php/php-fpm.conf)' - stat_die - elif echo $test | grep -qi 'error'; then - stat_append '(error in /etc/php/php.ini)' - stat_die - fi - - stat_done -} - -case "$1" in - start) - test_config - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - add_daemon php-fpm - stat_done - fi - ;; - - stop) - test_config - stat_busy 'Gracefully shutting down php-fpm' - - if [ ! -r /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /run/php-fpm/php-fpm.pid` - - wait_for_pid removed /run/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - force-quit) - stat_busy 'Terminating php-fpm' - - if [ ! -r /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /run/php-fpm/php-fpm.pid` - - wait_for_pid removed /run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - test_config - stat_busy 'Reload service php-fpm' - - if [ ! -r /run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD deleted file mode 100644 index 38155efed..000000000 --- a/testing/pidgin/PKGBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# $Id: PKGBUILD 159929 2012-05-27 07:44:13Z bluewind $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.4 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' - 'networkmanager') -options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-python=/usr/bin/python2 \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gstreamer0.10' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction' - 'gstreamer0.10-good-plugins: video and voice support') - install=pidgin.install - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'dbus-python: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd "$srcdir/pidgin-$pkgver" - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/testing/pidgin/pidgin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD deleted file mode 100644 index f94d9342d..000000000 --- a/testing/pinentry/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 159496 2012-05-25 12:44:10Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=pinentry -pkgver=0.8.1 -pkgrel=4 -pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnupg.org/aegypten2" -depends=('ncurses' 'libcap>=2.16') -makedepends=('gtk2' 'qt') -optdepends=('gtk2: for gtk2 backend' - 'qt: for qt4 backend') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz - qt4-pinentry-window.patch) -install=pinentry.install - -build() { - cd $srcdir/$pkgname-$pkgver - #fix: https://bugs.archlinux.org/task/29998 - patch -Np1 -i ../qt4-pinentry-window.patch - for file in qt4/*.moc; do - /usr/bin/moc ${file/.moc/.h} > ${file} - done - ./configure --prefix=/usr \ - --enable-pinentry-curses \ - --disable-pinentry-gtk \ - --disable-pinentry-qt \ - --enable-pinentry-gtk2 \ - --enable-pinentry-qt4 \ - --enable-fallback-curses - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -} -md5sums=('81f99904daee5331eb6738408bb024b6' - '450b8713fe42f1bd93311ef84767c3d8') diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install deleted file mode 100644 index eed2c7124..000000000 --- a/testing/pinentry/pinentry.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(pinentry.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/pinentry/qt4-pinentry-window.patch b/testing/pinentry/qt4-pinentry-window.patch deleted file mode 100644 index 8f9faae11..000000000 --- a/testing/pinentry/qt4-pinentry-window.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky <sochotnicky@redhat.com> -Date: Tue, 1 Feb 2011 14:42:27 +0100 -Subject: [PATCH] Fix qt4 pinentry window created in the background - -This is probably just a workaround. Proper fix is being investigated. -See: -https://bugzilla.redhat.com/show_bug.cgi?id=589532 -http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background ---- - qt4/pinentrydialog.cpp | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp -index 541baf4..d634eb6 100644 ---- a/qt4/pinentrydialog.cpp -+++ b/qt4/pinentrydialog.cpp -@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) - SetForegroundWindow( w->winId() ); - #endif - w->raise(); -- w->activateWindow(); - } - - QPixmap icon( QStyle::StandardPixmap which ) --- -1.7.3.5 - diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD deleted file mode 100644 index 6f90efbc8..000000000 --- a/testing/pixman/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 160035 2012-05-28 11:24:39Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=pixman -pkgver=0.26.0 -pkgrel=1 -pkgdesc="The pixel-manipulation library for X and cairo" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org" -license=('custom') -depends=('glibc') -options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 - test_failures_on_x86-32.diff) -sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f' - '24a688271d5cf2c4137a147deaa2975122c01aa8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/pixman/test_failures_on_x86-32.diff b/testing/pixman/test_failures_on_x86-32.diff deleted file mode 100644 index 6e333c03a..000000000 --- a/testing/pixman/test_failures_on_x86-32.diff +++ /dev/null @@ -1,46 +0,0 @@ -From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sun, 27 May 2012 17:01:57 +0000 -Subject: mmx: add missing _mm_empty calls - -Fixes spurious test failures on x86-32. ---- -diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c -index bb125bf..6e292c6 100644 ---- a/pixman/pixman-mmx.c -+++ b/pixman/pixman-mmx.c -@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp, - w--; - } - } -+ -+ _mm_empty (); - } - - static void -@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - -@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - -@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) - w--; - } - -+ _mm_empty (); - return iter->buffer; - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD deleted file mode 100644 index 85b7cacc0..000000000 --- a/testing/postgresql/PKGBUILD +++ /dev/null @@ -1,146 +0,0 @@ -# $Id: PKGBUILD 159931 2012-05-27 07:44:19Z bluewind $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgbase=postgresql -pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.3 -_majorver=${pkgver%.*} -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.postgresql.org/" -license=('custom:PostgreSQL') -makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate) - -build() { - cd "${srcdir}/postgresql-${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --datadir=/usr/share/postgresql \ - --with-krb5 \ - --with-libxml \ - --with-openssl \ - --with-perl \ - --with-python PYTHON=/usr/bin/python2 \ - --with-tcl \ - --with-pam \ - --with-system-tzdata=/usr/share/zoneinfo \ - --enable-nls \ - --enable-thread-safety - - make world -} - -package_postgresql-libs() { - pkgdesc="Libraries for use with PostgreSQL" - depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0') - provides=('postgresql-client') - conflicts=('postgresql-client') - - cd "${srcdir}/postgresql-${pkgver}" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" - - # install libs - for dir in src/interfaces src/bin/pg_config src/bin/psql; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" - install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" - - cd src/include - - mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} - - # these headers are needed by the public headers of the interfaces - install -m644 pg_config.h "${pkgdir}/usr/include/" - install -m644 pg_config_os.h "${pkgdir}/usr/include/" - install -m644 postgres_ext.h "${pkgdir}/usr/include/" - install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" - install -m644 pg_config_manual.h "${pkgdir}/usr/include/" - - # these headers are needed by the not-so-public headers of the interfaces - install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/" - install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/" -} - -package_postgresql-docs() { - pkgdesc="HTML documentation for PostgreSQL" - options=(docs) - - cd "${srcdir}/postgresql-${pkgver}" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" - - make -C doc/src/sgml DESTDIR="${pkgdir}" install-html - chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" - - # clean up - rmdir "${pkgdir}"/usr/share/man/man{1,3,7} - rmdir "${pkgdir}"/usr/share/man -} - -package_postgresql() { - pkgdesc="A sophisticated object-relational DBMS" - backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') - optdepends=('python2: for PL/Python support' - 'perl: for PL/Perl support' - 'tcl: for PL/Tcl support' - 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade') - install=postgresql.install - - cd "${srcdir}/postgresql-${pkgver}" - - # install - make DESTDIR="${pkgdir}" install - make -C contrib DESTDIR="${pkgdir}" install - make -C doc/src/sgml DESTDIR="${pkgdir}" install-man - - # we don't want these, they are in the -libs package - for dir in src/interfaces src/bin/pg_config src/bin/psql; do - make -C ${dir} DESTDIR="${pkgdir}" uninstall - done - rm "${pkgdir}/usr/share/man/man1/pg_config.1" - rm "${pkgdir}/usr/share/man/man1/psql.1" - - # install license - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" - - # clean up unneeded installed items - rm -rf "${pkgdir}/usr/include/postgresql/internal" - rm -rf "${pkgdir}/usr/include/libpq" - find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + - rmdir "${pkgdir}/usr/share/doc/postgresql/html" - - # install launch script - install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" - - # install conf file - install -D -m644 ${srcdir}/postgresql.confd \ - "${pkgdir}/etc/conf.d/postgresql" - - install -D -m644 ${srcdir}/postgresql.pam \ - "${pkgdir}/etc/pam.d/postgresql" - - install -D -m644 ${srcdir}/postgresql.logrotate \ - "${pkgdir}/etc/logrotate.d/postgresql" -} - -md5sums=('641e1915f7ebfdc9f138e4c55b6aec0e' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd deleted file mode 100644 index 6001c16d1..000000000 --- a/testing/postgresql/postgresql.confd +++ /dev/null @@ -1,11 +0,0 @@ -## -## Parameters to be passed to postgresql -## -## Default data directory location -#PGROOT="/var/lib/postgres" -## Passed to initdb if necessary -INITOPTS="--locale en_US.UTF-8" -## Default log file location -#PGLOG="/var/log/postgresql.log" -## Additional options to pass via pg_ctl's '-o' option -#PGOPTS="" diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install deleted file mode 100644 index c52432271..000000000 --- a/testing/postgresql/postgresql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - if [ ! -d '/var/lib/postgres' ]; then - mkdir -p '/var/lib/postgres' - fi - getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres - passwd -l postgres >/dev/null -} - -post_upgrade() { - post_install $1 - # FS#23858, fix postgres user shell issue - postgres_shell=$(getent passwd postgres | cut -d: -f7) - if [ "$postgres_shell" = "/sbin/nologin" ]; then - chsh -s /bin/bash postgres - fi -} - -post_remove() { - if getent passwd postgres >/dev/null; then - userdel postgres - fi - if getent group postgres >/dev/null; then - groupdel postgres - fi -} diff --git a/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate deleted file mode 100644 index 9c36918be..000000000 --- a/testing/postgresql/postgresql.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/postgresql/postgresql.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/postgresql/postgresql.rcd b/testing/postgresql/postgresql.rcd deleted file mode 100755 index f3600b30b..000000000 --- a/testing/postgresql/postgresql.rcd +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/postgresql - -# Default PGROOT if it wasn't defined in the conf.d file -PGROOT=${PGROOT:-/var/lib/postgres} -PGLOG=${PGLOG:-/var/log/postgresql.log} -PGCTL_BIN=/usr/bin/pg_ctl -PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w) -[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS") - -postgres_init() { - # initialization - if [[ ! -d "$PGROOT/data" ]]; then - mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT" - su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'" - fi - if [[ ! -e "$PGLOG" ]]; then - touch "$PGLOG" - chown postgres "$PGLOG" - fi -} - -do_postgres() { - su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")" -} - -case $1 in - start) - postgres_init - stat_busy "Starting PostgreSQL" - if do_postgres start; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping PostgreSQL" - if do_postgres stop -m fast; then - rm_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - reload) - stat_busy "Reloading PostgreSQL" - if do_postgres reload; then - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - postgres_init - stat_busy "Restarting PostgreSQL" - if do_postgres restart -m fast; then - add_daemon postgresql - stat_done - else - stat_fail - exit 1 - fi - ;; - status) - stat_busy "Checking PostgreSQL status"; - ck_status postgresql - ;; - *) - echo "usage: $0 {start|stop|reload|restart|status}" - exit 1 -esac diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD deleted file mode 100644 index 1266a40ff..000000000 --- a/testing/procps-ng/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 160218 2012-05-31 00:53:30Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=procps-ng -pkgver=3.3.3 -pkgrel=1 -pkgdesc="Utilities for monitoring your system and processes on your system" -arch=('i686' 'x86_64') -url="http://gitorious.org/procps" -license=('GPL' 'LGPL') -groups=('base') -depends=('ncurses') -conflicts=('procps') -provides=('procps') -replaces=('procps') -backup=('etc/sysctl.conf') -options=('!libtool') -source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} - sysctl.conf) -sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'ddf0dab2e3612d44903fc02f46316cabbec4651e') - -build() { - cd "${srcdir}/procps-procps" - echo ${pkgver} > .tarball-version - ./autogen.sh - ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib - make -} - -package() { - cd "${srcdir}/procps-procps" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" -} diff --git a/testing/procps-ng/sysctl.conf b/testing/procps-ng/sysctl.conf deleted file mode 100644 index 44906a21a..000000000 --- a/testing/procps-ng/sysctl.conf +++ /dev/null @@ -1,42 +0,0 @@ -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. - -# you can have the CD-ROM close when you use it, and open -# when you are done. -#dev.cdrom.autoeject = 1 -#dev.cdrom.autoclose = 1 - -# protection from the SYN flood attack -net.ipv4.tcp_syncookies = 1 - -# see the evil packets in your log files -#net.ipv4.conf.all.log_martians = 1 - -# if not functioning as a router, there is no need to accept redirects or source routes -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_source_route = 0 - -# Disable packet forwarding -net.ipv4.ip_forward = 0 -net.ipv6.conf.all.forwarding = 0 - -# sets the port range used for outgoing connections -#net.ipv4.ip_local_port_range = 32768 61000 - -# Swapping too much or not enough? Disks spinning up when you'd -# rather they didn't? Tweak these. -#vm.vfs_cache_pressure = 100 -#vm.laptop_mode = 0 -#vm.swappiness = 60 - -#kernel.printk_ratelimit_burst = 10 -#kernel.printk_ratelimit = 5 -#kernel.panic_on_oops = 0 - -# Reboot 600 seconds after a panic -#kernel.panic = 600 - -# Disable SysRq key (note: console security issues) -kernel.sysrq = 0 diff --git a/testing/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/testing/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch deleted file mode 100644 index 93167b79b..000000000 --- a/testing/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 26 May 2012 02:58:11 +0200 -Subject: [PATCH] Remove usage of deprecated udev_get_*_path - -These symbols were removed in libudev.so.1.0.0. Replace them with -hardcoded strings. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/modules/module-udev-detect.c | 9 +++------ - src/modules/udev-util.c | 4 ++-- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c -index 1192194..31416bd 100644 ---- a/src/modules/module-udev-detect.c -+++ b/src/modules/module-udev-detect.c -@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { - pa_assert(u); - pa_assert(d); - -- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); -+ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); - accessible = access(cd, R_OK|W_OK) >= 0; - pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); - -@@ -621,7 +621,6 @@ fail: - } - - static int setup_inotify(struct userdata *u) { -- char *dev_snd; - int r; - - if (u->inotify_fd >= 0) -@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { - return -1; - } - -- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); -- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); -- pa_xfree(dev_snd); -+ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); - - if (r < 0) { - int saved_errno = errno; -diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c -index 2f18bc4..b0bb17d 100644 ---- a/src/modules/udev-util.c -+++ b/src/modules/udev-util.c -@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - --- -1.7.10.2 - diff --git a/testing/pulseaudio/PKGBUILD b/testing/pulseaudio/PKGBUILD deleted file mode 100644 index cde86ecba..000000000 --- a/testing/pulseaudio/PKGBUILD +++ /dev/null @@ -1,115 +0,0 @@ -# $Id: PKGBUILD 159978 2012-05-27 13:11:05Z dreisner $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=pulseaudio -pkgname=(pulseaudio libpulse) -pkgdesc="A featureful, general-purpose sound server" -pkgver=2.0 -pkgrel=2 -arch=(i686 x86_64) -url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(GPL LGPL) -makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core avahi bluez gconf intltool jack - lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing - libsystemd) -options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) -sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') - -build() { - cd $pkgbase-$pkgver - - # libudev.so.1.0.0 - patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --with-database=tdb \ - --disable-hal \ - --disable-tcpwrap \ - --disable-rpath \ - --disable-default-build-tests - - # fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate webrtc-audio-processing libsystemd) - optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' - 'gconf: configuration through gconf (paprefs)' - 'jack: jack support' - 'lirc-utils: infra-red support' - 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') - backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) - install=pulseaudio.install - - cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install - - # Lower resample quality, saves CPU - sed -e '/resample-method/iresample-method=speex-float-0' \ - -i "$pkgdir/etc/pulse/daemon.conf" - - # Disable cork-request module, can result in e.g. media players unpausing - # when there's a Skype call incoming - sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "$pkgdir/usr/bin/start-pulseaudio-x11" - - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" - - rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - -### Split libpulse - - mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}} - - mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf - - mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ - "$srcdir/libpulse/usr/lib" - - mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ - "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ - "$srcdir/libpulse/usr/lib/pulseaudio" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig - - mv {"$pkgdir","$srcdir/libpulse"}/usr/include - - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala -} - -package_libpulse() { - pkgdesc="$pkgdesc (client library)" - depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) - optdepends=('alsa-plugins: ALSA support' - 'avahi: zeroconf support') - backup=(etc/pulse/client.conf) - - mv "$srcdir"/libpulse/* "$pkgdir" -} diff --git a/testing/pulseaudio/pulseaudio.install b/testing/pulseaudio/pulseaudio.install deleted file mode 100644 index 1dc4cefb3..000000000 --- a/testing/pulseaudio/pulseaudio.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - cat << MES ->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details - on configuring your system for PulseAudio. - ->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. -MES -} - -post_upgrade() { - cat << MES ->>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync - with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio - may refuse to start due to configuration errors. -MES -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/pulseaudio/pulseaudio.xinit b/testing/pulseaudio/pulseaudio.xinit deleted file mode 100644 index 2d30c0943..000000000 --- a/testing/pulseaudio/pulseaudio.xinit +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart - ;; - *) - # Extra checks in case DESKTOP_SESSION is not set correctly - if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then - /usr/bin/start-pulseaudio-x11 - fi - ;; -esac diff --git a/testing/razor/PKGBUILD b/testing/razor/PKGBUILD deleted file mode 100644 index 6dab61a47..000000000 --- a/testing/razor/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159933 2012-05-27 07:44:23Z bluewind $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=razor -pkgver=2.84 -pkgrel=7 -pkgdesc="A distributed, collaborative, spam detection and filtering network" -arch=('i686' 'x86_64') -url="http://razor.sourceforge.net" -license=('PerlArtistic') -depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl') -options=('!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') - -build() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - - # skip install_razor_agents (we'll do the linking later) - # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile - - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - make test -} - -package() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - make DESTDIR="${pkgdir}" install - - # cd ${pkgdir}/usr/bin - # for i in razor-check razor-report razor-revoke razor-admin; do - # /bin/ln -sf razor-client $i; - # done -} diff --git a/testing/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD deleted file mode 100644 index 437f61caf..000000000 --- a/testing/rrdtool/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 159935 2012-05-27 07:44:27Z bluewind $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=rrdtool -pkgver=1.4.7 -pkgrel=2 -pkgdesc="Data logging and graphing application" -arch=('i686' 'x86_64') -url="http://www.rrdtool.org" -license=('GPL' 'custom') -depends=('libxml2' 'pango' 'ttf-dejavu') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') -optdepends=('tcl: to use corresponding binding' \ - 'python2: to use corresponding binding' \ - 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') - -build() { - cd "${srcdir}/${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 - - PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ - --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ - --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD deleted file mode 100644 index c29ffb194..000000000 --- a/testing/run-parts/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 160459 2012-06-02 09:35:46Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=run-parts -pkgver=4.3.1 -pkgrel=1 -pkgdesc='run scripts or programs in a directory' -arch=('i686' 'x86_64') -url='http://packages.qa.debian.org/d/debianutils.html' -license=('GPL') -depends=('glibc') -source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('03cbb242b8b86f444477e0bbe8e391c18aec8f8d08a2a02e8893efd1d5d6e4bc') - -build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts -} - -package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 - for l in po4a/*/run-parts.8; do - install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 - done -} diff --git a/testing/slim/PKGBUILD b/testing/slim/PKGBUILD deleted file mode 100644 index 7237c3a47..000000000 --- a/testing/slim/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 160004 2012-05-27 19:50:08Z tpowa $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Hugo Ideler <hugoideler@dse.nl> - -pkgname=slim -pkgver=1.3.3 -pkgrel=4 -pkgdesc='Desktop-independent graphical login manager for X11' -arch=('i686' 'x86_64') -url='http://slim.berlios.de/' -license=('GPL2') -depends=('consolekit' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft') -makedepends=('cmake' 'freeglut') -backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'pam.d' - 'logrotate' - 'slim.service' - 'ptr_pam.patch' - 'session-name.patch' - 'fix-numlock-1.3.3.patch') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM - patch -p1 -i ../session-name.patch # FS#26693: fix default session name - patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes - make -} - -package() { - cd ${srcdir}/build/ - make DESTDIR="${pkgdir}" install - - install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim - install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim - install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim - - # Provide sane defaults - sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf - sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf - # install systemd files - install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service -} -md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' - 'd8ea9c4dee2811524b67f4f666311a1f' - 'ebfff3417058619a1328284ae0e2f48e' - '43da096480bf72c3ccec8ad8400f34f0' - '7c0bf1fb6292537e2c63ec04f8532079' - 'ae4b237d472ec5d373e30080aa0ff804' - 'ebcb6829028615686de7b64ceeaaf8ed' - '6c29c93370e44ed310ff30132424b619') diff --git a/testing/slim/fix-numlock-1.3.3.patch b/testing/slim/fix-numlock-1.3.3.patch deleted file mode 100644 index 179fffcbf..000000000 --- a/testing/slim/fix-numlock-1.3.3.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- trunk/app.cpp 2012/02/21 23:57:28 211 -+++ trunk/app.cpp 2012/04/16 23:28:34 212 -@@ -332,6 +332,15 @@ - Login(); - } - } -+ -+ // Set NumLock -+ string numlock = cfg->getOption("numlock"); -+ if (numlock == "on") { -+ NumLock::setOn(Dpy); -+ } else if (numlock == "off") { -+ NumLock::setOff(Dpy); -+ } -+ - // Start looping - int panelclosed = 1; - Panel::ActionType Action; -@@ -971,13 +980,6 @@ - break; - } - -- string numlock = cfg->getOption("numlock"); -- if (numlock == "on") { -- NumLock::setOn(Dpy); -- } else if (numlock == "off") { -- NumLock::setOff(Dpy); -- } -- - delete args; - - serverStarted = true; ---- trunk/numlock.cpp 2012/02/21 23:57:28 211 -+++ trunk/numlock.cpp 2012/04/16 23:28:34 212 -@@ -68,9 +68,9 @@ - return; - - if( flag == true ) -- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); -- else - XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask); -+ else -+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); - } - - void NumLock::setOn(Display *dpy) { diff --git a/testing/slim/install b/testing/slim/install deleted file mode 100644 index 65aa77d72..000000000 --- a/testing/slim/install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - cat <<EOF - -==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab. - -EOF -} diff --git a/testing/slim/logrotate b/testing/slim/logrotate deleted file mode 100644 index 26ec3b0f4..000000000 --- a/testing/slim/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/testing/slim/pam.d b/testing/slim/pam.d deleted file mode 100644 index 4a6b53d0f..000000000 --- a/testing/slim/pam.d +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_loginuid.so diff --git a/testing/slim/ptr_pam.patch b/testing/slim/ptr_pam.patch deleted file mode 100644 index 3a3fbcdb7..000000000 --- a/testing/slim/ptr_pam.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur old/app.cpp new/app.cpp ---- old/app.cpp 2010-07-08 07:04:10.000000000 +0200 -+++ new/app.cpp 2011-05-01 18:30:52.933844872 +0200 -@@ -43,8 +43,8 @@ - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -- resp[i]->resp=0; -- resp[i]->resp_retcode=0; -+ (*resp)[i].resp=0; -+ (*resp)[i].resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -@@ -53,13 +53,13 @@ - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -- resp[i]->resp=strdup("root"); -+ (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -- resp[i]->resp=strdup(panel->GetName().c_str()); -+ (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -@@ -75,7 +75,7 @@ - - default: - panel->EventHandler(Panel::Get_Passwd); -- resp[i]->resp=strdup(panel->GetPasswd().c_str()); -+ (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -@@ -91,9 +91,9 @@ - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -- if (resp[i]->resp==0) continue; -- free(resp[i]->resp); -- resp[i]->resp=0; -+ if ((*resp)[i].resp==0) continue; -+ free((*resp)[i].resp); -+ (*resp)[i].resp=0; - }; - free(*resp); - *resp=0; diff --git a/testing/slim/rc.d b/testing/slim/rc.d deleted file mode 100755 index b0be7ffc5..000000000 --- a/testing/slim/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/slim` -case "$1" in - start) - stat_busy "Starting Simple Login Manager" - [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon slim - stat_done - fi - ;; - stop) - stat_busy "Stopping Simple Login Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon slim - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/slim/session-name.patch b/testing/slim/session-name.patch deleted file mode 100644 index 8211c4f72..000000000 --- a/testing/slim/session-name.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp ---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 -+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 -@@ -23,7 +23,7 @@ - Root = root; - cfg = config; - -- session = ""; -+ session = cfg->nextSession(session); - - // Init GC - XGCValues gcv; -@@ -188,7 +188,7 @@ - } - - void Panel::ClearPanel() { -- session = ""; -+ session = cfg->nextSession(session); - Reset(); - XClearWindow(Dpy, Root); - XClearWindow(Dpy, Win); diff --git a/testing/slim/slim.service b/testing/slim/slim.service deleted file mode 100644 index 18d8c99be..000000000 --- a/testing/slim/slim.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon - -[Install] -WantedBy=graphical.target diff --git a/testing/slim/tty-slowness.patch b/testing/slim/tty-slowness.patch deleted file mode 100644 index c590fbed8..000000000 --- a/testing/slim/tty-slowness.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp ---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 -+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -@@ -280,21 +280,22 @@ - signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG -- OpenLog(); -- - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { - daemonmode = true; - } - - // Daemonize - if (daemonmode) { -- if (daemon(0, 1) == -1) { -+ if (daemon(0, 0) == -1) { - cerr << APPNAME << ": " << strerror(errno) << endl; - exit(ERR_EXIT); - } -- UpdatePid(); - } - -+ OpenLog(); -+ -+ if (daemonmode) UpdatePid(); -+ - CreateServerAuth(); - StartServer(); - alarm(2); diff --git a/testing/startup-notification/PKGBUILD b/testing/startup-notification/PKGBUILD deleted file mode 100644 index d08515e99..000000000 --- a/testing/startup-notification/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 160410 2012-06-01 20:06:00Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=startup-notification -pkgver=0.12 -pkgrel=3 -pkgdesc="Monitor and display application startup" -arch=(i686 x86_64) -license=('LGPL') -depends=('libx11' 'xcb-util>=0.3.9') -options=('!libtool') -url="http://www.freedesktop.org" -source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.in - autoreconf --force --install - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD deleted file mode 100644 index 961c70467..000000000 --- a/testing/subversion/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 159937 2012-05-27 07:44:33Z bluewind $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.7.5 -pkgrel=2 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool' '!emptydirs') -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1' - 'b267cba19b4f56360657a5bf5b231950e027a45a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -p0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all - make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb - - install -d "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/usr/share/bash-completion/completions/subversion - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/testing/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/svn b/testing/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/testing/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/testing/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/testing/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index 51f04c767..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 160229 2012-05-31 11:41:21Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.5p2 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -license=('custom') -depends=('glibc' 'pam') -backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} - sudo.pam) -md5sums=('dc42ed9f0946d92273762d0ae7314d59' - '756d80fc1c996d4f5458deec5a69b5c4' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -check() { - cd "$srcdir/$pkgname-$_ver" - make check -} - -package() { - cd "$srcdir/$pkgname-$_ver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD deleted file mode 100644 index 14258491c..000000000 --- a/testing/system-config-printer/PKGBUILD +++ /dev/null @@ -1,108 +0,0 @@ -# $Id: PKGBUILD 159980 2012-05-27 13:11:07Z dreisner $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=system-config-printer -pkgname=('system-config-printer-common' - 'system-config-printer-gnome') -pkgver=1.3.9 -pkgrel=3 -pkgdesc="A CUPS printer configuration tool and status applet" -url="http://cyberelk.net/tim/software/system-config-printer/" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' - 'libusb-compat' 'desktop-file-utils') -source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) -md5sums=('df424f127eede63965608e5ec5e27519' - 'd105b7f7725c1ec538b6e6adb10667f3') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - - 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 - - # Fix build with udev 183 - sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --with-udev-rules - - make -} - -package_system-config-printer-common() { - pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat') - optdepends=('system-config-printer-gnome: for the GTK frontend' - 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') - replaces=('system-config-printer') - provides=("system-config-printer=${pkgver}") - conflicts=('system-config-printer') - - cd "${srcdir}"/${pkgbase}-${pkgver} - install -d "${pkgdir}"/usr/share/${pkgbase} - install -m644 config.py \ - debug.py \ - installpackage.py \ - monitor.py \ - PhysicalDevice.py \ - ppdippstr.py \ - probe_printer.py \ - SearchCriterion.py \ - smburi.py \ - statereason.py \ - "${pkgdir}"/usr/share/${pkgbase}/ - - install -m755 pysmb.py \ - "${pkgdir}"/usr/share/${pkgbase}/ - - install -d "${pkgdir}"/etc/dbus-1/system.d/ - install -m644 dbus/com.redhat.NewPrinterNotification.conf \ - dbus/com.redhat.PrinterDriversInstaller.conf \ - "${pkgdir}"/etc/dbus-1/system.d/ - install -d "${pkgdir}"/etc/cupshelpers/ - install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ - - install -d "${pkgdir}"/usr/lib/udev/rules.d - install -m755 udev/{udev-add-printer,udev-configure-printer} \ - "${pkgdir}"/usr/lib/udev/ - install -m644 udev/70-printers.rules \ - "${pkgdir}"/usr/lib/udev/rules.d - - for file in build/lib/cupshelpers/*.py; do - install -Dm644 $file \ - "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) - done -} - -package_system-config-printer-gnome() { - pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') - optdependence=('gnome-keyring: password management') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install - - # files provided by system-config-printer-common - cd "${pkgdir}"/usr/share/${pkgbase} - rm config.py \ - debug.py \ - installpackage.py \ - monitor.py \ - PhysicalDevice.py \ - ppdippstr.py \ - probe_printer.py \ - SearchCriterion.py \ - smburi.py \ - statereason.py \ - pysmb.py - rm -r "${pkgdir}"/etc/dbus-1/ - rm -r "${pkgdir}"/etc/cupshelpers/ - rm -r "${pkgdir}"/etc/udev/ - rm -r "${pkgdir}"/usr/lib/ -} diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD deleted file mode 100644 index 0031c7361..000000000 --- a/testing/udisks/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159984 2012-05-27 13:11:12Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=udisks -pkgver=1.0.4 -pkgrel=4 -pkgdesc="Disk Management Service" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') -makedepends=('intltool' 'docbook-xsl') -options=(!libtool) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/udisks --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" - # move udev helpers and rules to /usr/lib - mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ - rm -r "${pkgdir}"/lib -} diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD deleted file mode 100644 index 0264e7ce1..000000000 --- a/testing/util-linux/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 159986 2012-05-27 13:11:14Z dreisner $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=util-linux -pkgver=2.21.2 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64') -groups=('base') -depends=('udev' 'pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ - --enable-raw \ - --disable-wall \ - --enable-new-mount - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - - install -dm755 var/lib/hwclock - - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru -} -md5sums=('54ba880f1d66782c2287ee2c898520e9') diff --git a/testing/vim/PKGBUILD b/testing/vim/PKGBUILD deleted file mode 100644 index 7fc367e55..000000000 --- a/testing/vim/PKGBUILD +++ /dev/null @@ -1,216 +0,0 @@ -# $Id: PKGBUILD 159939 2012-05-27 07:44:40Z bluewind $ -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Maintainer: tobias [ tobias at archlinux org ] -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.3 -_patchlevel=515 -__hgrev=8201108e9cf0 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872' - 'vimrc' - 'archlinux.vim' - 'gvim.desktop') -sha1sums=('10d7642d5062effdb51f53952622f9338003bbbf' - '0c1c584c1a2a2a279507f793cd5eff82863c625b' - '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' - '3494baf53a63581ba69f86a81293640ff681c5c5' - '25dd3c2ce436e73a367c8f73b68f7f6889682437' - '4a579cf66590d711f49c5dfb4a25e5df116ff7ba') - -# source PKGBUILD && mksource -mksource() { - - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) - - __hgroot='http://vim.googlecode.com/hg/' - __hgrepo='vim' - __hgbranch='default' - - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - - pushd ${__hgrepo} - if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - printf 'You are not building the latest revision!\n' - printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" - fi - popd - - mv vim ${pkgname}-${pkgver} - find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; - rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} - tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - rm -r ${pkgname}-${pkgver} - #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - # remove -O2 because there is a crash with python because of it - # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196 - export CFLAGS="${CFLAGS/-O2 /}" - - cd "${srcdir}" - - cp -a ${pkgname}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - # fix python name - sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ - vim-build/src/configure.in - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - - cd "${srcdir}"/vim-build - - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=no \ - --disable-gui --enable-multibyte --enable-cscope \ - --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-python3interp --disable-rubyinterp --disable-luainterp - - make - - cd "${srcdir}"/gvim-build - - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=yes \ - --enable-gui=gtk2 --enable-multibyte --enable-cscope \ - --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --disable-python3interp --enable-rubyinterp --enable-luainterp - - make -} - -check() { - # disable tests because they seem to freeze - - cd "${srcdir}"/vim-build - - #make test - - cd "${srcdir}"/gvim-build - - #make test -} - -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') - - cd "${srcdir}"/vim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - rm -f evim.1 # this does not make sense if we have no GUI - done - - # Runtime provided by runtime package - rm -r "${pkgdir}"/usr/share/vim - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_gvim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2' 'lua' 'python2') - provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') - install=gvim.install - - cd "${srcdir}"/gvim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - done - - # Move the runtime for later packaging - mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install - - # freedesktop links - install -Dm644 "${srcdir}"/gvim.desktop \ - "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - # Install the runtime split from gvim - install -dm755 "${pkgdir}"/usr/share - mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # make Aaron happy - install -Dm644 "${srcdir}"/pythoncomplete.vim \ - "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/archlinux.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/testing/vim/archlinux.vim b/testing/vim/archlinux.vim deleted file mode 100644 index 148bb930f..000000000 --- a/testing/vim/archlinux.vim +++ /dev/null @@ -1,26 +0,0 @@ -" The ArchLinux global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map <S-Insert> <MiddleMouse> - map! <S-Insert> <MiddleMouse> -endif diff --git a/testing/vim/gvim.desktop b/testing/vim/gvim.desktop deleted file mode 100644 index 675357da5..000000000 --- a/testing/vim/gvim.desktop +++ /dev/null @@ -1,63 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/testing/vim/gvim.install b/testing/vim/gvim.install deleted file mode 100644 index 2eaa60550..000000000 --- a/testing/vim/gvim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/vim/vimrc b/testing/vim/vimrc deleted file mode 100644 index 92d3ff980..000000000 --- a/testing/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just -" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing archlinux.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! archlinux.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD deleted file mode 100644 index 9ddc7bae8..000000000 --- a/testing/vlc/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 159988 2012-05-27 13:11:16Z dreisner $ -# 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.1 -pkgrel=2 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') -makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' - 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' - 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards' - 'libbluray: for Blu-Ray support' - 'flac: for Free Lossless Audio Codec plugin' - 'oss: for OSS audio support' - 'portaudio: for portaudio support' - 'twolame: for TwoLAME mpeg2 encoder plugin' - 'projectm: for ProjectM visualisation plugin' - 'libcaca: for colored ASCII art video output' - 'libgme: for libgme plugin' - 'librsvg: for SVG plugin' - 'gnome-vfs: for GNOME Virtual File System support' - 'libgoom2: for libgoom plugin' - 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support' - 'aalib: for ASCII art plugin' - 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' - 'smbclient: for SMB access plugin') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool' '!emptydirs') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('5ad114755670e4881a2b35354e2f79bc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-oss \ - --enable-faad \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --enable-realrtsp \ - --enable-xosd \ - --enable-aa \ - --enable-vcdx - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/testing/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/testing/weechat/PKGBUILD b/testing/weechat/PKGBUILD deleted file mode 100644 index 642ffbeaf..000000000 --- a/testing/weechat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159941 2012-05-27 07:44:44Z bluewind $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: lucke <lucke at o2 dot pl> - -pkgname=weechat -pkgver=0.3.7 -pkgrel=2 -pkgdesc="Fast, light and extensible IRC client (curses UI)" -arch=('i686' 'x86_64') -url="http://www.weechat.org/" -license=('GPL') -depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') -optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') -options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('62bb5002b2ba9e5816dfeededc3fa276') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - mkdir build - cd build - cmake .. -DPREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - - make DESTDIR="${pkgdir}/" install -} diff --git a/testing/xcb-util-image/LICENSE b/testing/xcb-util-image/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/testing/xcb-util-image/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/testing/xcb-util-image/PKGBUILD b/testing/xcb-util-image/PKGBUILD deleted file mode 100644 index 42beb6bca..000000000 --- a/testing/xcb-util-image/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160414 2012-06-01 20:06:05Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-image -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7' 'xcb-util>=0.3.9') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xcb-util-keysyms/LICENSE b/testing/xcb-util-keysyms/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/testing/xcb-util-keysyms/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/testing/xcb-util-keysyms/PKGBUILD b/testing/xcb-util-keysyms/PKGBUILD deleted file mode 100644 index 108cd969b..000000000 --- a/testing/xcb-util-keysyms/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160416 2012-06-01 20:06:07Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-keysyms -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xcb-util-wm/LICENSE b/testing/xcb-util-wm/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/testing/xcb-util-wm/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/testing/xcb-util-wm/PKGBUILD b/testing/xcb-util-wm/PKGBUILD deleted file mode 100644 index 27c09f2b5..000000000 --- a/testing/xcb-util-wm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 160418 2012-06-01 20:06:11Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=xcb-util-wm -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xcb-util/LICENSE b/testing/xcb-util/LICENSE deleted file mode 100644 index 5e3822ccd..000000000 --- a/testing/xcb-util/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> - * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * Copyright © 2008 Julien Danjou <julien@danjou.info> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard <keithp@keithp.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood <iano@quirkster.com> - * Copyright © 2008 Jamey Sharp <jamey@minilop.net> - * Copyright © 2008 Josh Triplett <josh@freedesktop.org> - * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/testing/xcb-util/PKGBUILD b/testing/xcb-util/PKGBUILD deleted file mode 100644 index fc8f7146d..000000000 --- a/testing/xcb-util/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 160412 2012-06-01 20:06:02Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=xcb-util -pkgver=0.3.9 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding" -arch=('i686' 'x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('libxcb>=1.7') -makedepends=('gperf' 'xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/testing/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch deleted file mode 100644 index bcfbf94db..000000000 --- a/testing/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch +++ /dev/null @@ -1,571 +0,0 @@ -From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> -Date: Fri, 13 Apr 2012 11:12:51 +0200 -Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx - -The patch below implements basic acceleration of solid pictures via -scratch 1x1 pixmaps. It seems to at least alleviate some of the -corruption and performance issues exposed by Cairo 1.12, and should also -improve performance for other toolkits/apps using solid pictures. - -If there are no objections to this approach, maybe someone else can beat -me to extending this for Evergreen+ and R1/2xx. ---- - src/r600_exa.c | 160 ++++++++++++++++++++++++++-------------------- - src/radeon_exa_render.c | 115 ++++++++++++++++++++-------------- - src/radeon_exa_shared.c | 19 ++++++ - src/radeon_exa_shared.h | 1 + - 4 files changed, 179 insertions(+), 116 deletions(-) - -diff --git a/src/r600_exa.c b/src/r600_exa.c -index e1eb62f..c3ae553 100644 ---- a/src/r600_exa.c -+++ b/src/r600_exa.c -@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) { - if (R600TexFormats[i].fmt == pPict->format) -@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]); - vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]); - vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]); -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]); - vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]); - vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]); -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } else { - accel_state->is_transform[unit] = FALSE; - - vs_alu_consts[0] = 1.0; - vs_alu_consts[1] = 0.0; - vs_alu_consts[2] = 0.0; -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = 0.0; - vs_alu_consts[5] = 1.0; - vs_alu_consts[6] = 0.0; -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } - - /* VS alu constants */ -@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 8192 || -+ pSrcPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 8192 || -+ pDstPixmap->drawable.height >= 8192) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 8192 || -+ pMaskPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (R600BlendOp[op].src_alpha && -- (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (R600BlendOp[op].src_alpha && -+ (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!R600GetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - shader_config_t vs_conf, ps_conf; - struct r600_accel_object src_obj, mask_obj, dst_obj; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); - src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); -@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - mask_obj.offset = 0; -@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void R600DoneComposite(PixmapPtr pDst) -+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst) - r600_finish_op(pScrn, vtx_size); - } - -+static void R600DoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ R600FinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void R600Composite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst, - - #ifdef XF86DRM_MODE - if (info->cs && CS_FULL(info->cs)) { -- R600DoneComposite(info->accel_state->dst_pix); -+ R600FinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - R600PrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index e5c231f..b6cc9e4 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict, - if (repeatType == RepeatNormal || repeatType == RepeatReflect) { - Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix); - -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w = pPict->pDrawable ? pPict->pDrawable->width : 1; -+ int h = pPict->pDrawable ? pPict->pDrawable->height : 1; - - if (pPict->transform) { - if (badPitch) -@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - ScreenPtr pScreen = pDstPict->pDrawable->pScreen; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); -- - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; -- int max_tex_w, max_tex_h; -- -- if (is_r500) { -- max_tex_w = 4096; -- max_tex_h = 4096; -- } else { -- max_tex_w = 2048; -- max_tex_h = 2048; -- } -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++) - { -@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) { -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) { - if (info->cs) { - struct radeon_exa_pixmap_priv *driver_priv; - PixmapPtr pPix; -@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w, h; - int i, pixel_shift, out_size = 6; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - - TRACE; - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- - if (IS_R500_3D) { - max_tex_w = 4096; - max_tex_h = 4096; -@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - } - } - -- if (pSrcPixmap->drawable.width > max_tex_w || -- pSrcPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > max_dst_w || -@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > max_tex_w || -+ pSrcPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width > max_tex_w || -- pMaskPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > max_tex_w || -+ pMaskPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t txenable, colorpitch; - uint32_t blendcntl, output_fmt; -@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - -@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst) - { - RINFO_FROM_SCREEN(pDst->drawable.pScreen); - ACCEL_PREAMBLE(); -@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) - LEAVE_DRAW(0); - } - -+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ FUNC_NAME(RadeonFinishComposite)(pDst); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} - - #ifdef ACCEL_CP - -@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn, - if ((info->cs && CS_FULL(info->cs)) || - (!info->cs && (info->cp->indirectBuffer->used + 4 * 32) > - info->cp->indirectBuffer->total)) { -- FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix); -+ FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix); - if (info->cs) - radeon_cs_flush_indirect(pScrn); - else -diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c -index be1d2fa..28dc335 100644 ---- a/src/radeon_exa_shared.c -+++ b/src/radeon_exa_shared.c -@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp) - return FALSE; - } - -+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid) -+{ -+ PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0); -+ struct radeon_bo *bo; -+ -+ exaMoveInPixmap(pPix); -+ bo = radeon_get_pixmap_bo(pPix); -+ -+ if (radeon_bo_map(bo, 1)) { -+ pScreen->DestroyPixmap(pPix); -+ return NULL; -+ } -+ -+ memcpy(bo->ptr, &solid, 4); -+ radeon_bo_unmap(bo); -+ -+ return pPix; -+} -+ - static Bool radeon_vb_get(ScrnInfoPtr pScrn) - { - RADEONInfoPtr info = RADEONPTR(pScrn); -diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h -index 7b8b5ca..60a1045 100644 ---- a/src/radeon_exa_shared.h -+++ b/src/radeon_exa_shared.h -@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn); - extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2); - extern Bool RADEONValidPM(uint32_t pm, int bpp); - extern Bool RADEONCheckBPP(int bpp); -+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid); - - #define RADEON_TRACE_FALL 0 - #define RADEON_TRACE_DRAW 0 --- -1.7.7.5 - diff --git a/testing/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/testing/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch deleted file mode 100644 index e6b5433e1..000000000 --- a/testing/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Sat, 14 Apr 2012 08:53:39 -0400 -Subject: [PATCH] poor man's solid picture support for evergreen - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/evergreen_exa.c | 163 ++++++++++++++++++++++++++++++--------------------- - 1 files changed, 95 insertions(+), 68 deletions(-) - -diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c -index cee3ec2..61b47a4 100644 ---- a/src/evergreen_exa.c -+++ b/src/evergreen_exa.c -@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 16384; -- max_tex_h = 16384; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) { - if (EVERGREENTexFormats[i].fmt == pPict->format) -@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int const_offset = unit * 8; -+ int w, h; -+ -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ } else { -+ w = 1; -+ h = 1; -+ } - - if (pPict->transform != 0) { - accel_state->is_transform[unit] = TRUE; -@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } -+ - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 16384 || -+ pSrcPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 16384 || -+ pDstPixmap->drawable.height >= 16384) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 16384 || -+ pMaskPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (EVERGREENBlendOp[op].src_alpha && -- (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (EVERGREENBlendOp[op].src_alpha && -+ (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!EVERGREENGetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - struct r600_accel_object src_obj, mask_obj, dst_obj; - float *cbuf; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); - src_obj.surface = radeon_get_pixmap_surface(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); -@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } - mask_obj.offset = 0; - mask_obj.bo = radeon_get_pixmap_bo(pMask); - mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask); -@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void EVERGREENDoneComposite(PixmapPtr pDst) -+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst) - evergreen_finish_op(pScrn, vtx_size); - } - -+static void EVERGREENDoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ EVERGREENFinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void EVERGREENComposite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst, - float *vb; - - if (CS_FULL(info->cs)) { -- EVERGREENDoneComposite(info->accel_state->dst_pix); -+ EVERGREENFinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - EVERGREENPrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, --- -1.7.7.5 - diff --git a/testing/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/testing/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch deleted file mode 100644 index 3a2779446..000000000 --- a/testing/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch +++ /dev/null @@ -1,182 +0,0 @@ -From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:24:46 -0400 -Subject: [PATCH 2/3] poor man's solid picture support for r100 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index b6cc9e4..451a625 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) { - if (R100TexFormats[i].fmt == pPict->format) - break; -@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r100 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - PixmapPtr pMask, - PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch, colorpitch; - uint32_t pp_cntl, blendcntl, cblend, ablend; - int pixel_shift; -@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - - CHECK_OFFSET(pDst, 0x0f, "destination"); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/testing/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/testing/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch deleted file mode 100644 index 0a448fc93..000000000 --- a/testing/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch +++ /dev/null @@ -1,179 +0,0 @@ -From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:28:10 -0400 -Subject: [PATCH 3/3] poor man's solid picture support for r200 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index 451a625..7f1a3ff 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++) - { - if (R200TexFormats[i].fmt == pPict->format) -@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - - txoffset = 0; -@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r200 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch; - int pixel_shift; -@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD deleted file mode 100644 index 227d20f02..000000000 --- a/testing/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 159990 2012-05-27 13:11:18Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.99 -_gitdate=20120517 -pkgrel=1.${_gitdate} # UMS/EXA: Add reminder for potential solid picture performance issue. -pkgdesc="X.org ati video driver" -arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri') -makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz - git_fixes.diff - 0000-poor-man-s-solid-picture-support-for-r300-r600.patch - 0001-poor-man-s-solid-picture-support-for-evergreen.patch - 0002-poor-man-s-solid-picture-support-for-r100.patch - 0003-poor-man-s-solid-picture-support-for-r200.patch) -sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92' - '8b774e2f0310075cff2b7d874b0bed38d6245769' - '787f88c428f56ca6e96ba5eaf043a30bddfd0e23' - '69359a6623fe0f2214790c8ad40cac1a680a3825' - 'c0709ab82728e34838a8aeead7d1b79b7faf09bd' - '77a519e250c27a9fb94eeb52da655eed7c5f2eca') -sha1sums=('80c12b88e193354af204b13689b2fae922922c6c' - '8b774e2f0310075cff2b7d874b0bed38d6245769' - '787f88c428f56ca6e96ba5eaf043a30bddfd0e23' - '69359a6623fe0f2214790c8ad40cac1a680a3825' - 'c0709ab82728e34838a8aeead7d1b79b7faf09bd' - '77a519e250c27a9fb94eeb52da655eed7c5f2eca') - -build() { - #cd ${srcdir}/${pkgname}-${pkgver} - cd ${srcdir}/${pkgname}* - #patch -Np1 -i ${srcdir}/git_fixes.diff - - # fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266 - # and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html -# patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch -# patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch -# patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch -# patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch - - ./autogen.sh --prefix=/usr --enable-dri -# ./configure --prefix=/usr --enable-dri - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-ati/git_fixes.diff b/testing/xf86-video-ati/git_fixes.diff deleted file mode 100644 index 0c4518319..000000000 --- a/testing/xf86-video-ati/git_fixes.diff +++ /dev/null @@ -1,33 +0,0 @@ -From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001 -From: Jerome Glisse <jglisse@redhat.com> -Date: Wed, 04 Apr 2012 21:08:30 +0000 -Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64 - -Due to some old kernel issue, height is 8 aligned insided the ddx -For buffer with height btw 57 & 63 this lead ddx to believe it can -allocate a 2D tiled surface while mesa will not align height and -will assume 1D tiled leading to disagreement and rendering issue. -This patch force buffer with height < 64 to be 1D tiled. - -Signed-off-by: Jerome Glisse <jglisse@redhat.com> ---- -diff --git a/src/radeon_exa.c b/src/radeon_exa.c -index 99a5806..270dad4 100644 ---- a/src/radeon_exa.c -+++ b/src/radeon_exa.c -@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - surface.last_level = 0; - surface.bpe = cpp; - surface.nsamples = 1; -+ if (height < 64) { -+ /* disable 2d tiling for small surface to work around -+ * the fact that ddx align height to 8 pixel for old -+ * obscure reason i can't remember -+ */ -+ tiling &= ~RADEON_TILING_MACRO; -+ } - surface.flags = RADEON_SURF_SCANOUT; - surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE); - surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE); --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD deleted file mode 100644 index eab794d2a..000000000 --- a/testing/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 160420 2012-06-01 20:06:14Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.19.0 -pkgrel=3 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') -makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD deleted file mode 100644 index a743708b2..000000000 --- a/testing/xf86-video-nouveau/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159994 2012-05-27 13:11:24Z dreisner $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=xf86-video-nouveau -_gitdate=20120512 -pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=2 -pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm-nouveau' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'libdrm-new' 'xf86driproto') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('3e27e283219936d64c194eca24cd81cd') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-${_gitdate} - pushd /tmp/$pkgname-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 - popd -} - -build() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr - make -} - -package() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - make DESTDIR=$pkgdir install -} diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install deleted file mode 100644 index 027154ff3..000000000 --- a/testing/xf86-video-nouveau/xf86-video-nouveau.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { - cat << _EOF - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/testing/xfconf/PKGBUILD b/testing/xfconf/PKGBUILD deleted file mode 100644 index e62b62a80..000000000 --- a/testing/xfconf/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 159945 2012-05-27 07:44:52Z bluewind $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfconf -pkgver=4.10.0 -pkgrel=2 -pkgdesc="A simple client-server configuration storage and query system" -arch=('i686' 'x86_64') -url="http://www.xfce.org/" -license=('GPL2') -groups=('xfce4') -# http://www.xfce.org/documentation/requirements -# keep dbus, see also http://bugs.archlinux.org/task/14536 -depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') -options=('!libtool' '!emptydirs') -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --with-perl-options=INSTALLDIRS="vendor" \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # remove unneeded dynloader bootstrap file - rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs" - - # fix insecure rpath, http://bugs.archlinux.org/task/19980 - chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/testing/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff deleted file mode 100644 index 12c110151..000000000 --- a/testing/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff +++ /dev/null @@ -1,116 +0,0 @@ ---- xorg-server-1.12.1/exa/exa_glyphs.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_glyphs.c.new 2012-04-15 11:48:51.683214230 +0200 -@@ -686,6 +686,7 @@ - PixmapPtr pMaskPixmap = 0; - PicturePtr pMask = NULL; - ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ ExaScreenPriv(pScreen); - int width = 0, height = 0; - int x, y; - int first_xOff = list->xOff, first_yOff = list->yOff; -@@ -697,7 +698,6 @@ - ExaGlyphBuffer buffer; - - if (maskFormat) { -- ExaScreenPriv(pScreen); - GCPtr pGC; - xRectangle rect; - -@@ -719,22 +719,20 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - component_alpha = NeedsComponent(maskFormat->format); - pMask = CreatePicture(0, &pMaskPixmap->drawable, - maskFormat, CPComponentAlpha, &component_alpha, - serverClient, &error); -- if (!pMask || -- (!component_alpha && pExaScr->info->CheckComposite && -- !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))) -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; -+ -+ if (!component_alpha && pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)) - { - PictFormatPtr argbFormat; - -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- -- if (!pMask) -- return; -- - /* The driver can't seem to composite to a8, let's try argb (but - * without component-alpha) */ - FreePicture((pointer) pMask, (XID) 0); -@@ -748,15 +746,25 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - - pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, - serverClient, &error); -- if (!pMask) { -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- return; -- } -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; - } -+ -+ if (pExaScr->info->CheckComposite && -+ (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) || -+ (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) { -+ FreePicture ((pointer) pMask, (XID) 0); -+ goto fallback; -+ } -+ - pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen); - ValidateGC(&pMaskPixmap->drawable, pGC); - rect.x = 0; -@@ -769,6 +777,13 @@ - y = -extents.y1; - } - else { -+ if (pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst))) -+ goto fallback; -+ - x = 0; - y = 0; - } -@@ -834,6 +849,10 @@ - xSrc + x - first_xOff, - ySrc + y - first_yOff, 0, 0, x, y, width, height); - FreePicture((pointer) pMask, (XID) 0); -- (*pScreen->DestroyPixmap) (pMaskPixmap); - } -+ -+ return; -+ -+fallback: -+ ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); - } ---- xorg-server-1.12.1/exa/exa_render.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_render.c.new 2012-04-15 11:50:35.272482047 +0200 -@@ -878,7 +878,7 @@ - Bool saveMaskRepeat = pMask ? pMask->repeat : 0; - RegionRec region; - -- if (pExaScr->swappedOut) -+ if (pExaScr->fallback_counter || pExaScr->swappedOut) - goto fallback; - - /* Remove repeat in source if useless */ diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index 7914ec2cd..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,200 +0,0 @@ -# $Id: PKGBUILD 160206 2012-05-30 19:33:12Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.2 -pkgrel=1 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff - #git-fixes.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha256sums=('ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # fix glitches and crashes with EXA and cairo 1.12 - # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266 - # and reworked for 1.12.1 changes -# patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff - - # Add post-release patches from 1.12 branch -# patch -Np1 -i ${srcdir}/git-fixes.patch - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - conflicts=('nvidia-utils<=290.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/testing/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch deleted file mode 100644 index f6ca2426b..000000000 --- a/testing/xorg-server/git-fixes.patch +++ /dev/null @@ -1,1717 +0,0 @@ -From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Wed, 11 Apr 2012 16:28:21 +0000 -Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly - -Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the -function definition for xf86VidModeNotifyEvent had an extra ');' -before the prototype argument declarations. This was harmless for the -compiler as the code never gets used, but completely messed up the -file re-indentation. This patch removes the spurious characters in -preparation for re-indenting the file. - -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4) ---- -diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c -index 6e2a8e9..9f64f8e 100644 ---- a/hw/xfree86/dixmods/extmod/xf86vmode.c -+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c -@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; - #ifdef XF86VIDMODE_EVENTS - static int XF86VidModeEventBase = 0; - --static void SXF86VidModeNotifyEvent(); -+static void SXF86VidModeNotifyEvent( - xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ - ); - --- -cgit v0.9.0.2-2-gbebe -From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Wed, 11 Apr 2012 16:33:54 +0000 -Subject: hw/xfree86: Re-indent xf86vmode.c - -This is the result of re-running the 'x-indent.sh' script over -xf86vmode.c to clean up the disaster caused by broken syntax in the -file. - -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc) ---- -diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c -index 9f64f8e..68c4b58 100644 ---- a/hw/xfree86/dixmods/extmod/xf86vmode.c -+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c -@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; - #ifdef XF86VIDMODE_EVENTS - static int XF86VidModeEventBase = 0; - --static void SXF86VidModeNotifyEvent( --xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ -+static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ - ); - - static RESTYPE EventType; /* resource type for event masks */ -@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec; - #define DEBUG_P(x) /**/ - #endif - static int -- ClientMajorVersion(ClientPtr client) { -+ClientMajorVersion(ClientPtr client) -+{ - VidModePrivPtr pPriv; - -- pPriv = VM_GETPRIV(client); -+ pPriv = VM_GETPRIV(client); - if (!pPriv) -- return 0; -+ return 0; - else -- return pPriv->major; -+ return pPriv->major; - } -+ - #ifdef XF86VIDMODE_EVENTS - static void -- CheckScreenPrivate(pScreen) -+CheckScreenPrivate(pScreen) - ScreenPtr -- pScreen; -+ pScreen; - { - SetupScreen(pScreen); - -@@ -142,9 +143,10 @@ ScreenPtr - } - } - --static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen) -+static XF86VidModeScreenPrivatePtr -+MakeScreenPrivate(pScreen) - ScreenPtr -- pScreen; -+ pScreen; - { - SetupScreen(pScreen); - -@@ -160,18 +162,22 @@ ScreenPtr - } - - static unsigned long -- getEventMask(ScreenPtr pScreen, ClientPtr client) { -+getEventMask(ScreenPtr pScreen, ClientPtr client) -+{ - SetupScreen(pScreen); - XF86VidModeEventPtr pEv; - - if (!pPriv) -- return 0; -+ return 0; - for (pEv = pPriv->events; pEv; pEv = pEv->next) - if (pEv->client == client) - return pEv->mask; -- return 0; --} static Bool -- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) { -+ return 0; -+} -+ -+static Bool -+setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) -+{ - SetupScreen(pScreen); - XF86VidModeEventPtr pEv, *pPrev; - -@@ -181,7 +187,8 @@ static unsigned long - pPriv = MakeScreenPrivate(pScreen); - if (!pPriv) - return FALSE; -- } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) -+ } -+ for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) - if (pEv->client == client) - break; - if (mask == 0) { -@@ -208,38 +215,43 @@ static unsigned long - } - - static int -- XF86VidModeFreeEvents(pointer value, XID id) { -+XF86VidModeFreeEvents(pointer value, XID id) -+{ - XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value; - ScreenPtr pScreen = pOld->screen; -- SetupScreen(pScreen); -+ -+ SetupScreen(pScreen); - XF86VidModeEventPtr pEv, *pPrev; - - if (!pPriv) -- return TRUE; -+ return TRUE; - for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) - if (pEv == pOld) - break; - if (!pEv) -- return TRUE; -+ return TRUE; - *pPrev = pEv->next; -- free(pEv); -- CheckScreenPrivate(pScreen); -- return TRUE; --} static void -- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) { -+ free(pEv); -+ CheckScreenPrivate(pScreen); -+ return TRUE; -+} -+ -+static void -+SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) -+{ - XF86VidModeScreenPrivatePtr pPriv; - XF86VidModeEventPtr pEv; - unsigned long mask; - xXF86VidModeNotifyEvent ev; - int kind; - -- UpdateCurrentTimeIf(); -- mask = XF86VidModeNotifyMask; -- pScreen = screenInfo.screens[pScreen->myNum]; -- pPriv = GetScreenPrivate(pScreen); -+ UpdateCurrentTimeIf(); -+ mask = XF86VidModeNotifyMask; -+ pScreen = screenInfo.screens[pScreen->myNum]; -+ pPriv = GetScreenPrivate(pScreen); - if (!pPriv) -- return; -- kind = XF86VidModeModeChange; -+ return; -+ kind = XF86VidModeModeChange; - for (pEv = pPriv->events; pEv; pEv = pEv->next) { - if (!(pEv->mask & mask)) - continue; -@@ -251,8 +263,10 @@ static int - ev.forced = forced; - WriteEventsToClient(pEv->client, 1, (xEvent *) &ev); - }} static void -- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, -- xXF86VidModeNotifyEvent * to) { -+ -+SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, -+ xXF86VidModeNotifyEvent * to) -+{ - to->type = from->type; - to->state = from->state; - cpswaps(from->sequenceNumber, to->sequenceNumber); -@@ -264,29 +278,31 @@ static int - #endif - - static int -- ProcXF86VidModeQueryVersion(ClientPtr client) { -+ProcXF86VidModeQueryVersion(ClientPtr client) -+{ - xXF86VidModeQueryVersionReply rep; - -- DEBUG_P("XF86VidModeQueryVersion"); -+ DEBUG_P("XF86VidModeQueryVersion"); - -- REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; -- rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; -+ REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; -+ rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swaps(&rep.majorVersion); - swaps(&rep.minorVersion); -- } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep); - return Success; - } - - static int -- ProcXF86VidModeGetModeLine(ClientPtr client) { -+ProcXF86VidModeGetModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetModeLineReq); - xXF86VidModeGetModeLineReply rep; - xXF86OldVidModeGetModeLineReply oldrep; -@@ -294,11 +310,11 @@ static int - int dotClock; - int ver; - -- DEBUG_P("XF86VidModeGetModeline"); -+ DEBUG_P("XF86VidModeGetModeline"); - -- ver = ClientMajorVersion(client); -- REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); -- rep.type = X_Reply; -+ ver = ClientMajorVersion(client); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); -+ rep.type = X_Reply; - if (ver < 2) { - rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) - - SIZEOF(xGenericReply)); -@@ -386,7 +402,8 @@ static int - } - - static int -- ProcXF86VidModeGetAllModeLines(ClientPtr client) { -+ProcXF86VidModeGetAllModeLines(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetAllModeLinesReq); - xXF86VidModeGetAllModeLinesReply rep; - xXF86VidModeModeInfo mdinf; -@@ -395,38 +412,39 @@ static int - int modecount, dotClock; - int ver; - -- DEBUG_P("XF86VidModeGetAllModelines"); -+ DEBUG_P("XF86VidModeGetAllModelines"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - -- modecount = VidModeGetNumOfModes(stuff->screen); -+ modecount = VidModeGetNumOfModes(stuff->screen); - if (modecount < 1) -- return VidModeErrorBase + XF86VidModeExtensionDisabled; -+ return VidModeErrorBase + XF86VidModeExtensionDisabled; - - if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - -+ rep.type = X_Reply; -+ rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - - SIZEOF(xGenericReply); - if (ver < 2) -- rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); -+ rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); - else -- rep.length += modecount * sizeof(xXF86VidModeModeInfo); -- rep.length >>= 2; -- rep.sequenceNumber = client->sequence; -- rep.modecount = modecount; -+ rep.length += modecount * sizeof(xXF86VidModeModeInfo); -+ rep.length >>= 2; -+ rep.sequenceNumber = client->sequence; -+ rep.modecount = modecount; - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.modecount); -- } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), -+ (char *) &rep); - - do { - mdinf.dotclock = dotClock; -@@ -492,7 +510,8 @@ static int - && VidModeGetModeValue(mode, VIDMODE_FLAGS) == stuff->flags ) - - static int -- ProcXF86VidModeAddModeLine(ClientPtr client) { -+ProcXF86VidModeAddModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeAddModeLineReq); - xXF86OldVidModeAddModeLineReq *oldstuff = - (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; -@@ -502,9 +521,9 @@ static int - int dotClock; - int ver; - -- DEBUG_P("XF86VidModeAddModeline"); -+ DEBUG_P("XF86VidModeAddModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -533,7 +552,8 @@ static int - stuff->after_vsyncend = oldstuff->after_vsyncend; - stuff->after_vtotal = oldstuff->after_vtotal; - stuff->after_flags = oldstuff->after_flags; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("AddModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -654,7 +674,8 @@ static int - } - - static int -- ProcXF86VidModeDeleteModeLine(ClientPtr client) { -+ProcXF86VidModeDeleteModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeDeleteModeLineReq); - xXF86OldVidModeDeleteModeLineReq *oldstuff = - (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; -@@ -663,9 +684,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeDeleteModeline"); -+ DEBUG_P("XF86VidModeDeleteModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -683,7 +704,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("DeleteModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -777,7 +799,8 @@ static int - } - - static int -- ProcXF86VidModeModModeLine(ClientPtr client) { -+ProcXF86VidModeModModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeModModeLineReq); - xXF86OldVidModeModModeLineReq *oldstuff = - (xXF86OldVidModeModModeLineReq *) client->requestBuffer; -@@ -786,9 +809,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeModModeline"); -+ DEBUG_P("XF86VidModeModModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -805,7 +828,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n", - (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart, - stuff->hsyncend, stuff->htotal); -@@ -903,7 +927,8 @@ static int - } - - static int -- ProcXF86VidModeValidateModeLine(ClientPtr client) { -+ProcXF86VidModeValidateModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeValidateModeLineReq); - xXF86OldVidModeValidateModeLineReq *oldstuff = - (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; -@@ -913,9 +938,9 @@ static int - int len, status, dotClock; - int ver; - -- DEBUG_P("XF86VidModeValidateModeline"); -+ DEBUG_P("XF86VidModeValidateModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -933,7 +958,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("ValidateModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -1022,7 +1048,8 @@ static int - } - - static int -- ProcXF86VidModeSwitchMode(ClientPtr client) { -+ProcXF86VidModeSwitchMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchModeReq); - - DEBUG_P("XF86VidModeSwitchMode"); -@@ -1035,8 +1062,11 @@ static int - VidModeZoomViewport(stuff->screen, (short) stuff->zoom); - - return Success; --} static int -- ProcXF86VidModeSwitchToMode(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeSwitchToMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchToModeReq); - xXF86OldVidModeSwitchToModeReq *oldstuff = - (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer; -@@ -1045,9 +1075,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeSwitchToMode"); -+ DEBUG_P("XF86VidModeSwitchToMode"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -1065,7 +1095,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("SwitchToMode - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -1138,7 +1169,8 @@ static int - } - - static int -- ProcXF86VidModeLockModeSwitch(ClientPtr client) { -+ProcXF86VidModeLockModeSwitch(ClientPtr client) -+{ - REQUEST(xXF86VidModeLockModeSwitchReq); - - REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); -@@ -1152,53 +1184,57 @@ static int - return VidModeErrorBase + XF86VidModeZoomLocked; - - return Success; --} static int -- ProcXF86VidModeGetMonitor(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetMonitor(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetMonitorReq); - xXF86VidModeGetMonitorReply rep; - CARD32 *hsyncdata, *vsyncdata; - int i, nHsync, nVrefresh; - pointer monitor; - -- DEBUG_P("XF86VidModeGetMonitor"); -+ DEBUG_P("XF86VidModeGetMonitor"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (!VidModeGetMonitor(stuff->screen, &monitor)) -- return BadValue; -+ return BadValue; - -- nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; -- nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; -+ nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; -+ nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; - -- rep.type = X_Reply; -+ rep.type = X_Reply; - if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr) -- rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_VENDOR, -- 0)).ptr); -+ rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, -+ VIDMODE_MON_VENDOR, -+ 0)).ptr); - else -- rep.vendorLength = 0; -+ rep.vendorLength = 0; - if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr) -- rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_MODEL, -- 0)).ptr); -+ rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, -+ VIDMODE_MON_MODEL, -+ 0)).ptr); - else -- rep.modelLength = 0; -- rep.length = -+ rep.modelLength = 0; -+ rep.length = - bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) - - SIZEOF(xGenericReply) + (nHsync + - nVrefresh) * sizeof(CARD32) + - pad_to_int32(rep.vendorLength) + - pad_to_int32(rep.modelLength)); -- rep.sequenceNumber = client->sequence; -- rep.nhsync = nHsync; -- rep.nvsync = nVrefresh; -- hsyncdata = malloc(nHsync * sizeof(CARD32)); -+ rep.sequenceNumber = client->sequence; -+ rep.nhsync = nHsync; -+ rep.nvsync = nVrefresh; -+ hsyncdata = malloc(nHsync * sizeof(CARD32)); - if (!hsyncdata) { - return BadAlloc; -- } vsyncdata = malloc(nVrefresh * sizeof(CARD32)); -+ } -+ vsyncdata = malloc(nVrefresh * sizeof(CARD32)); - - if (!vsyncdata) { - free(hsyncdata); -@@ -1208,19 +1244,18 @@ static int - for (i = 0; i < nHsync; i++) { - hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, - VIDMODE_MON_HSYNC_LO, -- i)). -- f | (unsigned -- short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, -- i)).f << 16; -+ i)).f | -+ (unsigned -+ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, -+ i)).f << 16; - } - for (i = 0; i < nVrefresh; i++) { - vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, - VIDMODE_MON_VREFRESH_LO, -- i)). -- f | (unsigned -- short) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_VREFRESH_HI, -- i)).f << 16; -+ i)).f | -+ (unsigned -+ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI, -+ i)).f << 16; - } - - if (client->swapped) { -@@ -1249,38 +1284,40 @@ static int - } - - static int -- ProcXF86VidModeGetViewPort(ClientPtr client) { -+ProcXF86VidModeGetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetViewPortReq); - xXF86VidModeGetViewPortReply rep; - int x, y; - -- DEBUG_P("XF86VidModeGetViewPort"); -+ DEBUG_P("XF86VidModeGetViewPort"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; - -- VidModeGetViewPort(stuff->screen, &x, &y); -- rep.x = x; -- rep.y = y; -+ VidModeGetViewPort(stuff->screen, &x, &y); -+ rep.x = x; -+ rep.y = y; - - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.x); - swapl(&rep.y); -- } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), -- (char *) &rep); -+ } -+ WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep); - return Success; - } - - static int -- ProcXF86VidModeSetViewPort(ClientPtr client) { -+ProcXF86VidModeSetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetViewPortReq); - - DEBUG_P("XF86VidModeSetViewPort"); -@@ -1294,8 +1331,11 @@ static int - return BadValue; - - return Success; --} static int -- ProcXF86VidModeGetDotClocks(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetDotClocks(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetDotClocksReq); - xXF86VidModeGetDotClocksReply rep; - int n; -@@ -1304,31 +1344,33 @@ static int - int *Clocks = NULL; - Bool ClockProg; - -- DEBUG_P("XF86VidModeGetDotClocks"); -+ DEBUG_P("XF86VidModeGetDotClocks"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); -+ numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); - -- rep.type = X_Reply; -- rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) -- - SIZEOF(xGenericReply) + numClocks); -- rep.sequenceNumber = client->sequence; -- rep.clocks = numClocks; -- rep.maxclocks = MAXCLOCKS; -- rep.flags = 0; -+ rep.type = X_Reply; -+ rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) -+ - SIZEOF(xGenericReply) + numClocks); -+ rep.sequenceNumber = client->sequence; -+ rep.clocks = numClocks; -+ rep.maxclocks = MAXCLOCKS; -+ rep.flags = 0; - - if (!ClockProg) { - Clocks = malloc(numClocks * sizeof(int)); - if (!Clocks) -- return BadValue; -+ return BadValue; - if (!VidModeGetClocks(stuff->screen, Clocks)) { - free(Clocks); - return BadValue; -- }} if (ClockProg) { -+ } -+ } -+ if (ClockProg) { - rep.flags |= CLKFLAG_PROGRAMABLE; - } - if (client->swapped) { -@@ -1356,7 +1398,8 @@ static int - } - - static int -- ProcXF86VidModeSetGamma(ClientPtr client) { -+ProcXF86VidModeSetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetGammaReq); - - DEBUG_P("XF86VidModeSetGamma"); -@@ -1372,79 +1415,89 @@ static int - return BadValue; - - return Success; --} static int -- ProcXF86VidModeGetGamma(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaReq); - xXF86VidModeGetGammaReply rep; - float red, green, blue; - -- DEBUG_P("XF86VidModeGetGamma"); -+ DEBUG_P("XF86VidModeGetGamma"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; - if (!VidModeGetGamma(stuff->screen, &red, &green, &blue)) -- return BadValue; -- rep.red = (CARD32) (red * 10000.); -- rep.green = (CARD32) (green * 10000.); -- rep.blue = (CARD32) (blue * 10000.); -+ return BadValue; -+ rep.red = (CARD32) (red * 10000.); -+ rep.green = (CARD32) (green * 10000.); -+ rep.blue = (CARD32) (blue * 10000.); - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.red); - swapl(&rep.green); - swapl(&rep.blue); -- } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); - - return Success; - } - - static int -- ProcXF86VidModeSetGammaRamp(ClientPtr client) { -+ProcXF86VidModeSetGammaRamp(ClientPtr client) -+{ - CARD16 *r, *g, *b; - int length; -- REQUEST(xXF86VidModeSetGammaRampReq); -+ -+ REQUEST(xXF86VidModeSetGammaRampReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) -- return BadValue; -+ return BadValue; - -- length = (stuff->size + 1) & ~1; -+ length = (stuff->size + 1) & ~1; - -- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); -+ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); - -- r = (CARD16 *) &stuff[1]; -- g = r + length; -- b = g + length; -+ r = (CARD16 *) &stuff[1]; -+ g = r + length; -+ b = g + length; - - if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b)) -- return BadValue; -+ return BadValue; - -- return Success; --} static int -- ProcXF86VidModeGetGammaRamp(ClientPtr client) { -+ return Success; -+} -+ -+static int -+ProcXF86VidModeGetGammaRamp(ClientPtr client) -+{ - CARD16 *ramp = NULL; - int length; - size_t ramplen = 0; - xXF86VidModeGetGammaRampReply rep; -- REQUEST(xXF86VidModeGetGammaRampReq); -+ -+ REQUEST(xXF86VidModeGetGammaRampReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); - -- length = (stuff->size + 1) & ~1; -+ length = (stuff->size + 1) & ~1; - - if (stuff->size) { - ramplen = length * 3 * sizeof(CARD16); -@@ -1455,7 +1508,9 @@ static int - ramp, ramp + length, ramp + (length * 2))) { - free(ramp); - return BadValue; -- }} rep.type = X_Reply; -+ } -+ } -+ rep.type = X_Reply; - rep.length = (length >> 1) * 3; - rep.sequenceNumber = client->sequence; - rep.size = stuff->size; -@@ -1476,47 +1531,53 @@ static int - } - - static int -- ProcXF86VidModeGetGammaRampSize(ClientPtr client) { -+ProcXF86VidModeGetGammaRampSize(ClientPtr client) -+{ - xXF86VidModeGetGammaRampSizeReply rep; -- REQUEST(xXF86VidModeGetGammaRampSizeReq); -+ -+ REQUEST(xXF86VidModeGetGammaRampSizeReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.size = VidModeGetGammaRampSize(stuff->screen); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.size = VidModeGetGammaRampSize(stuff->screen); - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swaps(&rep.size); -- } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), -+ (char *) &rep); - - return Success; - } - - static int -- ProcXF86VidModeGetPermissions(ClientPtr client) { -+ProcXF86VidModeGetPermissions(ClientPtr client) -+{ - xXF86VidModeGetPermissionsReply rep; -- REQUEST(xXF86VidModeGetPermissionsReq); -+ -+ REQUEST(xXF86VidModeGetPermissionsReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.permissions = XF86VM_READ_PERMISSION; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.permissions = XF86VM_READ_PERMISSION; - if (xf86GetVidModeEnabled() && - (xf86GetVidModeAllowNonLocal() || LocalClient(client))) { - rep.permissions |= XF86VM_WRITE_PERMISSION; -- } if (client->swapped) { -+ } -+ if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.permissions); -@@ -1528,21 +1589,23 @@ static int - } - - static int -- ProcXF86VidModeSetClientVersion(ClientPtr client) { -+ProcXF86VidModeSetClientVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetClientVersionReq); - - VidModePrivPtr pPriv; - -- DEBUG_P("XF86VidModeSetClientVersion"); -+ DEBUG_P("XF86VidModeSetClientVersion"); - -- REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); - - if ((pPriv = VM_GETPRIV(client)) == NULL) { - pPriv = malloc(sizeof(VidModePrivRec)); - if (!pPriv) - return BadAlloc; - VM_SETPRIV(client, pPriv); -- } pPriv->major = stuff->major; -+ } -+ pPriv->major = stuff->major; - - pPriv->minor = stuff->minor; - -@@ -1550,85 +1613,103 @@ static int - } - - static int -- ProcXF86VidModeDispatch(ClientPtr client) { -+ProcXF86VidModeDispatch(ClientPtr client) -+{ - REQUEST(xReq); - switch (stuff->data) { - case X_XF86VidModeQueryVersion: - return ProcXF86VidModeQueryVersion(client); -- case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client); -- case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client); -- case X_XF86VidModeGetAllModeLines:return -- ProcXF86VidModeGetAllModeLines(client); -- case X_XF86VidModeValidateModeLine:return -- ProcXF86VidModeValidateModeLine(client); -- case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client); -- case X_XF86VidModeGetDotClocks:return -- ProcXF86VidModeGetDotClocks(client); -- case X_XF86VidModeSetClientVersion:return -- ProcXF86VidModeSetClientVersion(client); -- case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client); -- case X_XF86VidModeGetGammaRamp:return -- ProcXF86VidModeGetGammaRamp(client); -- case X_XF86VidModeGetGammaRampSize:return -- ProcXF86VidModeGetGammaRampSize(client); -- case X_XF86VidModeGetPermissions:return -- ProcXF86VidModeGetPermissions(client); -- default:if (!xf86GetVidModeEnabled()) -+ case X_XF86VidModeGetModeLine: -+ return ProcXF86VidModeGetModeLine(client); -+ case X_XF86VidModeGetMonitor: -+ return ProcXF86VidModeGetMonitor(client); -+ case X_XF86VidModeGetAllModeLines: -+ return ProcXF86VidModeGetAllModeLines(client); -+ case X_XF86VidModeValidateModeLine: -+ return ProcXF86VidModeValidateModeLine(client); -+ case X_XF86VidModeGetViewPort: -+ return ProcXF86VidModeGetViewPort(client); -+ case X_XF86VidModeGetDotClocks: -+ return ProcXF86VidModeGetDotClocks(client); -+ case X_XF86VidModeSetClientVersion: -+ return ProcXF86VidModeSetClientVersion(client); -+ case X_XF86VidModeGetGamma: -+ return ProcXF86VidModeGetGamma(client); -+ case X_XF86VidModeGetGammaRamp: -+ return ProcXF86VidModeGetGammaRamp(client); -+ case X_XF86VidModeGetGammaRampSize: -+ return ProcXF86VidModeGetGammaRampSize(client); -+ case X_XF86VidModeGetPermissions: -+ return ProcXF86VidModeGetPermissions(client); -+ default: -+ if (!xf86GetVidModeEnabled()) - return VidModeErrorBase + XF86VidModeExtensionDisabled; - if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { - switch (stuff->data) { - case X_XF86VidModeAddModeLine: - return ProcXF86VidModeAddModeLine(client); -- case X_XF86VidModeDeleteModeLine:return -- ProcXF86VidModeDeleteModeLine(client); -- case X_XF86VidModeModModeLine:return -- ProcXF86VidModeModModeLine(client); -- case X_XF86VidModeSwitchMode:return -- ProcXF86VidModeSwitchMode(client); -- case X_XF86VidModeSwitchToMode:return -- ProcXF86VidModeSwitchToMode(client); -- case X_XF86VidModeLockModeSwitch:return -- ProcXF86VidModeLockModeSwitch(client); -- case X_XF86VidModeSetViewPort:return -- ProcXF86VidModeSetViewPort(client); -- case X_XF86VidModeSetGamma:return -- ProcXF86VidModeSetGamma(client); -- case X_XF86VidModeSetGammaRamp:return -- ProcXF86VidModeSetGammaRamp(client); -- default:return BadRequest; -- }} -+ case X_XF86VidModeDeleteModeLine: -+ return ProcXF86VidModeDeleteModeLine(client); -+ case X_XF86VidModeModModeLine: -+ return ProcXF86VidModeModModeLine(client); -+ case X_XF86VidModeSwitchMode: -+ return ProcXF86VidModeSwitchMode(client); -+ case X_XF86VidModeSwitchToMode: -+ return ProcXF86VidModeSwitchToMode(client); -+ case X_XF86VidModeLockModeSwitch: -+ return ProcXF86VidModeLockModeSwitch(client); -+ case X_XF86VidModeSetViewPort: -+ return ProcXF86VidModeSetViewPort(client); -+ case X_XF86VidModeSetGamma: -+ return ProcXF86VidModeSetGamma(client); -+ case X_XF86VidModeSetGammaRamp: -+ return ProcXF86VidModeSetGammaRamp(client); -+ default: -+ return BadRequest; -+ } -+ } - else -- return VidModeErrorBase + XF86VidModeClientNotLocal; -+ return VidModeErrorBase + XF86VidModeClientNotLocal; - } - } - - static int -- SProcXF86VidModeQueryVersion(ClientPtr client) { -+SProcXF86VidModeQueryVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeQueryVersionReq); - swaps(&stuff->length); - return ProcXF86VidModeQueryVersion(client); --} static int -- SProcXF86VidModeGetModeLine(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetModeLineReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetModeLine(client); --} static int -- SProcXF86VidModeGetAllModeLines(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetAllModeLines(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetAllModeLinesReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetAllModeLines(client); --} static int -- SProcXF86VidModeAddModeLine(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeAddModeLine(ClientPtr client) -+{ - xXF86OldVidModeAddModeLineReq *oldstuff = - (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeAddModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeAddModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq); -@@ -1666,13 +1747,14 @@ static int - } - - static int -- SProcXF86VidModeDeleteModeLine(ClientPtr client) { -+SProcXF86VidModeDeleteModeLine(ClientPtr client) -+{ - xXF86OldVidModeDeleteModeLineReq *oldstuff = - (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeDeleteModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeDeleteModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq); -@@ -1710,13 +1792,14 @@ static int - } - - static int -- SProcXF86VidModeModModeLine(ClientPtr client) { -+SProcXF86VidModeModModeLine(ClientPtr client) -+{ - xXF86OldVidModeModModeLineReq *oldstuff = - (xXF86OldVidModeModModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeModModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeModModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq); -@@ -1754,13 +1837,14 @@ static int - } - - static int -- SProcXF86VidModeValidateModeLine(ClientPtr client) { -+SProcXF86VidModeValidateModeLine(ClientPtr client) -+{ - xXF86OldVidModeValidateModeLineReq *oldstuff = - (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeValidateModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeValidateModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq); -@@ -1798,44 +1882,60 @@ static int - } - - static int -- SProcXF86VidModeSwitchMode(ClientPtr client) { -+SProcXF86VidModeSwitchMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchModeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq); - swaps(&stuff->screen); - swaps(&stuff->zoom); - return ProcXF86VidModeSwitchMode(client); --} static int -- SProcXF86VidModeSwitchToMode(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSwitchToMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchToModeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq); - swapl(&stuff->screen); - return ProcXF86VidModeSwitchToMode(client); --} static int -- SProcXF86VidModeLockModeSwitch(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeLockModeSwitch(ClientPtr client) -+{ - REQUEST(xXF86VidModeLockModeSwitchReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); - swaps(&stuff->screen); - swaps(&stuff->lock); - return ProcXF86VidModeLockModeSwitch(client); --} static int -- SProcXF86VidModeGetMonitor(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetMonitor(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetMonitorReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetMonitor(client); --} static int -- SProcXF86VidModeGetViewPort(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetViewPortReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetViewPort(client); --} static int -- SProcXF86VidModeSetViewPort(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetViewPortReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq); -@@ -1843,23 +1943,32 @@ static int - swapl(&stuff->x); - swapl(&stuff->y); - return ProcXF86VidModeSetViewPort(client); --} static int -- SProcXF86VidModeGetDotClocks(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetDotClocks(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetDotClocksReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetDotClocks(client); --} static int -- SProcXF86VidModeSetClientVersion(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetClientVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetClientVersionReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); - swaps(&stuff->major); - swaps(&stuff->minor); - return ProcXF86VidModeSetClientVersion(client); --} static int -- SProcXF86VidModeSetGamma(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetGammaReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq); -@@ -1868,120 +1977,145 @@ static int - swapl(&stuff->green); - swapl(&stuff->blue); - return ProcXF86VidModeSetGamma(client); --} static int -- SProcXF86VidModeGetGamma(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetGamma(client); --} static int -- SProcXF86VidModeSetGammaRamp(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetGammaRamp(ClientPtr client) -+{ - int length; -- REQUEST(xXF86VidModeSetGammaRampReq); -- swaps(&stuff->length); -- REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); -- swaps(&stuff->size); -- swaps(&stuff->screen); -- length = ((stuff->size + 1) & ~1) * 6; -- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); -- SwapRestS(stuff); -- return ProcXF86VidModeSetGammaRamp(client); --} static int -- SProcXF86VidModeGetGammaRamp(ClientPtr client) { -+ -+ REQUEST(xXF86VidModeSetGammaRampReq); -+ swaps(&stuff->length); -+ REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); -+ swaps(&stuff->size); -+ swaps(&stuff->screen); -+ length = ((stuff->size + 1) & ~1) * 6; -+ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); -+ SwapRestS(stuff); -+ return ProcXF86VidModeSetGammaRamp(client); -+} -+ -+static int -+SProcXF86VidModeGetGammaRamp(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaRampReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); - swaps(&stuff->size); - swaps(&stuff->screen); - return ProcXF86VidModeGetGammaRamp(client); --} static int -- SProcXF86VidModeGetGammaRampSize(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetGammaRampSize(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaRampSizeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetGammaRampSize(client); --} static int -- SProcXF86VidModeGetPermissions(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetPermissions(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetPermissionsReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetPermissions(client); --} static int -- SProcXF86VidModeDispatch(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeDispatch(ClientPtr client) -+{ - REQUEST(xReq); - switch (stuff->data) { - case X_XF86VidModeQueryVersion: - return SProcXF86VidModeQueryVersion(client); -- case X_XF86VidModeGetModeLine:return -- SProcXF86VidModeGetModeLine(client); -- case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client); -- case X_XF86VidModeGetAllModeLines:return -- SProcXF86VidModeGetAllModeLines(client); -- case X_XF86VidModeGetViewPort:return -- SProcXF86VidModeGetViewPort(client); -- case X_XF86VidModeValidateModeLine:return -- SProcXF86VidModeValidateModeLine(client); -- case X_XF86VidModeGetDotClocks:return -- SProcXF86VidModeGetDotClocks(client); -- case X_XF86VidModeSetClientVersion:return -- SProcXF86VidModeSetClientVersion(client); -- case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client); -- case X_XF86VidModeGetGammaRamp:return -- SProcXF86VidModeGetGammaRamp(client); -- case X_XF86VidModeGetGammaRampSize:return -- SProcXF86VidModeGetGammaRampSize(client); -- case X_XF86VidModeGetPermissions:return -- SProcXF86VidModeGetPermissions(client); -- default:if (!xf86GetVidModeEnabled()) -+ case X_XF86VidModeGetModeLine: -+ return SProcXF86VidModeGetModeLine(client); -+ case X_XF86VidModeGetMonitor: -+ return SProcXF86VidModeGetMonitor(client); -+ case X_XF86VidModeGetAllModeLines: -+ return SProcXF86VidModeGetAllModeLines(client); -+ case X_XF86VidModeGetViewPort: -+ return SProcXF86VidModeGetViewPort(client); -+ case X_XF86VidModeValidateModeLine: -+ return SProcXF86VidModeValidateModeLine(client); -+ case X_XF86VidModeGetDotClocks: -+ return SProcXF86VidModeGetDotClocks(client); -+ case X_XF86VidModeSetClientVersion: -+ return SProcXF86VidModeSetClientVersion(client); -+ case X_XF86VidModeGetGamma: -+ return SProcXF86VidModeGetGamma(client); -+ case X_XF86VidModeGetGammaRamp: -+ return SProcXF86VidModeGetGammaRamp(client); -+ case X_XF86VidModeGetGammaRampSize: -+ return SProcXF86VidModeGetGammaRampSize(client); -+ case X_XF86VidModeGetPermissions: -+ return SProcXF86VidModeGetPermissions(client); -+ default: -+ if (!xf86GetVidModeEnabled()) - return VidModeErrorBase + XF86VidModeExtensionDisabled; - if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { - switch (stuff->data) { - case X_XF86VidModeAddModeLine: - return SProcXF86VidModeAddModeLine(client); -- case X_XF86VidModeDeleteModeLine:return -- SProcXF86VidModeDeleteModeLine(client); -- case X_XF86VidModeModModeLine:return -- SProcXF86VidModeModModeLine(client); -- case X_XF86VidModeSwitchMode:return -- SProcXF86VidModeSwitchMode(client); -- case X_XF86VidModeSwitchToMode:return -- SProcXF86VidModeSwitchToMode(client); -- case X_XF86VidModeLockModeSwitch:return -- SProcXF86VidModeLockModeSwitch(client); -- case X_XF86VidModeSetViewPort:return -- SProcXF86VidModeSetViewPort(client); -- case X_XF86VidModeSetGamma:return -- SProcXF86VidModeSetGamma(client); -- case X_XF86VidModeSetGammaRamp:return -- SProcXF86VidModeSetGammaRamp(client); -- default:return BadRequest; -- }} -+ case X_XF86VidModeDeleteModeLine: -+ return SProcXF86VidModeDeleteModeLine(client); -+ case X_XF86VidModeModModeLine: -+ return SProcXF86VidModeModModeLine(client); -+ case X_XF86VidModeSwitchMode: -+ return SProcXF86VidModeSwitchMode(client); -+ case X_XF86VidModeSwitchToMode: -+ return SProcXF86VidModeSwitchToMode(client); -+ case X_XF86VidModeLockModeSwitch: -+ return SProcXF86VidModeLockModeSwitch(client); -+ case X_XF86VidModeSetViewPort: -+ return SProcXF86VidModeSetViewPort(client); -+ case X_XF86VidModeSetGamma: -+ return SProcXF86VidModeSetGamma(client); -+ case X_XF86VidModeSetGammaRamp: -+ return SProcXF86VidModeSetGammaRamp(client); -+ default: -+ return BadRequest; -+ } -+ } - else -- return VidModeErrorBase + XF86VidModeClientNotLocal; -+ return VidModeErrorBase + XF86VidModeClientNotLocal; - } - } - - void -- XFree86VidModeExtensionInit(void) { -+XFree86VidModeExtensionInit(void) -+{ - ExtensionEntry *extEntry; - ScreenPtr pScreen; - int i; - Bool enabled = FALSE; - -- DEBUG_P("XFree86VidModeExtensionInit"); -+ DEBUG_P("XFree86VidModeExtensionInit"); - - if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0)) -- return; -+ return; - #ifdef XF86VIDMODE_EVENTS - if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) -- return; -+ return; - #endif - - #ifdef XF86VIDMODE_EVENTS -- EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); -+ EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); - #endif - - for (i = 0; i < screenInfo.numScreens; i++) { -@@ -1990,8 +2124,8 @@ void - enabled = TRUE; - } - /* This means that the DDX doesn't want the vidmode extension enabled */ -- if (!enabled) -- return; -+ if (!enabled) -+ return; - - if ( - #ifdef XF86VIDMODE_EVENTS --- -cgit v0.9.0.2-2-gbebe -From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001 -From: Daniel Kurtz <djkurtz@chromium.org> -Date: Thu, 12 Apr 2012 00:11:10 +0000 -Subject: dix: don't BUG_WARN for button events from button-only device - -Events from button-only devices still need coordinates, and they get them -from scale_to_desktop(). Therefore, a dev without valuators is not a bug. -However, a dev with valuators, but less than two of them still is a bug. - -This was noticed when unplugging a "Creative Technology SB Arena Headset", -which has some BTNs and some KEYs, but no REL or ABS valuators. -It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN. - -Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328) ---- -diff --git a/dix/getevents.c b/dix/getevents.c -index 4e0af45..9dc9617 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask, - ScreenPtr scr = miPointerGetScreen(dev); - double x, y; - -- BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2); -+ BUG_WARN(dev->valuator && dev->valuator->numAxes < 2); - if (!dev->valuator || dev->valuator->numAxes < 2) { - /* if we have no axes, last.valuators must be in screen coords - * anyway */ --- -cgit v0.9.0.2-2-gbebe -From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed, 18 Apr 2012 05:56:37 +0000 -Subject: dix: indentation fix - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05) ---- -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 9a2e22f..d971805 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -416,8 +416,8 @@ Dispatch(void) - if (XSERVER_REQUEST_START_ENABLED()) - XSERVER_REQUEST_START(LookupMajorName(client->majorOp), - client->majorOp, -- ((xReq *) client->requestBuffer)-> -- length, client->index, -+ ((xReq *) client->requestBuffer)->length, -+ client->index, - client->requestBuffer); - #endif - if (result > (maxBigRequestSize << 2)) --- -cgit v0.9.0.2-2-gbebe -From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001 -From: Michal Suchanek <hramrach@gmail.com> -Date: Thu, 26 Apr 2012 13:11:20 +0000 -Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN - -and fix resulting printf warning in dmxLogVisual - -Signed-off-by: Michal Suchanek <hramrach@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd) ---- -diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c -index b56bb93..151f672 100644 ---- a/hw/dmx/dmxlog.c -+++ b/hw/dmx/dmxlog.c -@@ -86,6 +86,8 @@ ErrorF(const char *format, ...) - - /** Provide an VFatalError function when used stand-alone. */ - static void -+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; -+static void - VFatalError(const char *format, va_list args) - { - vfprintf(stderr, format, args); /* RATS: We assume the format string -@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args) - } - #else - /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */ --extern void AbortServer(void); -+extern void AbortServer(void) _X_NORETURN; -+static void -+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; - static void - VFatalError(const char *format, va_list args) - { -@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput, - /* Prints the error message with the appropriate low-level X output - * routine. */ - static void -+dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0); -+static void - dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) - { - if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) { -@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) - class = "DirectColor"; - break; - } -+#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n" - - if (dmxScreen) { - dmxLogOutput(dmxScreen, -- "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", -+ VisualLogFormat, - vi->visualid, class, vi->depth, vi->bits_per_rgb, - vi->colormap_size, - vi->red_mask, vi->green_mask, vi->blue_mask, -@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) - } - else { - dmxLog(dmxInfo, -- " 0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", -+ " " VisualLogFormat, - vi->visualid, class, vi->depth, vi->bits_per_rgb, - vi->colormap_size, - vi->red_mask, vi->green_mask, vi->blue_mask, -diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h -index 4d4cd26..162484b 100644 ---- a/hw/dmx/dmxlog.h -+++ b/hw/dmx/dmxlog.h -@@ -55,18 +55,23 @@ typedef enum { - /* Logging functions used by Xserver/hw/dmx routines. */ - extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel); - extern dmxLogLevel dmxGetLogLevel(void); --extern void dmxLog(dmxLogLevel logLevel, const char *format, ...); --extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...); -+extern void dmxLog(dmxLogLevel logLevel, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogCont(dmxLogLevel logLevel, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern const char *dmxEventName(int type); - - #ifndef DMX_LOG_STANDALONE --extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...); -+extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format, -- ...); -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format, -- ...); --extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...); --extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...); -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv); - extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, - int defaultVisual); --- -cgit v0.9.0.2-2-gbebe -From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Thu, 10 May 2012 07:53:20 +0000 -Subject: Revert "dix: when disabling a device, release all buttons and keys" - -This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7. - -The commit being reverted triggered a segfault on server shutdown when a -device posts raw events after the root windows are forced to NULL. - -https://lists.debian.org/debian-x/2012/05/msg00240.html - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/dix/devices.c b/dix/devices.c -index d0e99bd..0125504 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent) - if (*prev != dev) - return FALSE; - -- ReleaseButtonsAndKeys(dev); -- - /* float attached devices */ - if (IsMaster(dev)) { - for (other = inputInfo.devices; other; other = other->next) { --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/~brendan/libunistring/PKGBUILD b/~brendan/libunistring/PKGBUILD deleted file mode 100644 index 634195741..000000000 --- a/~brendan/libunistring/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Former Arch maintainer: Emmanuel 'guinness' Boudreault -# Current Arch maintainer: Patrick McCarty <pnorcks at gmail dot com> -# Parabola maintainer: Brendan Tildesley <brendan.tildesley@gmail.com> - -pkgname=libunistring -pkgver=0.9.3 -pkgrel=1 -pkgdesc="GNU library for manipulating Unicode strings and C strings." -url="http://www.gnu.org/software/libunistring/" -arch=('i686' 'x86_64') -license=('GPL3' 'LGPL3') -depends=('glibc') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db8eca3b64163abadf8c40e5cecc261f') -sha256sums=('610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -}
\ No newline at end of file diff --git a/~brendan/libunistring/libunistring.install b/~brendan/libunistring/libunistring.install deleted file mode 100644 index 58dd2ef8e..000000000 --- a/~brendan/libunistring/libunistring.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(libunistring.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: |