summaryrefslogtreecommitdiff
path: root/community-testing
diff options
context:
space:
mode:
Diffstat (limited to 'community-testing')
-rw-r--r--community-testing/arch/PKGBUILD27
-rw-r--r--community-testing/autofs/PKGBUILD51
-rw-r--r--community-testing/autofs/auto.master6
-rw-r--r--community-testing/autofs/auto.misc7
-rw-r--r--community-testing/autofs/autofs50
-rw-r--r--community-testing/autofs/autofs.conf.d4
-rw-r--r--community-testing/autofs/autofs.install4
-rw-r--r--community-testing/autofs/heimdal.patch44
-rw-r--r--community-testing/cadaver/ChangeLog3
-rw-r--r--community-testing/cadaver/PKGBUILD25
-rw-r--r--community-testing/calibre/PKGBUILD66
-rw-r--r--community-testing/calibre/calibre.install12
-rw-r--r--community-testing/calibre/desktop_integration.patch70
-rw-r--r--community-testing/freeradius/PKGBUILD44
-rw-r--r--community-testing/freeradius/freeradius.install22
-rw-r--r--community-testing/freeradius/krb5-build-fix.patch21
-rwxr-xr-xcommunity-testing/freeradius/radiusd43
-rw-r--r--community-testing/freerdp/PKGBUILD30
-rw-r--r--community-testing/freerdp/freerdp.changelog2
-rw-r--r--community-testing/gsasl/PKGBUILD27
-rw-r--r--community-testing/ipsec-tools/PKGBUILD35
-rwxr-xr-xcommunity-testing/ipsec-tools/ipsec.rc35
-rwxr-xr-xcommunity-testing/ipsec-tools/racoon.rc35
-rw-r--r--community-testing/pam-krb5/PKGBUILD28
-rw-r--r--community-testing/perl-gssapi/PKGBUILD27
-rw-r--r--community-testing/pgadmin3/ChangeLog28
-rw-r--r--community-testing/pgadmin3/PKGBUILD41
-rw-r--r--community-testing/pgadmin3/pgadmin3.desktop10
-rw-r--r--community-testing/python-cherrypy/837.2049.patch554
-rw-r--r--community-testing/python-cherrypy/ChangeLog26
-rw-r--r--community-testing/python-cherrypy/PKGBUILD24
-rw-r--r--community-testing/python-cherrypy/license25
-rw-r--r--community-testing/python2-cherrypy/837.2049.patch554
-rw-r--r--community-testing/python2-cherrypy/ChangeLog26
-rw-r--r--community-testing/python2-cherrypy/PKGBUILD25
-rw-r--r--community-testing/python2-cherrypy/license25
-rw-r--r--community-testing/splix/PKGBUILD34
-rw-r--r--community-testing/splix/splix.install19
38 files changed, 0 insertions, 2109 deletions
diff --git a/community-testing/arch/PKGBUILD b/community-testing/arch/PKGBUILD
deleted file mode 100644
index 2be3a270a..000000000
--- a/community-testing/arch/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 46342 2011-05-05 11:48:15Z spupykin $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname='arch'
-pkgver=1.3.5
-pkgrel=8
-pkgdesc="a modern and remarkable revision control system"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://regexps.srparish.net/www/#Gnu-arch"
-depends=('zlib' 'expat' 'krb5')
-options=('!makeflags')
-source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz)
-md5sums=('db31ee89bc4788eef1eba1cee6c176ef')
-
-build() {
- cd "${srcdir}/tla-$pkgver/src"
- mkdir =build
- cd =build
- ../configure --prefix /usr
- make
-}
-
-package() {
- cd "${srcdir}/tla-$pkgver/src/=build"
- make prefix="${pkgdir}/usr" install
-}
diff --git a/community-testing/autofs/PKGBUILD b/community-testing/autofs/PKGBUILD
deleted file mode 100644
index 11ac57ec1..000000000
--- a/community-testing/autofs/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=autofs
-pkgver=5.0.5
-pkgrel=6
-pkgdesc='A kernel-based automounter for Linux.'
-arch=('i686' 'x86_64')
-url='http://freshmeat.net/projects/autofs'
-license=('GPL2')
-depends=('libldap' 'libxml2' 'krb5')
-backup=('etc/autofs/auto.master'
- 'etc/autofs/auto.misc'
- 'etc/conf.d/autofs')
-options=(!makeflags)
-install='autofs.install'
-source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
- 'autofs'
- 'autofs.conf.d'
- 'auto.master'
- 'auto.misc')
-md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a'
- 'e307bf6d2638e46eeb916cf42fe029b2'
- '47f597c870410055e0fdb66103daf928'
- 'a6cefb591e77b31b79dbb7243646c96b'
- 'd8a15ec9186c5c0b36e5cea1e2739e8a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
- Makefile.rules
-
- ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \
- --enable-ignore-busy
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make INSTALLROOT="${pkgdir}" install
-
- install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master"
- install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc"
- install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs"
- install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs"
-}
diff --git a/community-testing/autofs/auto.master b/community-testing/autofs/auto.master
deleted file mode 100644
index be4ea73ae..000000000
--- a/community-testing/autofs/auto.master
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sample auto.master file
-# Format of this file:
-# mountpoint map options
-# For details of the format look at autofs(5).
-
-#/media /etc/autofs/auto.media
diff --git a/community-testing/autofs/auto.misc b/community-testing/autofs/auto.misc
deleted file mode 100644
index 569156626..000000000
--- a/community-testing/autofs/auto.misc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is an automounter map and it has the following format
-# key [ -mount-options-separated-by-comma ] location
-# Details may be found in the autofs(5) manpage
-
-cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom
-floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl
-usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
diff --git a/community-testing/autofs/autofs b/community-testing/autofs/autofs
deleted file mode 100644
index 08bd3e133..000000000
--- a/community-testing/autofs/autofs
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-daemon_name=autofs
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
-
-if [ ! -z "$TIMEOUT" ]; then
- daemonoptions="--timeout=$TIMEOUT $daemonoptions"
-fi
-
-PID=`cat /var/run/autofs-running 2> /dev/null`
-case "$1" in
- start)
- stat_busy "Starting $daemon_name daemon"
- [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon $daemon_name
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $daemon_name daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon $daemon_name
- stat_done
- fi
- ;;
- restart)
- stat_busy "Restarting $daemon_name daemon"
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0
diff --git a/community-testing/autofs/autofs.conf.d b/community-testing/autofs/autofs.conf.d
deleted file mode 100644
index bc82491e7..000000000
--- a/community-testing/autofs/autofs.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#localoptions='rsize=8192,wsize=8192'
-
-# e.g. --timeout=60
-daemonoptions=''
diff --git a/community-testing/autofs/autofs.install b/community-testing/autofs/autofs.install
deleted file mode 100644
index 34ae75f1e..000000000
--- a/community-testing/autofs/autofs.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install(){
- echo "> In autofs5 --ghost option isn't valid. In order to start autofs you"
- echo "> must remove that option from your /etc/conf.d/autofs."
-}
diff --git a/community-testing/autofs/heimdal.patch b/community-testing/autofs/heimdal.patch
deleted file mode 100644
index 4aa321834..000000000
--- a/community-testing/autofs/heimdal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100
-+++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100
-@@ -66,6 +66,15 @@
- #endif
- #endif
-
-+/**
-+ * The type of a principal is different for MIT Krb5 and Heimdal.
-+ * These macros are provided by Heimdal, and introduced here for MIT.
-+ */
-+#ifndef krb5_realm_length
-+#define krb5_realm_length(r) ((r).length)
-+#define krb5_realm_data(r) ((r).data)
-+#endif
-+
- /*
- * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
- * environment variable so that the library knows where to find it.
-@@ -452,11 +452,11 @@
-
- /* setup a principal for the ticket granting service */
- ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
- strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
- 0);
- if (ret) {
- error(logopt,
---- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100
-+++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100
-@@ -43,7 +43,7 @@
- ifeq ($(SASL), 1)
- SASL_OBJ = cyrus-sasl.o
- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
-- LIBLDAP += $(LIBSASL) $(XML_LIBS)
-+ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5
- endif
- endif \ No newline at end of file
diff --git a/community-testing/cadaver/ChangeLog b/community-testing/cadaver/ChangeLog
deleted file mode 100644
index d22a5592c..000000000
--- a/community-testing/cadaver/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-07-02 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-testing/cadaver/PKGBUILD b/community-testing/cadaver/PKGBUILD
deleted file mode 100644
index ec11fd70f..000000000
--- a/community-testing/cadaver/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 46500 2011-05-07 23:09:15Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-
-pkgname=cadaver
-pkgver=0.23.3
-pkgrel=2
-pkgdesc="Command-line WebDAV client for Unix"
-arch=('i686' 'x86_64')
-url="http://www.webdav.org/cadaver"
-license=('GPL')
-depends=('neon')
-source=(http://www.webdav.org/cadaver/cadaver-$pkgver.tar.gz)
-md5sums=('502ecd601e467f8b16056d2acca39a6f')
-
-build() {
- cd $srcdir/cadaver-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/cadaver-$pkgver
- make prefix=$pkgdir/usr install
-}
diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD
deleted file mode 100644
index e6f9c227c..000000000
--- a/community-testing/calibre/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Petrov Roman <nwhisper@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-
-pkgname=calibre
-pkgver=0.7.59
-pkgrel=3
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy'
- 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup'
- 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb'
- 'python-imaging' 'desktop-file-utils' 'shared-mime-info'
- 'python-dnspython' 'unrar' 'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython: to use calibre-debug')
-install=calibre.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- desktop_integration.patch)
-md5sums=('78ebed5248758b9be1d135ae018b8dfe'
- 'bcc538a3b004429bf8f5a0ac1d89a37f')
-
-build() {
- cd "${srcdir}/${pkgname}"
-
- rm -rf src/{cherrypy,pyPdf}
- sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
- sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
- $(find . -regex ".*.py\|.*.recipe")
-
- python2 setup.py build
- python2 setup.py resources
- python2 setup.py translations
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
-
- patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
- # More on desktop integration (e.g. enforce arch defaults)
- sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
- -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
- -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
- -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
- -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
- # Fix the environment module location
- sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
- install -d "${pkgdir}/usr/lib/python2.7/site-packages"
- python2 setup.py install --root="${pkgdir}" --prefix=/usr \
- --staging-bindir="${pkgdir}/usr/bin" \
- --staging-libdir="${pkgdir}/usr/lib" \
- --staging-sharedir="${pkgdir}/usr/share"
-
- find "${pkgdir}" -type d -empty -delete
-
- # Decompress the man pages so makepkg will do it for us.
- for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
- bzip2 -d "${decom}"
- done
-}
diff --git a/community-testing/calibre/calibre.install b/community-testing/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community-testing/calibre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch
deleted file mode 100644
index fa58443ed..000000000
--- a/community-testing/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig//src/calibre/linux.py 2010-09-17 22:38:02.000000000 +0200
-+++ calibre/src/calibre/linux.py 2010-09-19 15:50:15.029705851 +0200
-@@ -334,52 +323,39 @@ class PostInstall:
-
- with TemporaryDirectory() as tdir:
- with CurrentDir(tdir):
-- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrs',
-- '128'))
-- render_img('lt.png', 'calibre-gui.png')
-- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
-- self.icon_resources.append(('apps', 'calibre-gui', '128'))
-- render_img('viewer.png', 'calibre-viewer.png')
-- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
-- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+ os.mkdir(dir)
-+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-
- mimetypes = set([])
- for x in all_input_formats():
- mt = guess_type('dummy.'+x)[0]
-- if mt and 'chemical' not in mt:
-+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
- mimetypes.add(mt)
-
- def write_mimetypes(f):
- f.write('MimeType=%s;\n'%';'.join(mimetypes))
-
-- f = open('calibre-lrfviewer.desktop', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+ os.mkdir(dir)
-+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
- f.write(VIEWER)
- f.close()
-- f = open('calibre-ebook-viewer.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
- f.write(EVIEWER)
- write_mimetypes(f)
- f.close()
-- f = open('calibre-gui.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
- f.write(GUI)
- write_mimetypes(f)
- f.close()
-- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
-- 'calibre-ebook-viewer.desktop')
-- for x in des:
-- cmd = ['xdg-desktop-menu', 'install', './'+x]
-- if x != des[-1]:
-- cmd.insert(2, '--noupdate')
-- check_call(' '.join(cmd), shell=True)
-- self.menu_resources.append(x)
-- f = open('calibre-mimetypes', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+ os.makedirs(dir)
-+ f = open(os.path.join(dir, 'calibre.xml'), 'wb')
- f.write(MIME)
- f.close()
-- self.mime_resources.append('calibre-mimetypes')
-- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
- except Exception:
- if self.opts.fatal_errors:
- raise
diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD
deleted file mode 100644
index 3727a8cb3..000000000
--- a/community-testing/freeradius/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jason R Begley (jayray@digitalgoat.com>
-
-pkgname=freeradius
-pkgver=2.1.10
-pkgrel=6
-pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
-url="http://www.freeradius.org/"
-license=("GPL")
-depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \
- 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow')
-optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' 'emptydirs' '!makeflags')
-install=$pkgname.install
-source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \
- radiusd
- krb5-build-fix.patch)
-md5sums=('8ea2bd39460a06212decf2c14fdf3fb8'
- '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 e50aa403d..000000000
--- a/community-testing/freeradius/freeradius.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- groupadd radiusd
- useradd -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 100755
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/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD
deleted file mode 100644
index f845453fe..000000000
--- a/community-testing/freerdp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 45796 2011-04-29 10:42:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="Free RDP client"
-arch=('i686' 'x86_64')
-url="http://freerdp.sourceforge.net"
-license=('GPL')
-depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib')
-makedepends=('krb5')
-conflicts=('freerdp-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cde590336292c977dfc1b4b7badf24d2')
-
-build() {
- cd `find ${srcdir}/ -type d -name freerdp-\*`
- [ -x configure ] || sh ./autogen.sh
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd `find ${srcdir}/ -type d -name freerdp-\*`
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog
deleted file mode 100644
index d47f165c3..000000000
--- a/community-testing/freerdp/freerdp.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
diff --git a/community-testing/gsasl/PKGBUILD b/community-testing/gsasl/PKGBUILD
deleted file mode 100644
index 01c39c725..000000000
--- a/community-testing/gsasl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 45799 2011-04-29 10:48:15Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Orivej Desh <smpuj@bk.ru>
-# Maintainer: Orivej Desh <smpuj@bk.ru>
-
-pkgname=gsasl
-pkgver=1.5.4
-pkgrel=2
-pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
-arch=("i686" "x86_64")
-url="http://josefsson.org/gsasl/"
-license=("GPL")
-depends=('gnutls' 'libidn' 'krb5')
-source=("ftp://alpha.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
-md5sums=('44cf5073a6ee2d77d526605bd6ab3904')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
-}
diff --git a/community-testing/ipsec-tools/PKGBUILD b/community-testing/ipsec-tools/PKGBUILD
deleted file mode 100644
index 77a72f6df..000000000
--- a/community-testing/ipsec-tools/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Allan Henriksen <allan.henriksen@gmail.com>
-
-pkgname=ipsec-tools
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="KAME IPSec tools ported to Linux"
-arch=('i686' 'x86_64')
-url="http://ipsec-tools.sourceforge.net/"
-depends=('readline' 'openssl' 'krb5')
-license=('GPL')
-options=('!makeflags' '!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
- racoon.rc
- ipsec.rc)
-md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619'
- '416b8e362d86987b8c55f7153cdafbeb'
- '90d0810267cbd847383ae3101699b192')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- sed -i 's#-Werror##' configure
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
- --enable-adminport --enable-gssapi
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
- install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
-}
diff --git a/community-testing/ipsec-tools/ipsec.rc b/community-testing/ipsec-tools/ipsec.rc
deleted file mode 100755
index cff472c59..000000000
--- a/community-testing/ipsec-tools/ipsec.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Loading IPSec Security Policy Database..."
- /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ipsec
- stat_done
- fi
- ;;
- stop)
- stat_busy "Unloading IPSec Security Policy Database..."
- /usr/sbin/setkey -F -P
- /usr/sbin/setkey -F
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ipsec
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/ipsec-tools/racoon.rc b/community-testing/ipsec-tools/racoon.rc
deleted file mode 100755
index 1a67dcac5..000000000
--- a/community-testing/ipsec-tools/racoon.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/racoon`
-case "$1" in
- start)
- stat_busy "Starting Racoon IPSec daemon"
- [ -z "$PID" ] && /usr/sbin/racoon
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon racoon
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Racoon IPSec daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon racoon
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/pam-krb5/PKGBUILD b/community-testing/pam-krb5/PKGBUILD
deleted file mode 100644
index 5c9798514..000000000
--- a/community-testing/pam-krb5/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Ryan Corder <ryanc@greengrey.org>
-
-pkgname=pam-krb5
-pkgver=4.4
-pkgrel=2
-pkgdesc='A PAM module providing Kerberos v5 support.'
-arch=('i686' 'x86_64')
-url='http://www.eyrie.org/~eagle/software/pam-krb5/'
-license=('custom')
-options=('!libtool')
-depends=('krb5' 'pam')
-source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz")
-md5sums=('a3f9a414fef102cd815a763c965b315c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --enable-reduced-depends
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=$pkgdir install
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/perl-gssapi/PKGBUILD b/community-testing/perl-gssapi/PKGBUILD
deleted file mode 100644
index ec1e50684..000000000
--- a/community-testing/perl-gssapi/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 45801 2011-04-29 10:49:42Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Charles Mauch <cmauch@gmail.com>
-
-pkgname=perl-gssapi
-pkgver=0.28
-pkgrel=3
-pkgdesc="Perl/CPAN Module GSSAPI"
-arch=("i686" "x86_64")
-url="http://search.cpan.org/dist/GSSAPI"
-license=("GPL" "PerlArtistic")
-depends=('krb5')
-source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-$pkgver.tar.gz")
-md5sums=('65f00a0749212af064289c8a05e59b3f')
-
-build() {
- cd $srcdir/GSSAPI-$pkgver
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
- make
-}
-
-package() {
- cd $srcdir/GSSAPI-$pkgver
- make install DESTDIR=$pkgdir
- find $pkgdir -name '.packlist' -delete
- find $pkgdir -name '*.pod' -delete
-}
diff --git a/community-testing/pgadmin3/ChangeLog b/community-testing/pgadmin3/ChangeLog
deleted file mode 100644
index 76de01d7d..000000000
--- a/community-testing/pgadmin3/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-2008-08-21 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 1.8.5
-
-2008-06-24 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updated for i686 - 1.8.4
-
-2008-02-21 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updated for i686 - 1.8.2
-
-2008-01-05 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updated for x86_64 - 1.8.1
- * Updated for i686 - 1.8.1
-
-2007-10-28 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updated version
-
-2007-10-11 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updated version
-
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-
- * Built for x86_64
diff --git a/community-testing/pgadmin3/PKGBUILD b/community-testing/pgadmin3/PKGBUILD
deleted file mode 100644
index 117eb7521..000000000
--- a/community-testing/pgadmin3/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Benjamin Andresen <benny@klapmuetz.org>
-# Contributor: bekks <eduard.warkentin@gmx.de>
-
-pkgname=pgadmin3
-pkgver=1.12.3
-_realver=1.12.3
-pkgrel=1
-pkgdesc="A comprehensive design and management interface for PostgreSQL database"
-arch=('i686' 'x86_64')
-url="http://www.pgadmin.org"
-license=('custom')
-depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt')
-makedepends=('libpqxx' 'krb5')
-source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${_realver}/src/pgadmin3-${_realver}.tar.gz
- pgadmin3.desktop)
-md5sums=('0ff7a970a14757ee951a4e8b1a246a70'
- 'd07ba4df54baead30b66d19d7450bcad')
-
-build() {
- cd $srcdir/pgadmin3-${_realver}
- unset LDFLAGS
- [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/pgadmin3-${_realver}
- make DESTDIR=$pkgdir/ install
-
- install -D -m 644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n
- install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
- mkdir -p $pkgdir/usr/share/pgadmin3/pixmaps/
- mkdir -p $pkgdir/usr/share/applications/
-
- install -D -m 644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
- install -D -m 644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/
-}
diff --git a/community-testing/pgadmin3/pgadmin3.desktop b/community-testing/pgadmin3/pgadmin3.desktop
deleted file mode 100644
index 2e0864f60..000000000
--- a/community-testing/pgadmin3/pgadmin3.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=pgadmin3
-Comment=A comprehensive design and management interface for PostgreSQL database
-Exec=pgadmin3
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
-Categories=Application;Development;
diff --git a/community-testing/python-cherrypy/837.2049.patch b/community-testing/python-cherrypy/837.2049.patch
deleted file mode 100644
index 20cc0dd36..000000000
--- a/community-testing/python-cherrypy/837.2049.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-Index: cherrypy/test/test_tools.py
-===================================================================
---- cherrypy/test/test_tools.py (revision 2049)
-+++ cherrypy/test/test_tools.py (working copy)
-@@ -3,6 +3,7 @@
- import gzip
- import StringIO
- import sys
-+from httplib import IncompleteRead
- import time
- timeout = 0.2
-
-@@ -272,8 +273,12 @@
- # Because this error is raised after the response body has
- # started, and because it's chunked output, an error is raised by
- # the HTTP client when it encounters incomplete output.
-- self.assertRaises(ValueError, self.getPage,
-- "/demo/errinstream?id=5")
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage,
-+ "/demo/errinstream?id=5")
-+ else:
-+ self.assertRaises(ValueError, self.getPage,
-+ "/demo/errinstream?id=5")
- # If this fails, then on_end_request isn't being called at all.
- time.sleep(0.1)
- self.getPage("/demo/ended/5")
-Index: cherrypy/test/webtest.py
-===================================================================
---- cherrypy/test/webtest.py (revision 2049)
-+++ cherrypy/test/webtest.py (working copy)
-@@ -491,7 +491,7 @@
- # IN6ADDR_ANY, which should respond on localhost.
- host = "::1"
- conn = http_conn(host, port)
--
-+
- conn._http_vsn_str = protocol
- conn._http_vsn = int("".join([x for x in protocol if x.isdigit()]))
-
-Index: cherrypy/test/test_encoding.py
-===================================================================
---- cherrypy/test/test_encoding.py (revision 2049)
-+++ cherrypy/test/test_encoding.py (working copy)
-@@ -1,7 +1,9 @@
- from cherrypy.test import test
- test.prefer_parent_path()
-
-+import sys
- import gzip, StringIO
-+from httplib import IncompleteRead
- import cherrypy
- europoundUnicode = u'\x80\xa3'
- europoundUtf8 = u'\x80\xa3'.encode('utf-8')
-@@ -160,10 +162,13 @@
- else:
- # The wsgiserver will simply stop sending data, and the HTTP client
- # will error due to an incomplete chunk-encoded stream.
-- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
-- headers=[("Accept-Encoding", "gzip")])
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream',
-+ headers=[("Accept-Encoding", "gzip")])
-+ else:
-+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
-+ headers=[("Accept-Encoding", "gzip")])
-
--
- if __name__ == "__main__":
- setup_server()
- helper.testmain()
-Index: cherrypy/test/test_core.py
-===================================================================
---- cherrypy/test/test_core.py (revision 2049)
-+++ cherrypy/test/test_core.py (working copy)
-@@ -7,6 +7,7 @@
- localDir = os.path.dirname(__file__)
- import sys
- import types
-+from httplib import IncompleteRead
-
- import cherrypy
- from cherrypy import _cptools, tools
-@@ -760,8 +761,12 @@
- else:
- # Under HTTP/1.1, the chunked transfer-coding is used.
- # The HTTP client will choke when the output is incomplete.
-- self.assertRaises(ValueError, self.getPage,
-- "/error/page_streamed")
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage,
-+ "/error/page_streamed")
-+ else:
-+ self.assertRaises(ValueError, self.getPage,
-+ "/error/page_streamed")
-
- # No traceback should be present
- self.getPage("/error/cause_err_in_finalize")
-Index: cherrypy/wsgiserver/__init__.py
-===================================================================
---- cherrypy/wsgiserver/__init__.py (revision 2049)
-+++ cherrypy/wsgiserver/__init__.py (working copy)
-@@ -713,148 +713,325 @@
- """Exception raised when the SSL implementation signals a fatal alert."""
- pass
-
-+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2):
-+ class CP_fileobject(socket._fileobject):
-+ """Faux file object attached to a socket object."""
-
--class CP_fileobject(socket._fileobject):
-- """Faux file object attached to a socket object."""
--
-- def sendall(self, data):
-- """Sendall for non-blocking sockets."""
-- while data:
-- try:
-- bytes_sent = self.send(data)
-- data = data[bytes_sent:]
-- except socket.error, e:
-- if e.args[0] not in socket_errors_nonblocking:
-- raise
--
-- def send(self, data):
-- return self._sock.send(data)
--
-- def flush(self):
-- if self._wbuf:
-- buffer = "".join(self._wbuf)
-- self._wbuf = []
-- self.sendall(buffer)
--
-- def recv(self, size):
-- while True:
-- try:
-- return self._sock.recv(size)
-- except socket.error, e:
-- if e.args[0] not in socket_errors_nonblocking:
-- raise
--
-- def read(self, size=-1):
-- if size < 0:
-- # Read until EOF
-- buffers = [self._rbuf]
-- self._rbuf = ""
-- if self._rbufsize <= 1:
-- recv_size = self.default_bufsize
-+ def sendall(self, data):
-+ """Sendall for non-blocking sockets."""
-+ while data:
-+ try:
-+ bytes_sent = self.send(data)
-+ data = data[bytes_sent:]
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def send(self, data):
-+ return self._sock.send(data)
-+
-+ def flush(self):
-+ if self._wbuf:
-+ buffer = "".join(self._wbuf)
-+ self._wbuf = []
-+ self.sendall(buffer)
-+
-+ def recv(self, size):
-+ while True:
-+ try:
-+ return self._sock.recv(size)
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def read(self, size=-1):
-+ # Use max, disallow tiny reads in a loop as they are very inefficient.
-+ # We never leave read() with any leftover data from a new recv() call
-+ # in our internal buffer.
-+ rbufsize = max(self._rbufsize, self.default_bufsize)
-+ # Our use of StringIO rather than lists of string objects returned by
-+ # recv() minimizes memory usage and fragmentation that occurs when
-+ # rbufsize is large compared to the typical return value of recv().
-+ buf = self._rbuf
-+ buf.seek(0, 2) # seek end
-+ if size < 0:
-+ # Read until EOF
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(rbufsize)
-+ if not data:
-+ break
-+ buf.write(data)
-+ return buf.getvalue()
- else:
-- recv_size = self._rbufsize
--
-+ # Read until size bytes or EOF seen, whichever comes first
-+ buf_len = buf.tell()
-+ if buf_len >= size:
-+ # Already have size bytes in our buffer? Extract and return.
-+ buf.seek(0)
-+ rv = buf.read(size)
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return rv
-+
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ left = size - buf_len
-+ # recv() will malloc the amount of memory given as its
-+ # parameter even though it often returns much less data
-+ # than that. The returned data string is short lived
-+ # as we copy it into a StringIO and free it. This avoids
-+ # fragmentation issues on many platforms.
-+ data = self.recv(left)
-+ if not data:
-+ break
-+ n = len(data)
-+ if n == size and not buf_len:
-+ # Shortcut. Avoid buffer data copies when:
-+ # - We have no data in our buffer.
-+ # AND
-+ # - Our call to recv returned exactly the
-+ # number of bytes we were asked to read.
-+ return data
-+ if n == left:
-+ buf.write(data)
-+ del data # explicit free
-+ break
-+ assert n <= left, "recv(%d) returned %d bytes" % (left, n)
-+ buf.write(data)
-+ buf_len += n
-+ del data # explicit free
-+ #assert buf_len == buf.tell()
-+ return buf.getvalue()
-+
-+ def readline(self, size=-1):
-+ buf = self._rbuf
-+ buf.seek(0, 2) # seek end
-+ if buf.tell() > 0:
-+ # check if we already have it in our buffer
-+ buf.seek(0)
-+ bline = buf.readline(size)
-+ if bline.endswith('\n') or len(bline) == size:
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return bline
-+ del bline
-+ if size < 0:
-+ # Read until \n or EOF, whichever comes first
-+ if self._rbufsize <= 1:
-+ # Speed up unbuffered case
-+ buf.seek(0)
-+ buffers = [buf.read()]
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ data = None
-+ recv = self.recv
-+ while data != "\n":
-+ data = recv(1)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
-+
-+ buf.seek(0, 2) # seek end
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ nl = data.find('\n')
-+ if nl >= 0:
-+ nl += 1
-+ buf.write(data[:nl])
-+ self._rbuf.write(data[nl:])
-+ del data
-+ break
-+ buf.write(data)
-+ return buf.getvalue()
-+ else:
-+ # Read until size bytes or \n or EOF seen, whichever comes first
-+ buf.seek(0, 2) # seek end
-+ buf_len = buf.tell()
-+ if buf_len >= size:
-+ buf.seek(0)
-+ rv = buf.read(size)
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return rv
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ left = size - buf_len
-+ # did we just receive a newline?
-+ nl = data.find('\n', 0, left)
-+ if nl >= 0:
-+ nl += 1
-+ # save the excess data to _rbuf
-+ self._rbuf.write(data[nl:])
-+ if buf_len:
-+ buf.write(data[:nl])
-+ break
-+ else:
-+ # Shortcut. Avoid data copy through buf when returning
-+ # a substring of our first recv().
-+ return data[:nl]
-+ n = len(data)
-+ if n == size and not buf_len:
-+ # Shortcut. Avoid data copy through buf when
-+ # returning exactly all of our first recv().
-+ return data
-+ if n >= left:
-+ buf.write(data[:left])
-+ self._rbuf.write(data[left:])
-+ break
-+ buf.write(data)
-+ buf_len += n
-+ #assert buf_len == buf.tell()
-+ return buf.getvalue()
-+
-+else:
-+ class CP_fileobject(socket._fileobject):
-+ """Faux file object attached to a socket object."""
-+
-+ def sendall(self, data):
-+ """Sendall for non-blocking sockets."""
-+ while data:
-+ try:
-+ bytes_sent = self.send(data)
-+ data = data[bytes_sent:]
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def send(self, data):
-+ return self._sock.send(data)
-+
-+ def flush(self):
-+ if self._wbuf:
-+ buffer = "".join(self._wbuf)
-+ self._wbuf = []
-+ self.sendall(buffer)
-+
-+ def recv(self, size):
- while True:
-- data = self.recv(recv_size)
-- if not data:
-- break
-- buffers.append(data)
-- return "".join(buffers)
-- else:
-- # Read until size bytes or EOF seen, whichever comes first
-- data = self._rbuf
-- buf_len = len(data)
-- if buf_len >= size:
-- self._rbuf = data[size:]
-- return data[:size]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- left = size - buf_len
-- recv_size = max(self._rbufsize, left)
-- data = self.recv(recv_size)
-- if not data:
-- break
-- buffers.append(data)
-- n = len(data)
-- if n >= left:
-- self._rbuf = data[left:]
-- buffers[-1] = data[:left]
-- break
-- buf_len += n
-- return "".join(buffers)
-+ try:
-+ return self._sock.recv(size)
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-
-- def readline(self, size=-1):
-- data = self._rbuf
-- if size < 0:
-- # Read until \n or EOF, whichever comes first
-- if self._rbufsize <= 1:
-- # Speed up unbuffered case
-- assert data == ""
-+ def read(self, size=-1):
-+ if size < 0:
-+ # Read until EOF
-+ buffers = [self._rbuf]
-+ self._rbuf = ""
-+ if self._rbufsize <= 1:
-+ recv_size = self.default_bufsize
-+ else:
-+ recv_size = self._rbufsize
-+
-+ while True:
-+ data = self.recv(recv_size)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
-+ else:
-+ # Read until size bytes or EOF seen, whichever comes first
-+ data = self._rbuf
-+ buf_len = len(data)
-+ if buf_len >= size:
-+ self._rbuf = data[size:]
-+ return data[:size]
- buffers = []
-- while data != "\n":
-- data = self.recv(1)
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ left = size - buf_len
-+ recv_size = max(self._rbufsize, left)
-+ data = self.recv(recv_size)
- if not data:
- break
- buffers.append(data)
-+ n = len(data)
-+ if n >= left:
-+ self._rbuf = data[left:]
-+ buffers[-1] = data[:left]
-+ break
-+ buf_len += n
- return "".join(buffers)
-- nl = data.find('\n')
-- if nl >= 0:
-- nl += 1
-- self._rbuf = data[nl:]
-- return data[:nl]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- data = self.recv(self._rbufsize)
-- if not data:
-- break
-- buffers.append(data)
-+
-+ def readline(self, size=-1):
-+ data = self._rbuf
-+ if size < 0:
-+ # Read until \n or EOF, whichever comes first
-+ if self._rbufsize <= 1:
-+ # Speed up unbuffered case
-+ assert data == ""
-+ buffers = []
-+ while data != "\n":
-+ data = self.recv(1)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
- nl = data.find('\n')
- if nl >= 0:
- nl += 1
- self._rbuf = data[nl:]
-- buffers[-1] = data[:nl]
-- break
-- return "".join(buffers)
-- else:
-- # Read until size bytes or \n or EOF seen, whichever comes first
-- nl = data.find('\n', 0, size)
-- if nl >= 0:
-- nl += 1
-- self._rbuf = data[nl:]
-- return data[:nl]
-- buf_len = len(data)
-- if buf_len >= size:
-- self._rbuf = data[size:]
-- return data[:size]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- data = self.recv(self._rbufsize)
-- if not data:
-- break
-- buffers.append(data)
-- left = size - buf_len
-- nl = data.find('\n', 0, left)
-+ return data[:nl]
-+ buffers = []
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ nl = data.find('\n')
-+ if nl >= 0:
-+ nl += 1
-+ self._rbuf = data[nl:]
-+ buffers[-1] = data[:nl]
-+ break
-+ return "".join(buffers)
-+ else:
-+ # Read until size bytes or \n or EOF seen, whichever comes first
-+ nl = data.find('\n', 0, size)
- if nl >= 0:
- nl += 1
- self._rbuf = data[nl:]
-- buffers[-1] = data[:nl]
-- break
-- n = len(data)
-- if n >= left:
-- self._rbuf = data[left:]
-- buffers[-1] = data[:left]
-- break
-- buf_len += n
-- return "".join(buffers)
-+ return data[:nl]
-+ buf_len = len(data)
-+ if buf_len >= size:
-+ self._rbuf = data[size:]
-+ return data[:size]
-+ buffers = []
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ left = size - buf_len
-+ nl = data.find('\n', 0, left)
-+ if nl >= 0:
-+ nl += 1
-+ self._rbuf = data[nl:]
-+ buffers[-1] = data[:nl]
-+ break
-+ n = len(data)
-+ if n >= left:
-+ self._rbuf = data[left:]
-+ buffers[-1] = data[:left]
-+ break
-+ buf_len += n
-+ return "".join(buffers)
-
-
- class SSL_fileobject(CP_fileobject):
diff --git a/community-testing/python-cherrypy/ChangeLog b/community-testing/python-cherrypy/ChangeLog
deleted file mode 100644
index 90276417c..000000000
--- a/community-testing/python-cherrypy/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-
-2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 3.1.2
-
-2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 3.1.1
-
-2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for python 2.6
- * Thanks to David Moore
-
-2008-07-09 Mateusz Herych <heniekk@gmail.com>
-
- * Updating for x86_64: 3.1.0
-
-2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updating for i686: 3.1.0
-
-2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updating in i686: 3.0.3
-
diff --git a/community-testing/python-cherrypy/PKGBUILD b/community-testing/python-cherrypy/PKGBUILD
deleted file mode 100644
index 75af39b55..000000000
--- a/community-testing/python-cherrypy/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Armando M. Baratti <amblistas@ajato.com.br>
-# Contributor: Florian Richter <Florian_Richter@gmx.de>
-pkgname=python-cherrypy
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A pythonic, object-oriented web development framework"
-arch=('i686' 'x86_64')
-url="http://www.cherrypy.org"
-license=('BSD')
-depends=('python3')
-source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz
- license)
-md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f'
- '22365dc6b0e6835b53da009aa36af017')
-
-build() {
- cd $srcdir/CherryPy-$pkgver
- python ./setup.py install --root=$pkgdir
- install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
-}
diff --git a/community-testing/python-cherrypy/license b/community-testing/python-cherrypy/license
deleted file mode 100644
index 32e9cf6bd..000000000
--- a/community-testing/python-cherrypy/license
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the CherryPy Team nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/community-testing/python2-cherrypy/837.2049.patch b/community-testing/python2-cherrypy/837.2049.patch
deleted file mode 100644
index 20cc0dd36..000000000
--- a/community-testing/python2-cherrypy/837.2049.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-Index: cherrypy/test/test_tools.py
-===================================================================
---- cherrypy/test/test_tools.py (revision 2049)
-+++ cherrypy/test/test_tools.py (working copy)
-@@ -3,6 +3,7 @@
- import gzip
- import StringIO
- import sys
-+from httplib import IncompleteRead
- import time
- timeout = 0.2
-
-@@ -272,8 +273,12 @@
- # Because this error is raised after the response body has
- # started, and because it's chunked output, an error is raised by
- # the HTTP client when it encounters incomplete output.
-- self.assertRaises(ValueError, self.getPage,
-- "/demo/errinstream?id=5")
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage,
-+ "/demo/errinstream?id=5")
-+ else:
-+ self.assertRaises(ValueError, self.getPage,
-+ "/demo/errinstream?id=5")
- # If this fails, then on_end_request isn't being called at all.
- time.sleep(0.1)
- self.getPage("/demo/ended/5")
-Index: cherrypy/test/webtest.py
-===================================================================
---- cherrypy/test/webtest.py (revision 2049)
-+++ cherrypy/test/webtest.py (working copy)
-@@ -491,7 +491,7 @@
- # IN6ADDR_ANY, which should respond on localhost.
- host = "::1"
- conn = http_conn(host, port)
--
-+
- conn._http_vsn_str = protocol
- conn._http_vsn = int("".join([x for x in protocol if x.isdigit()]))
-
-Index: cherrypy/test/test_encoding.py
-===================================================================
---- cherrypy/test/test_encoding.py (revision 2049)
-+++ cherrypy/test/test_encoding.py (working copy)
-@@ -1,7 +1,9 @@
- from cherrypy.test import test
- test.prefer_parent_path()
-
-+import sys
- import gzip, StringIO
-+from httplib import IncompleteRead
- import cherrypy
- europoundUnicode = u'\x80\xa3'
- europoundUtf8 = u'\x80\xa3'.encode('utf-8')
-@@ -160,10 +162,13 @@
- else:
- # The wsgiserver will simply stop sending data, and the HTTP client
- # will error due to an incomplete chunk-encoded stream.
-- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
-- headers=[("Accept-Encoding", "gzip")])
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream',
-+ headers=[("Accept-Encoding", "gzip")])
-+ else:
-+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
-+ headers=[("Accept-Encoding", "gzip")])
-
--
- if __name__ == "__main__":
- setup_server()
- helper.testmain()
-Index: cherrypy/test/test_core.py
-===================================================================
---- cherrypy/test/test_core.py (revision 2049)
-+++ cherrypy/test/test_core.py (working copy)
-@@ -7,6 +7,7 @@
- localDir = os.path.dirname(__file__)
- import sys
- import types
-+from httplib import IncompleteRead
-
- import cherrypy
- from cherrypy import _cptools, tools
-@@ -760,8 +761,12 @@
- else:
- # Under HTTP/1.1, the chunked transfer-coding is used.
- # The HTTP client will choke when the output is incomplete.
-- self.assertRaises(ValueError, self.getPage,
-- "/error/page_streamed")
-+ if sys.version_info[:2] >= (2, 6):
-+ self.assertRaises(IncompleteRead, self.getPage,
-+ "/error/page_streamed")
-+ else:
-+ self.assertRaises(ValueError, self.getPage,
-+ "/error/page_streamed")
-
- # No traceback should be present
- self.getPage("/error/cause_err_in_finalize")
-Index: cherrypy/wsgiserver/__init__.py
-===================================================================
---- cherrypy/wsgiserver/__init__.py (revision 2049)
-+++ cherrypy/wsgiserver/__init__.py (working copy)
-@@ -713,148 +713,325 @@
- """Exception raised when the SSL implementation signals a fatal alert."""
- pass
-
-+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2):
-+ class CP_fileobject(socket._fileobject):
-+ """Faux file object attached to a socket object."""
-
--class CP_fileobject(socket._fileobject):
-- """Faux file object attached to a socket object."""
--
-- def sendall(self, data):
-- """Sendall for non-blocking sockets."""
-- while data:
-- try:
-- bytes_sent = self.send(data)
-- data = data[bytes_sent:]
-- except socket.error, e:
-- if e.args[0] not in socket_errors_nonblocking:
-- raise
--
-- def send(self, data):
-- return self._sock.send(data)
--
-- def flush(self):
-- if self._wbuf:
-- buffer = "".join(self._wbuf)
-- self._wbuf = []
-- self.sendall(buffer)
--
-- def recv(self, size):
-- while True:
-- try:
-- return self._sock.recv(size)
-- except socket.error, e:
-- if e.args[0] not in socket_errors_nonblocking:
-- raise
--
-- def read(self, size=-1):
-- if size < 0:
-- # Read until EOF
-- buffers = [self._rbuf]
-- self._rbuf = ""
-- if self._rbufsize <= 1:
-- recv_size = self.default_bufsize
-+ def sendall(self, data):
-+ """Sendall for non-blocking sockets."""
-+ while data:
-+ try:
-+ bytes_sent = self.send(data)
-+ data = data[bytes_sent:]
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def send(self, data):
-+ return self._sock.send(data)
-+
-+ def flush(self):
-+ if self._wbuf:
-+ buffer = "".join(self._wbuf)
-+ self._wbuf = []
-+ self.sendall(buffer)
-+
-+ def recv(self, size):
-+ while True:
-+ try:
-+ return self._sock.recv(size)
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def read(self, size=-1):
-+ # Use max, disallow tiny reads in a loop as they are very inefficient.
-+ # We never leave read() with any leftover data from a new recv() call
-+ # in our internal buffer.
-+ rbufsize = max(self._rbufsize, self.default_bufsize)
-+ # Our use of StringIO rather than lists of string objects returned by
-+ # recv() minimizes memory usage and fragmentation that occurs when
-+ # rbufsize is large compared to the typical return value of recv().
-+ buf = self._rbuf
-+ buf.seek(0, 2) # seek end
-+ if size < 0:
-+ # Read until EOF
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(rbufsize)
-+ if not data:
-+ break
-+ buf.write(data)
-+ return buf.getvalue()
- else:
-- recv_size = self._rbufsize
--
-+ # Read until size bytes or EOF seen, whichever comes first
-+ buf_len = buf.tell()
-+ if buf_len >= size:
-+ # Already have size bytes in our buffer? Extract and return.
-+ buf.seek(0)
-+ rv = buf.read(size)
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return rv
-+
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ left = size - buf_len
-+ # recv() will malloc the amount of memory given as its
-+ # parameter even though it often returns much less data
-+ # than that. The returned data string is short lived
-+ # as we copy it into a StringIO and free it. This avoids
-+ # fragmentation issues on many platforms.
-+ data = self.recv(left)
-+ if not data:
-+ break
-+ n = len(data)
-+ if n == size and not buf_len:
-+ # Shortcut. Avoid buffer data copies when:
-+ # - We have no data in our buffer.
-+ # AND
-+ # - Our call to recv returned exactly the
-+ # number of bytes we were asked to read.
-+ return data
-+ if n == left:
-+ buf.write(data)
-+ del data # explicit free
-+ break
-+ assert n <= left, "recv(%d) returned %d bytes" % (left, n)
-+ buf.write(data)
-+ buf_len += n
-+ del data # explicit free
-+ #assert buf_len == buf.tell()
-+ return buf.getvalue()
-+
-+ def readline(self, size=-1):
-+ buf = self._rbuf
-+ buf.seek(0, 2) # seek end
-+ if buf.tell() > 0:
-+ # check if we already have it in our buffer
-+ buf.seek(0)
-+ bline = buf.readline(size)
-+ if bline.endswith('\n') or len(bline) == size:
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return bline
-+ del bline
-+ if size < 0:
-+ # Read until \n or EOF, whichever comes first
-+ if self._rbufsize <= 1:
-+ # Speed up unbuffered case
-+ buf.seek(0)
-+ buffers = [buf.read()]
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ data = None
-+ recv = self.recv
-+ while data != "\n":
-+ data = recv(1)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
-+
-+ buf.seek(0, 2) # seek end
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ nl = data.find('\n')
-+ if nl >= 0:
-+ nl += 1
-+ buf.write(data[:nl])
-+ self._rbuf.write(data[nl:])
-+ del data
-+ break
-+ buf.write(data)
-+ return buf.getvalue()
-+ else:
-+ # Read until size bytes or \n or EOF seen, whichever comes first
-+ buf.seek(0, 2) # seek end
-+ buf_len = buf.tell()
-+ if buf_len >= size:
-+ buf.seek(0)
-+ rv = buf.read(size)
-+ self._rbuf = StringIO.StringIO()
-+ self._rbuf.write(buf.read())
-+ return rv
-+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf.
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ left = size - buf_len
-+ # did we just receive a newline?
-+ nl = data.find('\n', 0, left)
-+ if nl >= 0:
-+ nl += 1
-+ # save the excess data to _rbuf
-+ self._rbuf.write(data[nl:])
-+ if buf_len:
-+ buf.write(data[:nl])
-+ break
-+ else:
-+ # Shortcut. Avoid data copy through buf when returning
-+ # a substring of our first recv().
-+ return data[:nl]
-+ n = len(data)
-+ if n == size and not buf_len:
-+ # Shortcut. Avoid data copy through buf when
-+ # returning exactly all of our first recv().
-+ return data
-+ if n >= left:
-+ buf.write(data[:left])
-+ self._rbuf.write(data[left:])
-+ break
-+ buf.write(data)
-+ buf_len += n
-+ #assert buf_len == buf.tell()
-+ return buf.getvalue()
-+
-+else:
-+ class CP_fileobject(socket._fileobject):
-+ """Faux file object attached to a socket object."""
-+
-+ def sendall(self, data):
-+ """Sendall for non-blocking sockets."""
-+ while data:
-+ try:
-+ bytes_sent = self.send(data)
-+ data = data[bytes_sent:]
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-+
-+ def send(self, data):
-+ return self._sock.send(data)
-+
-+ def flush(self):
-+ if self._wbuf:
-+ buffer = "".join(self._wbuf)
-+ self._wbuf = []
-+ self.sendall(buffer)
-+
-+ def recv(self, size):
- while True:
-- data = self.recv(recv_size)
-- if not data:
-- break
-- buffers.append(data)
-- return "".join(buffers)
-- else:
-- # Read until size bytes or EOF seen, whichever comes first
-- data = self._rbuf
-- buf_len = len(data)
-- if buf_len >= size:
-- self._rbuf = data[size:]
-- return data[:size]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- left = size - buf_len
-- recv_size = max(self._rbufsize, left)
-- data = self.recv(recv_size)
-- if not data:
-- break
-- buffers.append(data)
-- n = len(data)
-- if n >= left:
-- self._rbuf = data[left:]
-- buffers[-1] = data[:left]
-- break
-- buf_len += n
-- return "".join(buffers)
-+ try:
-+ return self._sock.recv(size)
-+ except socket.error, e:
-+ if e.args[0] not in socket_errors_nonblocking:
-+ raise
-
-- def readline(self, size=-1):
-- data = self._rbuf
-- if size < 0:
-- # Read until \n or EOF, whichever comes first
-- if self._rbufsize <= 1:
-- # Speed up unbuffered case
-- assert data == ""
-+ def read(self, size=-1):
-+ if size < 0:
-+ # Read until EOF
-+ buffers = [self._rbuf]
-+ self._rbuf = ""
-+ if self._rbufsize <= 1:
-+ recv_size = self.default_bufsize
-+ else:
-+ recv_size = self._rbufsize
-+
-+ while True:
-+ data = self.recv(recv_size)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
-+ else:
-+ # Read until size bytes or EOF seen, whichever comes first
-+ data = self._rbuf
-+ buf_len = len(data)
-+ if buf_len >= size:
-+ self._rbuf = data[size:]
-+ return data[:size]
- buffers = []
-- while data != "\n":
-- data = self.recv(1)
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ left = size - buf_len
-+ recv_size = max(self._rbufsize, left)
-+ data = self.recv(recv_size)
- if not data:
- break
- buffers.append(data)
-+ n = len(data)
-+ if n >= left:
-+ self._rbuf = data[left:]
-+ buffers[-1] = data[:left]
-+ break
-+ buf_len += n
- return "".join(buffers)
-- nl = data.find('\n')
-- if nl >= 0:
-- nl += 1
-- self._rbuf = data[nl:]
-- return data[:nl]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- data = self.recv(self._rbufsize)
-- if not data:
-- break
-- buffers.append(data)
-+
-+ def readline(self, size=-1):
-+ data = self._rbuf
-+ if size < 0:
-+ # Read until \n or EOF, whichever comes first
-+ if self._rbufsize <= 1:
-+ # Speed up unbuffered case
-+ assert data == ""
-+ buffers = []
-+ while data != "\n":
-+ data = self.recv(1)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ return "".join(buffers)
- nl = data.find('\n')
- if nl >= 0:
- nl += 1
- self._rbuf = data[nl:]
-- buffers[-1] = data[:nl]
-- break
-- return "".join(buffers)
-- else:
-- # Read until size bytes or \n or EOF seen, whichever comes first
-- nl = data.find('\n', 0, size)
-- if nl >= 0:
-- nl += 1
-- self._rbuf = data[nl:]
-- return data[:nl]
-- buf_len = len(data)
-- if buf_len >= size:
-- self._rbuf = data[size:]
-- return data[:size]
-- buffers = []
-- if data:
-- buffers.append(data)
-- self._rbuf = ""
-- while True:
-- data = self.recv(self._rbufsize)
-- if not data:
-- break
-- buffers.append(data)
-- left = size - buf_len
-- nl = data.find('\n', 0, left)
-+ return data[:nl]
-+ buffers = []
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ nl = data.find('\n')
-+ if nl >= 0:
-+ nl += 1
-+ self._rbuf = data[nl:]
-+ buffers[-1] = data[:nl]
-+ break
-+ return "".join(buffers)
-+ else:
-+ # Read until size bytes or \n or EOF seen, whichever comes first
-+ nl = data.find('\n', 0, size)
- if nl >= 0:
- nl += 1
- self._rbuf = data[nl:]
-- buffers[-1] = data[:nl]
-- break
-- n = len(data)
-- if n >= left:
-- self._rbuf = data[left:]
-- buffers[-1] = data[:left]
-- break
-- buf_len += n
-- return "".join(buffers)
-+ return data[:nl]
-+ buf_len = len(data)
-+ if buf_len >= size:
-+ self._rbuf = data[size:]
-+ return data[:size]
-+ buffers = []
-+ if data:
-+ buffers.append(data)
-+ self._rbuf = ""
-+ while True:
-+ data = self.recv(self._rbufsize)
-+ if not data:
-+ break
-+ buffers.append(data)
-+ left = size - buf_len
-+ nl = data.find('\n', 0, left)
-+ if nl >= 0:
-+ nl += 1
-+ self._rbuf = data[nl:]
-+ buffers[-1] = data[:nl]
-+ break
-+ n = len(data)
-+ if n >= left:
-+ self._rbuf = data[left:]
-+ buffers[-1] = data[:left]
-+ break
-+ buf_len += n
-+ return "".join(buffers)
-
-
- class SSL_fileobject(CP_fileobject):
diff --git a/community-testing/python2-cherrypy/ChangeLog b/community-testing/python2-cherrypy/ChangeLog
deleted file mode 100644
index 90276417c..000000000
--- a/community-testing/python2-cherrypy/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-
-2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 3.1.2
-
-2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 3.1.1
-
-2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for python 2.6
- * Thanks to David Moore
-
-2008-07-09 Mateusz Herych <heniekk@gmail.com>
-
- * Updating for x86_64: 3.1.0
-
-2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updating for i686: 3.1.0
-
-2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
- * Updating in i686: 3.0.3
-
diff --git a/community-testing/python2-cherrypy/PKGBUILD b/community-testing/python2-cherrypy/PKGBUILD
deleted file mode 100644
index 98665d8eb..000000000
--- a/community-testing/python2-cherrypy/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 45860 2011-04-30 05:41:24Z kchen $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Armando M. Baratti <amblistas@ajato.com.br>
-# Contributor: Florian Richter <Florian_Richter@gmx.de>
-pkgname=python2-cherrypy
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A pythonic, object-oriented web development framework"
-arch=('i686' 'x86_64')
-url="http://www.cherrypy.org"
-license=('BSD')
-replaces=('cherrypy')
-depends=('python2')
-source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz
- license)
-md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f'
- '22365dc6b0e6835b53da009aa36af017')
-
-build() {
- cd $srcdir/CherryPy-$pkgver
- python2 ./setup.py install --root=$pkgdir
- install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
-}
diff --git a/community-testing/python2-cherrypy/license b/community-testing/python2-cherrypy/license
deleted file mode 100644
index 32e9cf6bd..000000000
--- a/community-testing/python2-cherrypy/license
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the CherryPy Team nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/community-testing/splix/PKGBUILD b/community-testing/splix/PKGBUILD
deleted file mode 100644
index 9b8061ad5..000000000
--- a/community-testing/splix/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 45807 2011-04-29 11:10:15Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Francis Carroll (franciscarroll at gmail dot com)
-
-pkgname=splix
-pkgver=2.0.0
-pkgrel=9
-pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers"
-arch=('i686' 'x86_64')
-url="http://splix.ap2c.org/"
-license=('GPL')
-depends=('libcups' 'gcc-libs' 'ghostscript>=9.02')
-makedepends=('libcups' 'jbigkit' 'krb5')
-install=splix.install
-source=(http://downloads.sourceforge.net/splix/$pkgname-$pkgver.tar.bz2)
-md5sums=('f3aa735c22a926818b3d8b26c9964186')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp
-
- make PSTORASTER=gstoraster
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- install -d "$pkgdir/usr/lib/cups/filter"
- install -d "$pkgdir/usr/share/cups/model/samsung"
-
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/splix/splix.install b/community-testing/splix/splix.install
deleted file mode 100644
index ee1eb78a3..000000000
--- a/community-testing/splix/splix.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
- cat <<EOF
-Installation of the color profile for color printers:
------------------------------------------------------
-
- Color printers needs color profile files to get better results. These
-files are provided by your printer manufacturer and you have to install them
-manually. To do that, download the linux official drivers and locate the "cms"
-directory. Install this directory to "/usr/share/cups/model/\$MANUFACTURER/cms".
-
- Samsung color profile files are available at:
- (Then use MANUFACTURER=samsung)
- http://splix.ap2c.org/samsung_cms.tar.bz2
-EOF
-}
-
-post_upgrade() {
- post_install
-}