From c52a1a6eb4ad278a7b6d9eeeb9c7c88f73ca8d8c Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 25 Jul 2011 14:36:24 +0000 Subject: Mon Jul 25 14:36:20 UTC 2011 --- testing/archboot/PKGBUILD | 52 ---- testing/archboot/archboot.install | 20 -- testing/archboot/vmware-detect.c | 13 - testing/esound/PKGBUILD | 38 --- testing/esound/esd | 37 --- testing/esound/esd-0.2.38-alsa-drain.patch | 11 - testing/gmp/538dfce27f41.patch | 38 --- testing/gmp/PKGBUILD | 39 --- testing/gmp/gmp.install | 20 -- testing/gnutls/PKGBUILD | 39 --- testing/gnutls/gnutls.install | 20 -- testing/inetutils/PKGBUILD | 62 ---- testing/inetutils/ftpd.conf | 4 - testing/inetutils/ftpd.rc | 37 --- testing/inetutils/inetutils.install | 20 -- testing/inetutils/rexec.xinetd | 10 - testing/inetutils/rlogin.xinetd | 10 - testing/inetutils/rsh.xinetd | 10 - testing/inetutils/talk.xinetd | 10 - testing/inetutils/telnet.xinetd | 10 - testing/iproute2/PKGBUILD | 51 ---- testing/iproute2/iproute2-fhs.patch | 84 ------ testing/libgcrypt/PKGBUILD | 41 --- testing/libgcrypt/libgcrypt.install | 20 -- testing/libgpg-error/PKGBUILD | 37 --- testing/libva/PKGBUILD | 35 --- testing/libva/libva-dont-install-tests.patch | 48 ---- testing/mysql/PKGBUILD | 130 --------- testing/mysql/my.cnf | 145 ---------- testing/mysql/mysql.install | 26 -- testing/mysql/mysqld | 77 ----- testing/nasm/PKGBUILD | 42 --- testing/nasm/nasm.install | 20 -- testing/net-snmp/PKGBUILD | 48 ---- testing/net-snmp/libnl-2.patch | 67 ----- testing/net-snmp/snmpd.rc | 38 --- testing/nettle/PKGBUILD | 36 --- testing/nettle/nettle.install | 20 -- testing/nfs-utils/PKGBUILD | 72 ----- testing/nfs-utils/exports | 15 - testing/nfs-utils/idmapd.conf | 14 - testing/nfs-utils/nfs-common | 319 --------------------- testing/nfs-utils/nfs-common.conf | 40 --- testing/nfs-utils/nfs-server | 303 ------------------- testing/nfs-utils/nfs-server.conf | 29 -- .../nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch | 138 --------- testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch | 39 --- testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch | 15 - .../nfs-utils-1.1.6-heimdal_functions.patch | 69 ----- .../nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch | 57 ---- testing/nfs-utils/nfs-utils.install | 32 --- testing/nfs-utils/start-statd.patch | 22 -- testing/openldap/PKGBUILD | 91 ------ testing/openldap/ntlm.patch | 230 --------------- testing/openldap/slapd | 48 ---- testing/openldap/slapd.default | 6 - testing/openssh/PKGBUILD | 70 ----- testing/openssh/authfile.c.patch | 198 ------------- testing/openssh/sshd | 48 ---- testing/openssh/sshd.confd | 4 - testing/openssh/sshd.pam | 11 - testing/quota-tools/LICENSE | 33 --- testing/quota-tools/PKGBUILD | 49 ---- testing/quota-tools/nulls.diff | 20 -- testing/quota-tools/quotaon.diff | 216 -------------- testing/quota-tools/repquota.diff | 91 ------ testing/quota-tools/system_inodes.diff | 18 -- testing/r/PKGBUILD | 68 ----- testing/r/r.desktop | 11 - testing/r/r.install | 12 - testing/r/r.png | Bin 4771 -> 0 bytes testing/rrdtool/PKGBUILD | 37 --- testing/socat/PKGBUILD | 32 --- testing/syslog-ng/PKGBUILD | 66 ----- testing/syslog-ng/cap_syslog.patch | 101 ------- testing/syslog-ng/non-blocking-systemd-fds.patch | 32 --- testing/syslog-ng/syslog-ng.conf | 92 ------ testing/syslog-ng/syslog-ng.logrotate | 7 - testing/syslog-ng/syslog-ng.rc | 63 ---- testing/tftp-hpa/LICENSE | 32 --- testing/tftp-hpa/PKGBUILD | 35 --- testing/tftp-hpa/tftpd.conf | 4 - testing/tftp-hpa/tftpd.rc | 38 --- testing/vsftpd/PKGBUILD | 43 --- testing/vsftpd/vsftpd.d | 67 ----- testing/vsftpd/vsftpd.install | 17 -- testing/vsftpd/vsftpd.xinetd | 10 - testing/xinetd/PKGBUILD | 43 --- testing/xinetd/servers | 10 - testing/xinetd/services | 10 - testing/xinetd/xinetd | 38 --- testing/xinetd/xinetd.conf | 14 - 92 files changed, 4644 deletions(-) delete mode 100644 testing/archboot/PKGBUILD delete mode 100644 testing/archboot/archboot.install delete mode 100644 testing/archboot/vmware-detect.c delete mode 100644 testing/esound/PKGBUILD delete mode 100755 testing/esound/esd delete mode 100644 testing/esound/esd-0.2.38-alsa-drain.patch delete mode 100644 testing/gmp/538dfce27f41.patch delete mode 100644 testing/gmp/PKGBUILD delete mode 100644 testing/gmp/gmp.install delete mode 100644 testing/gnutls/PKGBUILD delete mode 100644 testing/gnutls/gnutls.install delete mode 100644 testing/inetutils/PKGBUILD delete mode 100644 testing/inetutils/ftpd.conf delete mode 100644 testing/inetutils/ftpd.rc delete mode 100644 testing/inetutils/inetutils.install delete mode 100644 testing/inetutils/rexec.xinetd delete mode 100644 testing/inetutils/rlogin.xinetd delete mode 100644 testing/inetutils/rsh.xinetd delete mode 100644 testing/inetutils/talk.xinetd delete mode 100644 testing/inetutils/telnet.xinetd delete mode 100644 testing/iproute2/PKGBUILD delete mode 100644 testing/iproute2/iproute2-fhs.patch delete mode 100644 testing/libgcrypt/PKGBUILD delete mode 100644 testing/libgcrypt/libgcrypt.install delete mode 100644 testing/libgpg-error/PKGBUILD delete mode 100644 testing/libva/PKGBUILD delete mode 100644 testing/libva/libva-dont-install-tests.patch delete mode 100644 testing/mysql/PKGBUILD delete mode 100644 testing/mysql/my.cnf delete mode 100644 testing/mysql/mysql.install delete mode 100755 testing/mysql/mysqld delete mode 100644 testing/nasm/PKGBUILD delete mode 100644 testing/nasm/nasm.install delete mode 100644 testing/net-snmp/PKGBUILD delete mode 100644 testing/net-snmp/libnl-2.patch delete mode 100644 testing/net-snmp/snmpd.rc delete mode 100644 testing/nettle/PKGBUILD delete mode 100644 testing/nettle/nettle.install delete mode 100644 testing/nfs-utils/PKGBUILD delete mode 100644 testing/nfs-utils/exports delete mode 100644 testing/nfs-utils/idmapd.conf delete mode 100644 testing/nfs-utils/nfs-common delete mode 100644 testing/nfs-utils/nfs-common.conf delete mode 100644 testing/nfs-utils/nfs-server delete mode 100644 testing/nfs-utils/nfs-server.conf delete mode 100644 testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch delete mode 100644 testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch delete mode 100644 testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch delete mode 100644 testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch delete mode 100644 testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch delete mode 100644 testing/nfs-utils/nfs-utils.install delete mode 100644 testing/nfs-utils/start-statd.patch delete mode 100644 testing/openldap/PKGBUILD delete mode 100644 testing/openldap/ntlm.patch delete mode 100755 testing/openldap/slapd delete mode 100644 testing/openldap/slapd.default delete mode 100644 testing/openssh/PKGBUILD delete mode 100644 testing/openssh/authfile.c.patch delete mode 100755 testing/openssh/sshd delete mode 100644 testing/openssh/sshd.confd delete mode 100644 testing/openssh/sshd.pam delete mode 100644 testing/quota-tools/LICENSE delete mode 100644 testing/quota-tools/PKGBUILD delete mode 100644 testing/quota-tools/nulls.diff delete mode 100644 testing/quota-tools/quotaon.diff delete mode 100644 testing/quota-tools/repquota.diff delete mode 100644 testing/quota-tools/system_inodes.diff delete mode 100644 testing/r/PKGBUILD delete mode 100644 testing/r/r.desktop delete mode 100644 testing/r/r.install delete mode 100644 testing/r/r.png delete mode 100644 testing/rrdtool/PKGBUILD delete mode 100644 testing/socat/PKGBUILD delete mode 100644 testing/syslog-ng/PKGBUILD delete mode 100644 testing/syslog-ng/cap_syslog.patch delete mode 100644 testing/syslog-ng/non-blocking-systemd-fds.patch delete mode 100644 testing/syslog-ng/syslog-ng.conf delete mode 100644 testing/syslog-ng/syslog-ng.logrotate delete mode 100755 testing/syslog-ng/syslog-ng.rc delete mode 100644 testing/tftp-hpa/LICENSE delete mode 100644 testing/tftp-hpa/PKGBUILD delete mode 100644 testing/tftp-hpa/tftpd.conf delete mode 100755 testing/tftp-hpa/tftpd.rc delete mode 100644 testing/vsftpd/PKGBUILD delete mode 100644 testing/vsftpd/vsftpd.d delete mode 100644 testing/vsftpd/vsftpd.install delete mode 100644 testing/vsftpd/vsftpd.xinetd delete mode 100644 testing/xinetd/PKGBUILD delete mode 100644 testing/xinetd/servers delete mode 100644 testing/xinetd/services delete mode 100755 testing/xinetd/xinetd delete mode 100644 testing/xinetd/xinetd.conf (limited to 'testing') diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD deleted file mode 100644 index c5ffb4711..000000000 --- a/testing/archboot/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $ -# Maintainer : Tobias Powalowski - -pkgname=archboot -pkgver=2011.06 -pkgrel=2 -_sourcerel=1 -pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/" -license=('GPL') -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') -optdepends=('grub2-bios: for grub2 support' - 'grub2-efi-i386: for grub2 support' - 'grub2-efi-x86_64: for grub2 support' - 'efibootmgr: for grub2 support' -) -backup=('etc/archboot/allinone.conf' - 'etc/archboot/allinone-lts.conf' - 'etc/archboot/default.conf' - 'etc/archboot/default-ftp.conf' - 'etc/archboot/default-pxelinux.conf' - 'etc/archboot/default-ftp-pxelinux.conf' - 'etc/archboot/presets/allinone' - 'etc/archboot/presets/allinone-lts' - 'etc/archboot/presets/isolinux' - 'etc/archboot/presets/isolinux-ftp' - 'etc/archboot/presets/syslinux' - 'etc/archboot/presets/syslinux-ftp' - 'etc/archboot/presets/pxelinux' - 'etc/archboot/presets/pxelinux-ftp' -) -install=archboot.install -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c) -md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' - '7e2b03463747cb22ab388e79a09fa0cb') - -### to bump the depends list use this: -#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done - -build() -{ - cd "$srcdir" - gcc -o vmware-detect vmware-detect.c -} - -package() -{ - cd "$srcdir/$pkgname-$pkgver-$_sourcerel" - mv * "$pkgdir/" - install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect" -} diff --git a/testing/archboot/archboot.install b/testing/archboot/archboot.install deleted file mode 100644 index 315f97d7e..000000000 --- a/testing/archboot/archboot.install +++ /dev/null @@ -1,20 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -post_install() { - cat << EOF -ARCHBOOT usage: ---------------- ---> Main config files were installed to '/etc/archboot/'. - Preset files were installed to '/etc/archboot/presets'. - Modify them to your needs. ---> Use the preset files as config file of your build tool: - mkisolinux, mksyslinux or mkpxelinux ---> For Allinone ISOs use archboot-allinone.sh -EOF -} - -post_upgrade() { - post_install $1 -} diff --git a/testing/archboot/vmware-detect.c b/testing/archboot/vmware-detect.c deleted file mode 100644 index d242a388d..000000000 --- a/testing/archboot/vmware-detect.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -int main() { - unsigned char idtr[6]; - asm("sidt %0" : "=m" (idtr)); - if(0xff==idtr[5]) - { - return 0; - } - else - { - return 1; - } -} diff --git a/testing/esound/PKGBUILD b/testing/esound/PKGBUILD deleted file mode 100644 index b6d035b22..000000000 --- a/testing/esound/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $ -# Maintainer: Jan de Groot -pkgname=esound -pkgver=0.2.41 -pkgrel=2 -pkgdesc="Enlightened Sound Daemon" -arch=(i686 x86_64) -license=('LGPL') -depends=('audiofile' 'alsa-lib>=1.0.18') -url="http://www.tux.org/~ricdude/EsounD.html" -provides=("esd=${pkgver}") -replaces=('esd') -conflicts=('esd') -backup=('etc/esd.conf') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - esd-0.2.38-alsa-drain.patch - esd) -md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' - '3de93efcd1bc196a3585e6aef50eac48' - 'a4c76e7c7f75b201ea7ab6fb15b47472') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-audiofile --without-libwrap \ - --enable-alsa --disable-artstest - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" -} diff --git a/testing/esound/esd b/testing/esound/esd deleted file mode 100755 index d90ef55fa..000000000 --- a/testing/esound/esd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/esd` -case "$1" in - start) - stat_busy "Starting Esound Daemon" - if [ -z "$PID" ]; then - /usr/bin/esd -nobeeps & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon esd - stat_done - fi - ;; - stop) - stat_busy "Stopping Esound Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/esound/esd-0.2.38-alsa-drain.patch b/testing/esound/esd-0.2.38-alsa-drain.patch deleted file mode 100644 index f2fb716ba..000000000 --- a/testing/esound/esd-0.2.38-alsa-drain.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- esound-0.2.38/audio_alsa09.c.old 2007-06-11 12:22:24.000000000 +0200 -+++ esound-0.2.38/audio_alsa09.c 2007-06-11 12:22:49.000000000 +0200 -@@ -486,7 +486,7 @@ void esd_audio_flush(void) - } - - if (alsa_playback_handle != NULL) -- snd_pcm_drain( alsa_playback_handle ); -+ snd_pcm_drop( alsa_playback_handle ); - - if (alsadbg) - print_state(); diff --git a/testing/gmp/538dfce27f41.patch b/testing/gmp/538dfce27f41.patch deleted file mode 100644 index 2e0a1af50..000000000 --- a/testing/gmp/538dfce27f41.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund -# Date 1310730221 -7200 -# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 -# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 -(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. - -diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c ---- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 -+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 -@@ -7,7 +7,7 @@ - SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST - GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. - --Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. -+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -28,7 +28,6 @@ - #include "gmp-impl.h" - - -- - mp_size_t - mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) - { -@@ -130,7 +129,7 @@ - qn = nn - qn; - while (qn > dn) - { -- mpn_sub_1 (np + dn, np + dn, qn, cy); -+ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); - cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); - qp += dn; - np += dn; - diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD deleted file mode 100644 index c8b486dec..000000000 --- a/testing/gmp/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 131961 2011-07-18 11:43:05Z allan $ -# Maintainer: Allan McRae -# Maintainer: Jan de Groot - -pkgname=gmp -pkgver=5.0.2 -pkgrel=2 -pkgdesc="A free library for arbitrary precision arithmetic" -arch=('i686' 'x86_64') -url="http://gmplib.org/" -depends=('gcc-libs' 'sh') -license=('LGPL3') -options=(!libtool) -install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 - 538dfce27f41.patch) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3' - 'a769be9c41618ca9c35d83375e7097d0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/538dfce27f41.patch - - [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=${CHOST} \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install deleted file mode 100644 index cad3354f9..000000000 --- a/testing/gmp/gmp.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(gmp.info gmp.info-1 gmp.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD deleted file mode 100644 index 6f4fe2870..000000000 --- a/testing/gnutls/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $ -# Maintainer: Jan de Groot - -pkgname=gnutls -pkgver=2.12.7 -pkgrel=2 -pkgdesc="A library which provides a secure layer over a reliable transport layer" -arch=('i686' 'x86_64') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -install=gnutls.install -options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=(4b48aa3119f549d30d550bf4162c721b'') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-zlib \ - --disable-static \ - --disable-guile - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - #make check # passes all || /bin/true - make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman - # gzip -9 all files in infodir and manpages manually - find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; - find "$pkgdir/usr/share/man" -exec gzip -9 {} \; -} diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install deleted file mode 100644 index 9ce7c6edc..000000000 --- a/testing/gnutls/gnutls.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.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/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD deleted file mode 100644 index 19feb931e..000000000 --- a/testing/inetutils/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $ -# Maintainer: Eric Belanger - -pkgname=inetutils -pkgver=1.8 -pkgrel=3 -pkgdesc="A collection of common network programs" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/inetutils/" -license=('GPL') -depends=('readline' 'ncurses' 'pam') -provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') -conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') -replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ - 'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') -options=('!emptydirs') -install=inetutils.install -source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd) -md5sums=('ad8fdcdf1797b9ca258264a6b04e48fd' 'c167200f6faeb64659e69ced2a9d672a'\ - 'e6e6e5990a2e8159a276fef8fbf54c04' '8596208d119045543c5fb644e1d713d5'\ - '2c3655985cf122591d71d031af84ff90' 'c490ea36751ac5f1d61d2c014959a3d1'\ - 'c25d8382a994de84d9c6962d804f689b' 'c3aa508a9d1293a787341108cd49c1b7') -sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' '84dc802b5e57b5e04c847572225a3b9612017155'\ - '68a590083b45997dfdb80e666b2de762f494ba74' 'bfad98a4a62f1fff8779f076c6019ed07f9111af'\ - '27d99b910eec0fc26bd79ccc2c1de26608330298' '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'\ - '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --without-wrap --with-pam \ - --enable-ftp --enable-ftpd \ - --enable-telnet --enable-telnetd \ - --enable-talk --enable-talkd \ - --enable-rlogin --enable-rlogind \ - --enable-rsh --enable-rshd \ - --enable-rexec --enable-rexecd \ - --enable-rcp \ - --disable-tftp --disable-tftpd \ - --disable-ping --disable-ping6 \ - --disable-logger --disable-syslogd \ - --disable-inetd --disable-whois \ - --disable-uucpd --disable-hostname \ - --disable-ifconfig --disable-traceroute - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" - install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" - install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" - install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec" - install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" - install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" -} diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf deleted file mode 100644 index f660f0035..000000000 --- a/testing/inetutils/ftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc deleted file mode 100644 index 3d0d34421..000000000 --- a/testing/inetutils/ftpd.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install deleted file mode 100644 index b338fa498..000000000 --- a/testing/inetutils/inetutils.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(inetutils.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/inetutils/rexec.xinetd b/testing/inetutils/rexec.xinetd deleted file mode 100644 index 4659e4745..000000000 --- a/testing/inetutils/rexec.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service exec -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rexecd - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd deleted file mode 100644 index 5c72f86df..000000000 --- a/testing/inetutils/rlogin.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service login -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rlogind - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd deleted file mode 100644 index a13738c31..000000000 --- a/testing/inetutils/rsh.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service shell -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rshd - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd deleted file mode 100644 index 6abef359c..000000000 --- a/testing/inetutils/talk.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service ntalk -{ - flags = REUSE - socket_type = dgram - wait = yes - user = root - server = /usr/sbin/talkd - log_on_failure += USERID - disable = yes -} diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd deleted file mode 100644 index bd3a5e4b1..000000000 --- a/testing/inetutils/telnet.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service telnet -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/telnetd - log_on_failure += USERID - disable = yes -} diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD deleted file mode 100644 index 68f05ebac..000000000 --- a/testing/iproute2/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 131999 2011-07-18 20:47:01Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: Judd Vinet - -pkgname=iproute2 -pkgver=2.6.39 -pkgrel=1 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('perl') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz - 'iproute2-fhs.patch') -sha1sums=('9044ad0b4a34a377a54197724373330294d743c7' - '2416b11252364d7a6c742eabb4a6924a75637a46') - - -build() { - cd $srcdir/iproute2-${pkgver} - - # set correct fhs structure - patch -Np1 -i ${srcdir}/iproute2-fhs.patch - - ./configure - - make -} - -package() { - cd $srcdir/iproute2-${pkgver} - - make DESTDIR=$pkgdir install - - # allow loopback to be started before /usr is mounted, this may not be supported in the future - mkdir -p ${pkgdir}/sbin - mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip - ln -s /sbin/ip ${pkgdir}/usr/sbin/ip - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h - install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a -} diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch deleted file mode 100644 index 2608414db..000000000 --- a/testing/iproute2/iproute2-fhs.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ - ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ --SBINDIR=/sbin -+SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd -+SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile ---- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 -+++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 -@@ -20,9 +20,9 @@ - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc - for i in $(DISTDATA); \ -- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ - done - - clean: -diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile ---- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 -+++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 -@@ -99,18 +99,11 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- mkdir -p $(MODDESTDIR) -- install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ -- do install -m 755 $$i $(MODDESTDIR); \ -- done -- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ -- if [ -f $(MODDESTDIR)/m_xt.so ]; \ -- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ -- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ -- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ -- fi; \ -- fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done - - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ diff --git a/testing/libgcrypt/PKGBUILD b/testing/libgcrypt/PKGBUILD deleted file mode 100644 index 974f69b8a..000000000 --- a/testing/libgcrypt/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $ -# Maintainer: Andreas Radke - -pkgname=libgcrypt -pkgver=1.5.0 -pkgrel=1 -pkgdesc="a general purpose crypto library based on the code used" -arch=(i686 x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('libgpg-error>=1.9') -options=('!libtool' '!emptydirs') -install=$pkgname.install -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 -) -sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support" - ./configure --prefix=/usr \ - --disable-static \ - --disable-padlock-support $EXTRAFLAGS - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make -k check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ - ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so -} diff --git a/testing/libgcrypt/libgcrypt.install b/testing/libgcrypt/libgcrypt.install deleted file mode 100644 index 79b878201..000000000 --- a/testing/libgcrypt/libgcrypt.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(gcrypt.info.gz gcrypt.info-1.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/libgpg-error/PKGBUILD b/testing/libgpg-error/PKGBUILD deleted file mode 100644 index b0cbef1c0..000000000 --- a/testing/libgpg-error/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $ -# Maintainer: judd - -pkgname=libgpg-error -pkgver=1.10 -pkgrel=1 -pkgdesc="Support library for libgcrypt" -arch=(i686 x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('glibc' 'sh') -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('736a03daa9dc5873047d4eb4a9c22a16') - - -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 - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/ - ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so -} diff --git a/testing/libva/PKGBUILD b/testing/libva/PKGBUILD deleted file mode 100644 index 3996e0059..000000000 --- a/testing/libva/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 125889 2011-05-31 13:21:31Z ibiru $ -# Maintainer : Ionut Biru -pkgname=libva -pkgver=1.0.13 -pkgrel=1 -pkgdesc="Video Acceleration (VA) API for Linux" -arch=('i686' 'x86_64') -url="http://freedesktop.org/wiki/Software/vaapi" -license=('MIT') -depends=('libgl' 'libdrm>=2.4.23' 'libxfixes') -makedepends=('mesa') -optdepends=('vdpau-video: VDPAU backend for VA API') -options=('!libtool') -source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2 - libva-dont-install-tests.patch) -md5sums=('221207c386129e02fc05827147af7aa6' - 'd13d1868f2db99bedec1057bbfbd9c61') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/libva-dont-install-tests.patch" - ./autogen.sh - ./configure --prefix=/usr \ - --enable-i965-driver \ - --enable-glx - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/libva/libva-dont-install-tests.patch b/testing/libva/libva-dont-install-tests.patch deleted file mode 100644 index 97f33e32d..000000000 --- a/testing/libva/libva-dont-install-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur libva-1.0.13.orig/test/basic/Makefile.am libva-1.0.13/test/basic/Makefile.am ---- libva-1.0.13.orig/test/basic/Makefile.am 2011-05-31 13:10:55.021797329 +0000 -+++ libva-1.0.13/test/basic/Makefile.am 2011-05-31 13:11:52.252331062 +0000 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ -+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ - test_07 test_08 test_09 test_10 test_11 - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -diff -Nur libva-1.0.13.orig/test/decode/Makefile.am libva-1.0.13/test/decode/Makefile.am ---- libva-1.0.13.orig/test/decode/Makefile.am 2011-05-31 13:10:55.021797329 +0000 -+++ libva-1.0.13/test/decode/Makefile.am 2011-05-31 13:12:12.175851534 +0000 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = mpeg2vldemo -+check_PROGRAMS = mpeg2vldemo - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - -diff -Nur libva-1.0.13.orig/test/encode/Makefile.am libva-1.0.13/test/encode/Makefile.am ---- libva-1.0.13.orig/test/encode/Makefile.am 2011-05-31 13:10:55.021797329 +0000 -+++ libva-1.0.13/test/encode/Makefile.am 2011-05-31 13:12:35.499399421 +0000 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = h264encode avcenc -+check_PROGRAMS = h264encode avcenc - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - -diff -Nur libva-1.0.13.orig/test/putsurface/Makefile.am libva-1.0.13/test/putsurface/Makefile.am ---- libva-1.0.13.orig/test/putsurface/Makefile.am 2011-05-31 13:10:55.021797329 +0000 -+++ libva-1.0.13/test/putsurface/Makefile.am 2011-05-31 13:12:48.836190403 +0000 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --bin_PROGRAMS = putsurface -+check_PROGRAMS = putsurface - - AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 - diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD deleted file mode 100644 index 54248034e..000000000 --- a/testing/mysql/PKGBUILD +++ /dev/null @@ -1,130 +0,0 @@ -# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Contributor: judd - -pkgbase=mysql -pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.14 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.mysql.com/" -makedepends=('cmake' 'openssl' 'zlib') -options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" - 'mysqld' - 'my.cnf') -md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244' - '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') - -build() { - cd "${srcdir}" - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - - make -} - -package_libmysqlclient(){ - pkgdesc="MySQL client libraries" - depends=('openssl') - - cd "${srcdir}"/build - for dir in include libmysql libmysqld libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mysql-clients(){ - pkgdesc="MySQL client tools" - depends=('libmysqlclient') - - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mysql - rm "${pkgdir}"/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest} -} - -package_mysql(){ - pkgdesc="A fast SQL database server" - backup=('etc/mysql/my.cnf') - install=mysql.install - depends=('mysql-clients' 'net-tools') - optdepends=('perl-dbi' 'perl-dbd-mysql') - options=('emptydirs') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld - - # provided by libmysqlclient - rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} - rm "${pkgdir}"/usr/lib/libmysql* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by mysql-clients - rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql -} diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf deleted file mode 100644 index 9a41b4fc3..000000000 --- a/testing/mysql/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, -# MASTER_USER=, MASTER_PASSWORD= ; -# -# where you replace , , by quoted strings and -# by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/testing/mysql/mysql.install b/testing/mysql/mysql.install deleted file mode 100644 index 9a4479215..000000000 --- a/testing/mysql/mysql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/testing/mysql/mysqld b/testing/mysql/mysqld deleted file mode 100755 index 1ac88a7cc..000000000 --- a/testing/mysql/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/nasm/PKGBUILD b/testing/nasm/PKGBUILD deleted file mode 100644 index 9085d5e61..000000000 --- a/testing/nasm/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 132063 2011-07-19 17:35:27Z stephane $ -# Maintainer: Aaron Griffin - -pkgbase=nasm -pkgname=('nasm' 'nasm-doc') -pkgver=2.09.10 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.nasm.us" -license=('BSD') -makedepends=('ghostscript') -source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('15c79dcb5838870a0fac15feb5fade66') -sha1sums=('ca57a7454b29e18c64018e49cdf5c832937497ab') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr - make everything -} - -package_nasm() { - pkgdesc="An 80x86 assembler designed for portability and modularity" - depends=('glibc') - install=nasm.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make INSTALLROOT="${pkgdir}" install install_rdf - install -d "${pkgdir}/usr/share/info" - install -m644 doc/info/* "${pkgdir}/usr/share/info/" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nasm/LICENSE" -} - -package_nasm-doc() { - pkgdesc="An 80x86 assembler designed for portability and modularity (manuals)" - - cd "${srcdir}/${pkgbase}-${pkgver}/doc" - install -d "${pkgdir}/usr/share/doc/nasm/html" - install -m644 html/* "${pkgdir}/usr/share/doc/nasm/html/" - install -m644 nasmdoc.ps nasmdoc.pdf nasmdoc.txt "${pkgdir}/usr/share/doc/nasm/" - install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/nasm-doc/LICENSE" -} diff --git a/testing/nasm/nasm.install b/testing/nasm/nasm.install deleted file mode 100644 index e4baa9808..000000000 --- a/testing/nasm/nasm.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(nasm.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/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD deleted file mode 100644 index a1f72cb01..000000000 --- a/testing/net-snmp/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $ -# Maintainer: Eric Belanger -# Contributor: Dale Blount - -pkgname=net-snmp -pkgver=5.6.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=('custom') -depends=('openssl' 'libnl') -makedepends=('setuptools') -optdepends=('perl-term-readkey: for snmpcheck application' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -options=('!libtool' '!makeflags' '!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'snmpd.rc') -md5sums=('b4e30ead5783b0bb1d280172c6095ea4' - '9f0d13676ba1fae1eb7eb178edd85b43') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - ./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" \ - PYTHONPROG=/usr/bin/python2 - make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE" -} - -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 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/net-snmp/libnl-2.patch b/testing/net-snmp/libnl-2.patch deleted file mode 100644 index 7c140fe83..000000000 --- a/testing/net-snmp/libnl-2.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nur net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c 2009-06-13 04:02:02.000000000 +0200 -+++ net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c 2011-01-15 10:31:03.579735957 +0100 -@@ -555,8 +555,10 @@ - static int - tcpTable_load_netlink() - { -+ 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")); -@@ -564,10 +566,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; - } - -@@ -579,10 +581,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); -@@ -593,9 +595,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; - } - -@@ -644,7 +646,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc deleted file mode 100644 index 9f1b83f64..000000000 --- a/testing/net-snmp/snmpd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd - 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/nettle/PKGBUILD b/testing/nettle/PKGBUILD deleted file mode 100644 index 085e98f5d..000000000 --- a/testing/nettle/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $ -# Maintainer: Andreas Radke -# Contributor: bender02 at gmx dot com - -pkgname=nettle -pkgver=2.1 -pkgrel=1 -pkgdesc="A low-level cryptographic library" -arch=('i686' 'x86_64') -url="http://www.lysator.liu.se/~nisse/nettle/" -license=('GPL2') -install=$pkgname.install -depends=('gmp') -source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('2bfaf16234a5d8deb96cd23f53a682bb') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libdir=/usr/lib \ - --enable-shared \ - --disable-static # <-- seems not working now - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - # remove static libs - rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a -} diff --git a/testing/nettle/nettle.install b/testing/nettle/nettle.install deleted file mode 100644 index 3d19b5f19..000000000 --- a/testing/nettle/nettle.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(nettle.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/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD deleted file mode 100644 index 3adca96d4..000000000 --- a/testing/nfs-utils/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 131837 2011-07-16 00:22:48Z dreisner $ -# Maintainer: Tobias Powalowski -# Contributor: John Proctor -# Contributor: dibblethewrecker -# Contributor: abelstr -# Contributor: Marco Lima - -pkgname=nfs-utils -pkgver=1.2.3 -pkgrel=3 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') -url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') -makedepends=('pkgconfig' 'autoconf' 'automake') -source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common - nfs-common.conf - nfs-server - nfs-server.conf - exports - idmapd.conf - start-statd.patch - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch) -install=nfs-utils.install -md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d' - 'fc508e10cdf5e8ddd80373b1b2bc99a1' - 'f73f197a16b02c3e248488ec35c4cf43' - '5ae080f6117cef3140f02bc162bdc755' - '2bf71def3263325643a09458635520f0' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e24f81a8c8657672e262c61235d34b4a' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') - -build() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch - - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc - - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install - - # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - # directories - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery -} diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports deleted file mode 100644 index 8f4aac598..000000000 --- a/testing/nfs-utils/exports +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. -# -# Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# -# Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) -# /srv/nfs4/home hostname1(rw,sync,nohide) -# Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) -# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23afe9..000000000 --- a/testing/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common deleted file mode 100644 index 13742bde3..000000000 --- a/testing/nfs-utils/nfs-common +++ /dev/null @@ -1,319 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -# daemon dependencies -DAEMON_DEPENDS=('rpcbind') - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_depends ${DAEMON_DEPENDS[@]} - - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3e5..000000000 --- a/testing/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server deleted file mode 100644 index 9574cbc12..000000000 --- a/testing/nfs-utils/nfs-server +++ /dev/null @@ -1,303 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -# daemon dependencies -DAEMON_DEPENDS=('nfs-common') - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_depends ${DAEMON_DEPENDS[@]} - - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf deleted file mode 100644 index 4054d6b88..000000000 --- a/testing/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 2" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch deleted file mode 100644 index 4a5a138e7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4 ---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000 +0100 -+++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000 +0200 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e mit; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -- -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21d8..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch deleted file mode 100644 index 7f6c7a751..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c ---- utils/gssd/krb5_util.c 2009-04-20 19:32:50.000000000 +0200 -+++ utils/gssd/krb5_util.c 2009-04-20 20:57:31.000000000 +0200 -@@ -940,9 +940,37 @@ - { - krb5_error_code ret; - krb5_creds creds; -- krb5_cc_cursor cur; - int found = 0; - -+#ifdef HAVE_HEIMDAL -+ krb5_creds pattern; -+ krb5_realm *client_realm; -+ -+ krb5_cc_clear_mcred(&pattern); -+ -+ client_realm = krb5_princ_realm (context, principal); -+ -+ ret = krb5_make_principal (context, &pattern.server, -+ *client_realm, KRB5_TGS_NAME, *client_realm, -+ NULL); -+ if (ret) -+ krb5_err (context, 1, ret, "krb5_make_principal"); -+ pattern.client = principal; -+ -+ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); -+ krb5_free_principal (context, pattern.server); -+ if (ret) { -+ if (ret == KRB5_CC_END) -+ return 1; -+ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred"); -+ } -+ -+ found = creds.times.endtime > time(NULL); -+ -+ krb5_free_cred_contents (context, &creds); -+#else -+ krb5_cc_cursor cur; -+ - ret = krb5_cc_start_seq_get(context, ccache, &cur); - if (ret) - return 0; -@@ -962,6 +990,7 @@ - krb5_free_cred_contents(context, &creds); - } - krb5_cc_end_seq_get(context, ccache, &cur); -+#endif - - return found; - } -@@ -1008,6 +1037,9 @@ - } - krb5_free_principal(context, principal); - err_princ: -+#ifdef HAVE_HEIMDAL -+#define KRB5_TC_OPENCLOSE 0x00000001 -+#endif - krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE); - krb5_cc_close(context, ccache); - err_cache: -@@ -1262,7 +1294,7 @@ - if (context != NULL) { - origmsg = krb5_get_error_message(context, code); - msg = strdup(origmsg); -- krb5_free_error_message(context, origmsg); -+ krb5_free_error_string(context, origmsg); - } - #endif - if (msg != NULL) diff --git a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch deleted file mode 100644 index 917136a8c..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c -+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c -@@ -51,8 +51,10 @@ - #include "context.h" - - #ifndef OM_uint64 -+#ifndef GSSAPI_GSSAPI_H_ - typedef uint64_t OM_uint64; - #endif -+#endif - - static int - write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key) -@@ -177,10 +179,10 @@ - int retcode = 0; - - printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n"); -- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx, -+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, - 1, &return_ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - goto out_err; - } -@@ -204,9 +206,9 @@ - else - retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime); - -- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); -+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - printerr(0, "WARN: failed to free lucid sec context\n"); - } -Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c -@@ -332,10 +332,10 @@ - return -1; - } - -- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid, -+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, - num_enctypes, &enctypes); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_set_allowable_enctypes", -+ pgsserr("gss_krb5_set_allowable_enctypes", - maj_stat, min_stat, &krb5oid); - gss_release_cred(&min_stat, &credh); - return -1; diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install deleted file mode 100644 index 7dcdf9575..000000000 --- a/testing/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> Extended configuration options for NFS (clients & server) are available in - ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf - ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch deleted file mode 100644 index 38c60a784..000000000 --- a/testing/nfs-utils/start-statd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/sh -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on - # /var/run/rpc.statd.pid). - # It should run run statd with whatever flags are apropriate for this - # site. --PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS - diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD deleted file mode 100644 index 2c395bb2a..000000000 --- a/testing/openldap/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: PKGBUILD 132014 2011-07-19 05:40:38Z eric $ -# Maintainer: - -pkgbase=openldap -pkgname=('libldap' 'openldap') -pkgver=2.4.26 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.openldap.org/" -license=('custom') -makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') -source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default ntlm.patch) -md5sums=('f36f3086031dd56ae94f722ffae8df5e' - '378cd1ca051db3f72252c2d1f80fa409' - '6be69f6b7e522cb64cce8703da81ed32' - '4258ddbef923d1f29f2843bc050f8c56') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.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 "ldapi"|' include/ldap_defaults.h - sed -i 's|%LOCALSTATEDIR%/run|/run|' servers/slapd/slapd.conf - sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run||' 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 \ - --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' 'libfetch' '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}" 'libtool' 'util-linux') - backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') - options=('!libtool' 'emptydirs') - - 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 - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd - - install -dm700 "${pkgdir}"/var/lib/openldap - install -dm700 "${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/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 -+#include -+ -+#include -+#include -+#include -+#include -+ -+#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/slapd b/testing/openldap/slapd deleted file mode 100755 index f9caa2935..000000000 --- a/testing/openldap/slapd +++ /dev/null @@ -1,48 +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" - if [ -z "$PID" ]; then - if [ -z "$SLAPD_SERVICES" ]; then - /usr/sbin/slapd $SLAPD_OPTIONS - else - /usr/sbin/slapd -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/slapd.pid - rm -f /run/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/openssh/PKGBUILD b/testing/openssh/PKGBUILD deleted file mode 100644 index bf45e6396..000000000 --- a/testing/openssh/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 131644 2011-07-13 07:48:58Z bisson $ -# Maintainer: Gaetan Bisson -# Contributor: Aaron Griffin -# Contributor: judd - -pkgname=openssh -pkgver=5.8p2 -pkgrel=9 -pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64') -license=('custom:BSD') -url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('krb5' 'openssl' 'libedit') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'authfile.c.patch' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' - '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' - '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../authfile.c.patch # fix FS#24693 using http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95 - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords \ - --with-pam \ - --with-mantype=man \ - --mandir=/usr/share/man \ - --with-xauth=/usr/bin/xauth \ - --with-kerberos5=/usr \ - --with-ssl-engine \ - --with-libedit=/usr/lib \ - --disable-strip # stripping is done by makepkg - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - # additional contrib scripts that we like - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - # PAM is a common, standard feature to have - sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - "${pkgdir}"/etc/ssh/sshd_config -} diff --git a/testing/openssh/authfile.c.patch b/testing/openssh/authfile.c.patch deleted file mode 100644 index 6c18fe807..000000000 --- a/testing/openssh/authfile.c.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -aur old/authfile.c new/authfile.c ---- old/authfile.c 2011-06-12 02:21:52.262338254 +0200 -+++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200 -@@ -1,4 +1,4 @@ --/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */ -+/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -69,6 +69,8 @@ - #include "misc.h" - #include "atomicio.h" - -+#define MAX_KEY_FILE_SIZE (1024 * 1024) -+ - /* Version identification string for SSH v1 identity files. */ - static const char authfile_id_string[] = - "SSH PRIVATE KEY FILE FORMAT 1.1\n"; -@@ -312,12 +314,12 @@ - return pub; - } - --/* Load the contents of a key file into a buffer */ --static int -+/* Load a key from a fd into a buffer */ -+int - key_load_file(int fd, const char *filename, Buffer *blob) - { -+ u_char buf[1024]; - size_t len; -- u_char *cp; - struct stat st; - - if (fstat(fd, &st) < 0) { -@@ -325,30 +327,45 @@ - filename == NULL ? "" : filename, - filename == NULL ? "" : " ", - strerror(errno)); -- close(fd); - return 0; - } -- if (st.st_size > 1*1024*1024) { -+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && -+ st.st_size > MAX_KEY_FILE_SIZE) { -+ toobig: - error("%s: key file %.200s%stoo large", __func__, - filename == NULL ? "" : filename, - filename == NULL ? "" : " "); -- close(fd); - return 0; - } -- len = (size_t)st.st_size; /* truncated */ -- - buffer_init(blob); -- cp = buffer_append_space(blob, len); -- -- if (atomicio(read, fd, cp, len) != len) { -- debug("%s: read from key file %.200s%sfailed: %.100s", __func__, -- filename == NULL ? "" : filename, -- filename == NULL ? "" : " ", -- strerror(errno)); -+ for (;;) { -+ if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { -+ if (errno == EPIPE) -+ break; -+ debug("%s: read from key file %.200s%sfailed: %.100s", -+ __func__, filename == NULL ? "" : filename, -+ filename == NULL ? "" : " ", strerror(errno)); -+ buffer_clear(blob); -+ bzero(buf, sizeof(buf)); -+ return 0; -+ } -+ buffer_append(blob, buf, len); -+ if (buffer_len(blob) > MAX_KEY_FILE_SIZE) { -+ buffer_clear(blob); -+ bzero(buf, sizeof(buf)); -+ goto toobig; -+ } -+ } -+ bzero(buf, sizeof(buf)); -+ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && -+ st.st_size != buffer_len(blob)) { -+ debug("%s: key file %.200s%schanged size while reading", -+ __func__, filename == NULL ? "" : filename, -+ filename == NULL ? "" : " "); - buffer_clear(blob); -- close(fd); - return 0; - } -+ - return 1; - } - -@@ -606,7 +623,7 @@ - error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); - error("Permissions 0%3.3o for '%s' are too open.", - (u_int)st.st_mode & 0777, filename); -- error("It is recommended that your private key files are NOT accessible by others."); -+ error("It is required that your private key files are NOT accessible by others."); - error("This private key will be ignored."); - return 0; - } -@@ -626,6 +643,7 @@ - case KEY_UNSPEC: - return key_parse_private_pem(blob, type, passphrase, commentp); - default: -+ error("%s: cannot parse key type %d", __func__, type); - break; - } - return NULL; -@@ -670,11 +688,38 @@ - } - - Key * -+key_parse_private(Buffer *buffer, const char *filename, -+ const char *passphrase, char **commentp) -+{ -+ Key *pub, *prv; -+ Buffer pubcopy; -+ -+ buffer_init(&pubcopy); -+ buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer)); -+ /* it's a SSH v1 key if the public key part is readable */ -+ pub = key_parse_public_rsa1(&pubcopy, commentp); -+ buffer_free(&pubcopy); -+ if (pub == NULL) { -+ prv = key_parse_private_type(buffer, KEY_UNSPEC, -+ passphrase, NULL); -+ /* use the filename as a comment for PEM */ -+ if (commentp && prv) -+ *commentp = xstrdup(filename); -+ } else { -+ key_free(pub); -+ /* key_parse_public_rsa1() has already loaded the comment */ -+ prv = key_parse_private_type(buffer, KEY_RSA1, passphrase, -+ NULL); -+ } -+ return prv; -+} -+ -+Key * - key_load_private(const char *filename, const char *passphrase, - char **commentp) - { -- Key *pub, *prv; -- Buffer buffer, pubcopy; -+ Key *prv; -+ Buffer buffer; - int fd; - - fd = open(filename, O_RDONLY); -@@ -697,23 +742,7 @@ - } - close(fd); - -- buffer_init(&pubcopy); -- buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer)); -- /* it's a SSH v1 key if the public key part is readable */ -- pub = key_parse_public_rsa1(&pubcopy, commentp); -- buffer_free(&pubcopy); -- if (pub == NULL) { -- prv = key_parse_private_type(&buffer, KEY_UNSPEC, -- passphrase, NULL); -- /* use the filename as a comment for PEM */ -- if (commentp && prv) -- *commentp = xstrdup(filename); -- } else { -- key_free(pub); -- /* key_parse_public_rsa1() has already loaded the comment */ -- prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, -- NULL); -- } -+ prv = key_parse_private(&buffer, filename, passphrase, commentp); - buffer_free(&buffer); - return prv; - } -@@ -737,13 +766,19 @@ - case '\0': - continue; - } -+ /* Abort loading if this looks like a private key */ -+ if (strncmp(cp, "-----BEGIN", 10) == 0) -+ break; - /* Skip leading whitespace. */ - for (; *cp && (*cp == ' ' || *cp == '\t'); cp++) - ; - if (*cp) { - if (key_read(k, &cp) == 1) { -- if (commentp) -- *commentp=xstrdup(filename); -+ cp[strcspn(cp, "\r\n")] = '\0'; -+ if (commentp) { -+ *commentp = xstrdup(*cp ? -+ cp : filename); -+ } - fclose(f); - return 1; - } diff --git a/testing/openssh/sshd b/testing/openssh/sshd deleted file mode 100755 index 2ee1091f0..000000000 --- a/testing/openssh/sshd +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/var/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy "Starting Secure Shell Daemon" - [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } - [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } - [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } - [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; } - [ -d /var/empty ] || mkdir -p /var/empty - [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy "Stopping Secure Shell Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/testing/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam deleted file mode 100644 index ff8829fe9..000000000 --- a/testing/openssh/sshd.pam +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so --session optional pam_ck_connector.so nox11 diff --git a/testing/quota-tools/LICENSE b/testing/quota-tools/LICENSE deleted file mode 100644 index 4bae71589..000000000 --- a/testing/quota-tools/LICENSE +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * 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. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University 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 REGENTS 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 REGENTS 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/testing/quota-tools/PKGBUILD b/testing/quota-tools/PKGBUILD deleted file mode 100644 index 79bb209a4..000000000 --- a/testing/quota-tools/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $ -# Maintainer: Eric Bélanger - -pkgname=quota-tools -pkgver=4.00_pre1 -pkgrel=1 -pkgdesc="Tools to manage kernel-level quotas in Linux" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/linuxquota/" -license=('GPL' 'BSD') -depends=('e2fsprogs') -backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver/_/-}.tar.gz LICENSE \ - quotaon.diff system_inodes.diff repquota.diff nulls.diff) -md5sums=('ef9d66e8a968ecffd2d9df648fa8ada2' - 'dd792440e684043e4e4ef80963d0237b' - '9ac7ca4746de1ad057baee21474b7906' - '92d9f2a4b3e5e3adf2977051391785a7' - 'd1d70d4167e53d1414079b4391f1cfb8' - '094bce5226c4fd1c383bd0b75405ee2c') -sha1sums=('adf29b49dab449078eb6ffdfe8af51fe85419e28' - '57297bdc9e638c500506169bbbe12eb89bcf7d07' - '2304f03cddd06d8791167f621683f7ef54610673' - 'e2a33f1f95a3ff8c741a2067058e898f6054af09' - '8b00e7c4f7af2188ad49a50a616c1d71eee20459' - '0527f761aa869f5d9e463ceab4a3bf82881d05c2') - -build() { - cd "${srcdir}/${pkgname}" - patch -p1 -i "${srcdir}/quotaon.diff" - patch -p1 -i "${srcdir}/system_inodes.diff" - patch -p1 -i "${srcdir}/repquota.diff" - patch -p1 -i "${srcdir}/nulls.diff" - ./configure --prefix=/usr --sysconfdir=/etc - sed -i -e 's/#define HOSTS_ACCESS 1//' -e 's/HOSTS_ACCESS//' config.h - sed -i 's/-lwrap//' Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}" - make ROOTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - -# remove conflicts with glibc and man-pages - rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x} - rm "${pkgdir}/usr/share/man/man2/quotactl.2" -} diff --git a/testing/quota-tools/nulls.diff b/testing/quota-tools/nulls.diff deleted file mode 100644 index 97c5bc482..000000000 --- a/testing/quota-tools/nulls.diff +++ /dev/null @@ -1,20 +0,0 @@ -#Description: Avoid memory corruption of NULL address -#Author: Petr Pisar - ---- quota/quotasys.c 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotasys.c 2010-05-05 08:02:53.000000000 +0200 -@@ -746,9 +746,12 @@ - kernel_qfmt_num = 0; - if (!stat("/proc/fs/xfs/stat", &st)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -- else -- if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS)) -+ else { -+ fs_quota_stat_t dummy; -+ -+ if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS)) - kernel_qfmt[kernel_qfmt_num++] = QF_XFS; -+ } - /* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */ - if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) { - kernel_iface = IFACE_GENERIC; diff --git a/testing/quota-tools/quotaon.diff b/testing/quota-tools/quotaon.diff deleted file mode 100644 index 6a43cee6c..000000000 --- a/testing/quota-tools/quotaon.diff +++ /dev/null @@ -1,216 +0,0 @@ -# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode -# Author: Jan Kara - -diff -u quota/quotaon.c quota-tools/quotaon.c ---- quota/quotaon.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotaon.c 2010-06-15 10:11:30.000000000 +0200 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include "quotaon.h" - #include "quota.h" -@@ -145,6 +146,19 @@ - } - } - -+int pinfo(char *fmt, ...) -+{ -+ va_list arg; -+ int ret; -+ -+ if (!(flags & FL_VERBOSE)) -+ return 0; -+ va_start(arg, fmt); -+ ret = vprintf(fmt, arg); -+ va_end(arg); -+ return ret; -+} -+ - /* - * Enable/disable rsquash on given filesystem - */ -@@ -171,10 +185,10 @@ - errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno)); - return 1; - } -- if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF)) -- printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); -- else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON)) -- printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); -+ if (flags & STATEFLAG_OFF) -+ pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); -+ else if (flags & STATEFLAG_ON) -+ pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); - #endif - return 0; - } -@@ -195,8 +209,7 @@ - errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno)); - return 1; - } -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); -+ pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); - return 0; - } - if (kernel_iface == IFACE_GENERIC) { -@@ -218,8 +231,7 @@ - errstr(_("Quota format not supported in kernel.\n")); - return 1; - } -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); -+ pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); - return 0; - } - -@@ -268,8 +280,6 @@ - int sflags, ret = 0; - - sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON; -- if (flags & FL_VERBOSE) -- sflags |= STATEFLAG_VERBOSE; - if (flags & FL_ALL) - sflags |= STATEFLAG_ALL; - -@@ -281,10 +291,7 @@ - errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n")); - return 1; - } -- if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1 -- || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1)) -- || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1)) -- ret = xfs_newstate(mnt, type, extra, sflags); -+ ret = xfs_newstate(mnt, type, extra, sflags); - } - else if (meta_qf_fstype(mnt->mnt_type)) { - if (!hasquota(mnt, type, 0)) -@@ -376,7 +383,7 @@ - while ((mnt = get_next_mount())) { - if (nfs_fstype(mnt->mnt_type)) { - if (!(flags & FL_ALL)) -- fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname); -+ errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname); - continue; - } - -diff -u quota/quotaon.h quota-tools/quotaon.h ---- quota/quotaon.h 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotaon.h 2010-06-12 12:06:08.000000000 +0200 -@@ -13,7 +13,7 @@ - #define STATEFLAG_ON 0x01 - #define STATEFLAG_OFF 0x02 - #define STATEFLAG_ALL 0x04 --#define STATEFLAG_VERBOSE 0x08 - - typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags); - extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags); -+extern int pinfo(char *fmt, ...); -diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c ---- quota/quotaon_xfs.c 2010-07-26 18:48:24.000000000 +0200 -+++ quota-tools/quotaon_xfs.c 2010-06-15 10:11:30.000000000 +0200 -@@ -59,8 +59,8 @@ - return 1; - case Q_XFS_QUOTAON: - if (roothack) { -- printf(_("Enabling %s quota on root filesystem" -- " (reboot to take effect)\n"), type2name(type)); -+ pinfo(_("Enabling %s quota on root filesystem" -+ " (reboot to take effect)\n"), type2name(type)); - return 1; - } - errstr(_("Enable XFS %s quota accounting during mount\n"), -@@ -79,12 +79,12 @@ - return -1; - case Q_XFS_QUOTAON: - if (roothack) { -- printf(_("Enabling %s quota on root filesystem" -- " (reboot to take effect)\n"), type2name(type)); -+ pinfo(_("Enabling %s quota on root filesystem" -+ " (reboot to take effect)\n"), type2name(type)); - return 1; - } - if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) { -- printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); -+ pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); - return 1; - } - errstr(_("Already accounting %s quota on %s\n"), -@@ -92,7 +92,7 @@ - return -1; - case Q_XFS_QUOTAOFF: - if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) { -- printf(_("Disabling %s quota accounting on %s\n"), -+ pinfo(_("Disabling %s quota accounting on %s\n"), - type2name(type), dev); - return 1; - } -@@ -121,9 +121,9 @@ - return -1; - } - if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) -- acctstr = _("and accounting "); -- printf(_("Disabling %s quota enforcement %son %s\n"), -- type2name(type), acctstr, dev); -+ acctstr = _("and accounting "); -+ pinfo(_("Disabling %s quota enforcement %son %s\n"), -+ type2name(type), acctstr, dev); - return 1; - } - break; -@@ -146,10 +146,10 @@ - errstr(_("quotactl on %s: %s\n"), dev, strerror(errno)); - return 1; - } -- if ((flags & STATEFLAG_VERBOSE) && qoff) -- printf(_("%s: %s quotas turned off\n"), dev, type2name(type)); -- else if ((flags & STATEFLAG_VERBOSE) && !qoff) -- printf(_("%s: %s quotas turned on\n"), dev, type2name(type)); -+ if (qoff) -+ pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type)); -+ else -+ pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type)); - return 0; - } - -@@ -168,8 +168,7 @@ - return 1; - } - -- if (flags & STATEFLAG_VERBOSE) -- printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); -+ pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); - return 0; - } - -@@ -208,16 +207,12 @@ - } - #endif /* XFS_ROOTHACK */ - -- if (xarg == NULL) { /* both acct & enfd on/off */ -- xopts |= (type == USRQUOTA) ? -- (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) : -- (XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD); -+ if (xarg == NULL) { /* only enfd on/off */ -+ xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD : -+ XFS_QUOTA_GDQ_ENFD; - err = xfs_onoff((char *)dev, type, flags, roothack, xopts); - } - else if (strcmp(xarg, "account") == 0) { -- /* only useful if we want root accounting only */ -- if (!roothack || !(flags & STATEFLAG_ON)) -- goto done; - xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT; - err = xfs_onoff((char *)dev, type, flags, roothack, xopts); - } -@@ -231,7 +226,6 @@ - } - else - die(1, _("Invalid argument \"%s\"\n"), xarg); -- done: - free((char *)dev); - return err; - } diff --git a/testing/quota-tools/repquota.diff b/testing/quota-tools/repquota.diff deleted file mode 100644 index 3d79497d9..000000000 --- a/testing/quota-tools/repquota.diff +++ /dev/null @@ -1,91 +0,0 @@ -# Description: fix repquota to get latest quota info header -# Author: Jan Kara - -diff -u quota/quotaio.c quota-tools/quotaio.c ---- quota/quotaio.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotaio.c 2010-05-28 09:05:21.000000000 +0200 -@@ -147,6 +147,15 @@ - } - } - if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) { /* Need to open file? */ -+ if (QIO_ENABLED(h)) { /* Kernel uses same file? */ -+ unsigned int cmd = -+ (kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC; -+ if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev, -+ 0, NULL) < 0) { -+ die(4, _("Cannot sync quotas on device %s: %s\n"), -+ h->qh_quotadev, strerror(errno)); -+ } -+ } - /* We still need to open file for operations like 'repquota' */ - if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) { - errstr(_("Cannot open quotafile %s: %s\n"), -diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c ---- quota/quotaio_v1.c 2010-07-26 18:48:24.000000000 +0200 -+++ quota-tools/quotaio_v1.c 2010-05-28 09:05:23.000000000 +0200 -@@ -348,11 +348,6 @@ - struct dquot *dquot = get_empty_dquot(); - qid_t id = 0; - -- if (QIO_ENABLED(h)) /* Kernel uses same file? */ -- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), -- h->qh_quotadev, 0, NULL) < 0) -- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, -- strerror(errno)); - memset(dquot, 0, sizeof(*dquot)); - dquot->dq_h = h; - lseek(h->qh_fd, 0, SEEK_SET); -diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c ---- quota/quotaio_v2.c 2010-02-18 09:44:11.000000000 +0100 -+++ quota-tools/quotaio_v2.c 2010-05-28 09:05:23.000000000 +0200 -@@ -484,11 +484,6 @@ - - static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *)) - { -- if (QIO_ENABLED(h)) /* Kernel uses same file? */ -- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), -- h->qh_quotadev, 0, NULL) < 0) -- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, -- strerror(errno)); - return qtree_scan_dquots(h, process_dquot); - } - -diff -u quota/quotasys.c quota-tools/quotasys.c ---- quota/quotasys.c 2010-07-28 11:14:02.000000000 +0200 -+++ quota-tools/quotasys.c 2010-06-15 10:11:30.000000000 +0200 -@@ -861,22 +861,23 @@ - if (kernel_iface == IFACE_GENERIC) { - int actfmt; - -- if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0) -- return -1; -- actfmt = kern2utilfmt(actfmt); -- if (actfmt < 0) -- return -1; -- return actfmt; -+ if (quotactl(QCMD(Q_GETFMT, type), dev, 0, -+ (void *)&actfmt) >= 0) { -+ actfmt = kern2utilfmt(actfmt); -+ if (actfmt >= 0) -+ return actfmt; -+ } -+ } else { -+ if ((fmt == -1 || fmt == QF_VFSV0) && -+ v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ -+ return QF_VFSV0; -+ if ((fmt == -1 || fmt == QF_VFSOLD) && -+ v1_kern_quota_on(dev, type)) /* Old quota format */ -+ return QF_VFSOLD; - } -- if ((fmt == -1 || fmt == QF_VFSV0) && -- v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ -- return QF_VFSV0; - if ((fmt == -1 || fmt == QF_XFS) && - xfs_kern_quota_on(dev, type)) /* XFS quota format */ - return QF_XFS; -- if ((fmt == -1 || fmt == QF_VFSOLD) && -- v1_kern_quota_on(dev, type)) /* Old quota format */ -- return QF_VFSOLD; - return -1; - } - diff --git a/testing/quota-tools/system_inodes.diff b/testing/quota-tools/system_inodes.diff deleted file mode 100644 index 94f4d66da..000000000 --- a/testing/quota-tools/system_inodes.diff +++ /dev/null @@ -1,18 +0,0 @@ -# Description: Do not count system inodes into quota for ext[234] -# Author: Jan Kara - ---- quota/quotacheck.c 2010-02-18 09:44:10.000000000 +0100 -+++ quota-tools//quotacheck.c 2010-05-22 16:47:53.000000000 +0200 -@@ -455,8 +455,10 @@ - return -1; - } - -- while ((long)i_num) { -- if (inode.i_links_count) { -+ while (i_num) { -+ if ((i_num == EXT2_ROOT_INO || -+ i_num >= EXT2_FIRST_INO(fs->super)) && -+ inode.i_links_count) { - debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks); - if (flags & FL_VERBOSE) - blit(NULL); diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD deleted file mode 100644 index e6b7af9dc..000000000 --- a/testing/r/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: Damir Perisa -# Contributor: K. Piche - -pkgname=r -pkgver=2.13.1 -pkgrel=1 -pkgdesc="Language and environment for statistical computing and graphics" -arch=('i686' 'x86_64') -license=('GPL') -url=('http://www.r-project.org/') -depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' - 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango' 'xz') -makedepends=('openjdk6' 'gcc-fortran') -backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') -options=('!makeflags') -source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" - 'r.desktop' - 'r.png') -install=r.install -sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b' - '13aa29219bcaa102e575de8c1c8e0833d233e836' - 'a69a07ec363440efc18ce0a7f2af103375dea978') -build() { - cd ${srcdir}/R-${pkgver} - sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --sysconfdir=/etc/R \ - --datarootdir=/usr/share \ - rsharedir=/usr/share/R/ \ - rincludedir=/usr/include/R/ \ - rdocdir=/usr/share/doc/R/ \ - --with-x \ - --enable-R-shlib \ - --with-lapack \ - --with-blas \ - F77=gfortran \ - LIBnn=lib - make -} - -package() { - cd ${srcdir}/R-${pkgver} - make -j1 DESTDIR=${pkgdir} install - - # Fixup R wrapper scripts. - sed -i "s|${pkgdir} ||" ${pkgdir}/usr/bin/R - rm ${pkgdir}/usr/lib/R/bin/R - cd ${pkgdir}/usr/lib/R/bin - ln -s ../../../bin/R - - # install some freedesktop.org compatibility - install -Dm644 ${srcdir}/r.desktop \ - ${pkgdir}/usr/share/applications/r.desktop - install -Dm644 ${srcdir}/r.png \ - ${pkgdir}/usr/share/pixmaps/r.png - - # move the config directory to /etc and create symlinks - install -d ${pkgdir}/etc/R - cd ${pkgdir}/usr/lib/R/etc - for i in *; do - mv -f ${i} ${pkgdir}/etc/R - ln -s /etc/R/${i} ${i} - done -} diff --git a/testing/r/r.desktop b/testing/r/r.desktop deleted file mode 100644 index 68b49c447..000000000 --- a/testing/r/r.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=R -GenericName=environment for statistical computing -Comment=language and environment for statistical computing and graphics -Exec=R -Icon=/usr/share/pixmaps/r.png -DocPath=/usr/lib/R/doc/html/index.html -StartupNotify=true -Terminal=true -Type=Application -Categories=Education;Science;Math; diff --git a/testing/r/r.install b/testing/r/r.install deleted file mode 100644 index d3289ab64..000000000 --- a/testing/r/r.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/testing/r/r.png b/testing/r/r.png deleted file mode 100644 index 1303ccdb9..000000000 Binary files a/testing/r/r.png and /dev/null differ diff --git a/testing/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD deleted file mode 100644 index 2395df342..000000000 --- a/testing/rrdtool/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $ -# Maintainer: Eric Bélanger - -pkgname=rrdtool -pkgver=1.4.5 -pkgrel=3 -pkgdesc="Data logging and graphing application" -arch=('i686' 'x86_64') -url="http://www.rrdtool.org" -license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango') -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) -md5sums=('4d116dba9a0888d8aaac179e35d3980a') -sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \ - bindings/perl-shared/Makefile.PL - ./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/socat/PKGBUILD b/testing/socat/PKGBUILD deleted file mode 100644 index 458009ce3..000000000 --- a/testing/socat/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $ -# Maintainer: Gaetan Bisson -# Contributor: Juergen Hoetzel -# Contributor: John Proctor - -pkgname=socat -pkgver=1.7.1.3 -pkgrel=3 -pkgdesc='Multipurpose relay' -url='http://www.dest-unreach.org/socat/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('readline' 'openssl') -source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-libwrap # only required while base/base-devel uses tcp_wrappers - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD deleted file mode 100644 index 3c4bc0767..000000000 --- a/testing/syslog-ng/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 131638 2011-07-13 03:09:27Z dreisner $ -# Maintainer: Dave Reisner -# Maintainer: Eric Bélanger -# Maintainer: Aaron Griffin - -pkgname=syslog-ng -pkgver=3.2.4 -pkgrel=3 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('base') -url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') -makedepends=('flex' 'pkg-config') -optdepends=('logrotate: for rotating log files') -provides=('logger') -options=('!libtool') -backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ - 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz - non-blocking-systemd-fds.patch - syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) -md5sums=('5995f7dad0053a478b60a63f6f754203' - '25e43afe51eb2223c25168e3c3e7aaf6' - '344dddfff946300f5576b13a7e8ea19f' - '735636090be4582885974542d2a75855' - '8b4441343d859c2f01c2cf799a7e6f98' - '46e5dcff71f820d497898331a3f608fe') -sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' - '73b83deae9a8b945dfb13adf331e6bf6f119b83e' - 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' - '4481819762fd1b6f25903016a8878e63c0058fcb' - 'f093a09626a528d23f0f2aeece018cab15a735a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix #22555 for kernels >=2.6.38 - patch -p1 -i ../cap_syslog.patch - - # fix systemd blocking FD bug - # https://bugzilla.balabit.com/show_bug.cgi?id=125 - patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch" - - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ - --enable-tcp-wrapper \ - --with-pidfile-dir=/var/run \ - --disable-spoof-source \ - --disable-tcp-wrapper \ - --enable-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" - install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" - install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" - install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" - install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service" -} diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch deleted file mode 100644 index b6e6db6e4..000000000 --- a/testing/syslog-ng/cap_syslog.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/lib/gprocess.h b/lib/gprocess.h -index cda35b0..5c449f7 100644 ---- a/lib/gprocess.h -+++ b/lib/gprocess.h -@@ -28,9 +28,14 @@ - #include "syslog-ng.h" - - #include -+#include - - #if ENABLE_LINUX_CAPS - # include -+# -+# ifndef CAP_SYSLOG -+# define CAP_SYSLOG 34 -+# endif - #endif - - typedef enum -@@ -78,5 +83,8 @@ void g_process_finish(void); - - void g_process_add_option_group(GOptionContext *ctx); - -+extern int kernel_version; -+extern void get_kernel_version(void); -+#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) - - #endif -diff --git a/modules/affile/affile.c b/modules/affile/affile.c -index e145324..886fa72 100644 ---- a/modules/affile/affile.c -+++ b/modules/affile/affile.c -@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags, - if (privileged) - { - g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE); -- g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ else -+ g_process_cap_modify(CAP_SYSLOG, TRUE); - } - else - { -diff --git a/syslog-ng/main.c b/syslog-ng/main.c -index 9880c1f..ee5031b 100644 ---- a/syslog-ng/main.c -+++ b/syslog-ng/main.c -@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE; - static gboolean display_version = FALSE; - static gchar *ctlfilename = PATH_CONTROL_SOCKET; - static gchar *preprocess_into = NULL; -+int kernel_version; - - static volatile sig_atomic_t sig_hup_received = FALSE; - static volatile sig_atomic_t sig_term_received = FALSE; -@@ -363,6 +364,20 @@ version(void) - ON_OFF_STR(ENABLE_PACCT_MODULE)); - } - -+void -+get_kernel_version(void) { -+ static struct utsname uts; -+ int x = 0, y = 0, z = 0; -+ -+ if (uname(&uts) == -1) { -+ fprintf(stderr, "Unable to retrieve kernel version.\n"); -+ exit(1); -+ } -+ -+ sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ kernel_version = LINUX_VERSION(x, y, z); -+} -+ - int - main(int argc, char *argv[]) - { -@@ -379,9 +394,20 @@ main(int argc, char *argv[]) - * indicate readability. Enabling/disabling cap_sys_admin on every poll - * invocation seems to be too expensive. So I enable it for now. */ - -- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 34)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," - "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p " - "cap_sys_admin=ep"); -+ else if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_sys_admin=p"); -+ else -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_syslog=p"); - ctx = g_option_context_new("syslog-ng"); - g_process_add_option_group(ctx); - msg_add_option_group(ctx); diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/testing/syslog-ng/non-blocking-systemd-fds.patch deleted file mode 100644 index bd056088b..000000000 --- a/testing/syslog-ng/non-blocking-systemd-fds.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2f214c4f87d944aa28d53e331a67b1fd88d9840f Mon Sep 17 00:00:00 2001 -From: Balazs Scheidler -Date: Wed, 22 Jun 2011 12:50:53 +0200 -Subject: [PATCH] systemd: make sure the acquired fd is in non-blocking mode - -The fd acquired from systemd is in blocking mode, and syslog-ng -didn't explicitly set it to non-blocking, causing syslog-ng -to stall. This patch changes that, explicitly enables -O_NONBLOCK and O_CLOEXEC on systemd acquired fds. - -Reported-By: Enrico Scholz -Signed-off-by: Balazs Scheidler ---- - modules/afsocket/afunix.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/modules/afsocket/afunix.c b/modules/afsocket/afunix.c -index cd9c205..9a4e37b 100644 ---- a/modules/afsocket/afunix.c -+++ b/modules/afsocket/afunix.c -@@ -108,6 +108,8 @@ afunix_sd_acquire_socket(AFSocketSourceDriver *s, gint *result_fd) - - if (*result_fd != -1) - { -+ g_fd_set_nonblock(*result_fd, TRUE); -+ g_fd_set_cloexec(*result_fd, TRUE); - msg_verbose("Acquired systemd socket", - evt_tag_str("filename", self->filename), - evt_tag_int("systemd-sock-fd", *result_fd), --- -1.7.5.4 - diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf deleted file mode 100644 index 6e3362681..000000000 --- a/testing/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,92 +0,0 @@ -@version: 3.2 -# -# /etc/syslog-ng/syslog-ng.conf -# - -options { - stats_freq (0); - flush_lines (0); - time_reopen (10); - log_fifo_size (1000); - long_hostnames(off); - use_dns (no); - use_fqdn (no); - create_dirs (no); - keep_hostname (yes); - perm(0640); - group("log"); -}; - -source src { - unix-dgram("/dev/log"); - internal(); - file("/proc/kmsg"); -}; - -destination d_authlog { file("/var/log/auth.log"); }; -destination d_syslog { file("/var/log/syslog.log"); }; -destination d_cron { file("/var/log/crond.log"); }; -destination d_daemon { file("/var/log/daemon.log"); }; -destination d_kernel { file("/var/log/kernel.log"); }; -destination d_lpr { file("/var/log/lpr.log"); }; -destination d_user { file("/var/log/user.log"); }; -destination d_uucp { file("/var/log/uucp.log"); }; -destination d_mail { file("/var/log/mail.log"); }; -destination d_news { file("/var/log/news.log"); }; -destination d_ppp { file("/var/log/ppp.log"); }; -destination d_debug { file("/var/log/debug.log"); }; -destination d_messages { file("/var/log/messages.log"); }; -destination d_errors { file("/var/log/errors.log"); }; -destination d_everything { file("/var/log/everything.log"); }; -destination d_iptables { file("/var/log/iptables.log"); }; -destination d_acpid { file("/var/log/acpid.log"); }; -destination d_console { usertty("root"); }; - -# Log everything to tty12 -destination console_all { file("/dev/tty12"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { program(syslog-ng); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern) and not filter(f_iptables); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_ppp { facility(local2); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; -filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; -filter f_emergency { level(emerg); }; -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; -filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; -filter f_acpid { program("acpid"); }; - -log { source(src); filter(f_acpid); destination(d_acpid); }; -log { source(src); filter(f_authpriv); destination(d_authlog); }; -log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_cron); destination(d_cron); }; -log { source(src); filter(f_daemon); destination(d_daemon); }; -log { source(src); filter(f_kernel); destination(d_kernel); }; -log { source(src); filter(f_lpr); destination(d_lpr); }; -log { source(src); filter(f_mail); destination(d_mail); }; -log { source(src); filter(f_news); destination(d_news); }; -log { source(src); filter(f_ppp); destination(d_ppp); }; -log { source(src); filter(f_user); destination(d_user); }; -log { source(src); filter(f_uucp); destination(d_uucp); }; -#log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); filter(f_messages); destination(d_messages); }; -log { source(src); filter(f_err); destination(d_errors); }; -log { source(src); filter(f_emergency); destination(d_console); }; -log { source(src); filter(f_everything); destination(d_everything); }; -log { source(src); filter(f_iptables); destination(d_iptables); }; - -# Log everything to tty12 -#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate deleted file mode 100644 index e0e6929f2..000000000 --- a/testing/syslog-ng/syslog-ng.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { - missingok - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc deleted file mode 100755 index bb5320b2c..000000000 --- a/testing/syslog-ng/syslog-ng.rc +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -checkconfig() { - syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf - if [ $? -gt 0 ]; then - stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." - stat_fail - exit 0 - fi -} - -PID=`pidof -o %PPID /usr/sbin/syslog-ng` -case "$1" in - start) - stat_busy "Starting Syslog-NG" - checkconfig - [ -z "$PID" ] && /usr/sbin/syslog-ng - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon syslog-ng - stat_done - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/syslog-ng.pid -# Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/ - rm -f /var/syslog-ng.persist - rm_daemon syslog-ng - stat_done - fi - ;; - reload) - stat_busy "Reloading Syslog-NG configuration and re-opening log files" - if [ -z "$PID" ]; then - stat_fail - else - checkconfig - kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/testing/tftp-hpa/LICENSE b/testing/tftp-hpa/LICENSE deleted file mode 100644 index 6dade6984..000000000 --- a/testing/tftp-hpa/LICENSE +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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/testing/tftp-hpa/PKGBUILD b/testing/tftp-hpa/PKGBUILD deleted file mode 100644 index 72034141e..000000000 --- a/testing/tftp-hpa/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 131856 2011-07-16 06:36:05Z tpowa $ -# Maintainer: dorphell -# Contributor: Jose Javier -pkgname=tftp-hpa -pkgver=5.1 -pkgrel=1 -pkgdesc="Official tftp server" -arch=('i686' 'x86_64') -url="http://www.kernel.org/pub/software/network/tftp/" -license=('BSD') -depends=('readline>=6.0.00') -conflicts=('netkit-tftp') -backup=('etc/conf.d/tftpd') -source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALLROOT="${pkgdir}" install - install -d "${pkgdir}/etc/rc.d" - install -d "${pkgdir}/var/tftpboot" - install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" - install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" - rm "${pkgdir}/usr/share/man/man8/tftpd.8" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('d086b1bd6e5ed6375ad407e273afccdf' - '83fbb6f52205d95951a3c059e5351ca2' - '414a79dc891bced056d99a9bb790fc9e' - '6ce21e27b6fdc1a1adf85c81e42aeecf') diff --git a/testing/tftp-hpa/tftpd.conf b/testing/tftp-hpa/tftpd.conf deleted file mode 100644 index 4705cc3a9..000000000 --- a/testing/tftp-hpa/tftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to TFTPD -# -TFTPD_ARGS="-l -s /var/tftpboot" diff --git a/testing/tftp-hpa/tftpd.rc b/testing/tftp-hpa/tftpd.rc deleted file mode 100755 index 0222d1693..000000000 --- a/testing/tftp-hpa/tftpd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -TFTPD_ARGS= -[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd - -PID=$(pidof -o %PPID /usr/sbin/in.tftpd) -case "$1" in - start) - stat_busy "Starting TFTPD" - [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping TFTPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tftpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/vsftpd/PKGBUILD b/testing/vsftpd/PKGBUILD deleted file mode 100644 index c35fe02de..000000000 --- a/testing/vsftpd/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $ -# Maintainer: Andreas Radke -# Contributor: judd - -pkgname=vsftpd -pkgver=2.3.4 -pkgrel=2 -pkgdesc="Very Secure FTP daemon" -arch=('i686' 'x86_64') -url="https://security.appspot.com/vsftpd.html" -license=('GPL2') -depends=('openssl') -backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') -install=vsftpd.install -source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" - 'vsftpd.xinetd' 'vsftpd.d') -md5sums=('2ea5d19978710527bb7444d93b67767a' - 'b07fd4609c70063c1d6b20142910c1a6' - '60060a6c7db3b3b7baa1561a302e6923') -sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # build-time config - sed \ - -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ - -i builddefs.h - make CFLAGS="${CFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" - install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" - install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" - install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" - install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" - install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" - - install -d -m755 "${pkgdir}/usr/share/empty" -} diff --git a/testing/vsftpd/vsftpd.d b/testing/vsftpd/vsftpd.d deleted file mode 100644 index 27310855c..000000000 --- a/testing/vsftpd/vsftpd.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name & - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/testing/vsftpd/vsftpd.install b/testing/vsftpd/vsftpd.install deleted file mode 100644 index 48f134e24..000000000 --- a/testing/vsftpd/vsftpd.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then - echo ">>> It appears that your current kernel has linux security" - echo ">>> capabilities built as a module. vsftpd requires this" - echo ">>> functionality to operate." - echo ">>>" - echo ">>> To activate the module, please load it now (modprobe capability)." - echo ">>> Also, you should add it to your MODULES array in rc.conf, so" - echo ">>> it will be activated automatically at boot-up." - fi -} - -post_upgrade() { - post_install $1 -} - diff --git a/testing/vsftpd/vsftpd.xinetd b/testing/vsftpd/vsftpd.xinetd deleted file mode 100644 index eff2eb3db..000000000 --- a/testing/vsftpd/vsftpd.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/testing/xinetd/PKGBUILD b/testing/xinetd/PKGBUILD deleted file mode 100644 index 27bf3b2a0..000000000 --- a/testing/xinetd/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ -# Maintainer: -# Contributor: Judd - -pkgname=xinetd -pkgver=2.3.14 -pkgrel=7 -pkgdesc="A secure replacement for inetd" -arch=('i686' 'x86_64') -url="http://www.xinetd.org/" -license=('custom') -optdepends=('perl: for xconv.pl script') -backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') -source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz - xinetd.conf - xinetd - servers - services) -md5sums=('567382d7972613090215c6c54f9b82d9' - 'f109f699a07bc8cfb5791060f5e87f9e' - 'ea37a2794f202e6b953d9b6956dad16a' - '21f47b4aa20921cfaddddd9f9a407f81' - '9fa2061dc7dd738c8424251deb86f81e') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --without-libwrap - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - - install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd - install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf - install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers - install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services - - # install license - install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT -} diff --git a/testing/xinetd/servers b/testing/xinetd/servers deleted file mode 100644 index f064c8d7a..000000000 --- a/testing/xinetd/servers +++ /dev/null @@ -1,10 +0,0 @@ -service servers -{ - type = INTERNAL UNLISTED - port = 9099 - socket_type = stream - protocol = tcp - wait = no - disable = yes - only_from = 127.0.0.1 -} diff --git a/testing/xinetd/services b/testing/xinetd/services deleted file mode 100644 index 4ea304c4f..000000000 --- a/testing/xinetd/services +++ /dev/null @@ -1,10 +0,0 @@ -service services -{ - type = INTERNAL UNLISTED - port = 9098 - socket_type = stream - protocol = tcp - wait = no - disable = yes - only_from = 127.0.0.1 -} diff --git a/testing/xinetd/xinetd b/testing/xinetd/xinetd deleted file mode 100755 index 4b8fa369a..000000000 --- a/testing/xinetd/xinetd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/xinetd` -case "$1" in - start) - stat_busy "Starting xinetd" - [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/xinetd.pid - add_daemon xinetd - stat_done - fi - ;; - stop) - stat_busy "Stopping xinetd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/xinetd.pid - rm_daemon xinetd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/xinetd/xinetd.conf b/testing/xinetd/xinetd.conf deleted file mode 100644 index b15d9f649..000000000 --- a/testing/xinetd/xinetd.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# /etc/xinetd.conf -# - -defaults -{ - instances = 60 - log_type = SYSLOG authpriv - log_on_success = HOST PID - log_on_failure = HOST - cps = 25 30 -} - -includedir /etc/xinetd.d -- cgit v1.2.3-54-g00ecf