Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/keysafe/PKGBUILD
	community/lesspipe/PKGBUILD
	community/xchat-systray-integration/PKGBUILD
	core/gen-init-cpio/PKGBUILD
	extra/xarchiver/PKGBUILD

13 files changed, 0 insertions, 894 deletions

diff --git a/staging/mysql/PKGBUILD b/staging/mysql/PKGBUILD
deleted file mode 100644
index 54248034e..000000000
--- a/staging/mysql/PKGBUILD
+++ /dev/null
@@ -1,130 +0,0 @@
-# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-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/staging/mysql/my.cnf b/staging/mysql/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/staging/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=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> 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     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <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/staging/mysql/mysql.install b/staging/mysql/mysql.install
deleted file mode 100644
index 9a4479215..000000000
--- a/staging/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/staging/mysql/mysqld b/staging/mysql/mysqld
deleted file mode 100755
index 1ac88a7cc..000000000
--- a/staging/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/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD
deleted file mode 100644
index a1f72cb01..000000000
--- a/staging/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Dale Blount <dale@archlinux.org>
-
-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/staging/net-snmp/libnl-2.patch b/staging/net-snmp/libnl-2.patch
deleted file mode 100644
index 7c140fe83..000000000
--- a/staging/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/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc
deleted file mode 100644
index 9f1b83f64..000000000
--- a/staging/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/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD
deleted file mode 100644
index bf45e6396..000000000
--- a/staging/openssh/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 131644 2011-07-13 07:48:58Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-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/staging/openssh/authfile.c.patch b/staging/openssh/authfile.c.patch
deleted file mode 100644
index 6c18fe807..000000000
--- a/staging/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 <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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/staging/openssh/sshd b/staging/openssh/sshd
deleted file mode 100755
index 2ee1091f0..000000000
--- a/staging/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/staging/openssh/sshd.confd b/staging/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/staging/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/staging/openssh/sshd.pam b/staging/openssh/sshd.pam
deleted file mode 100644
index ff8829fe9..000000000
--- a/staging/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/staging/socat/PKGBUILD b/staging/socat/PKGBUILD
deleted file mode 100644
index 458009ce3..000000000
--- a/staging/socat/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-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
-}