diff options
90 files changed, 6735 insertions, 98 deletions
diff --git a/community-staging/qwtpolar-svn/PKGBUILD b/community-staging/qwtpolar-svn/PKGBUILD new file mode 100644 index 000000000..79de737a4 --- /dev/null +++ b/community-staging/qwtpolar-svn/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Kévin Guilloy <kevin at guilloy dot ath dot cx> + +pkgname=qwtpolar-svn +pkgver=122 +pkgrel=1 +pkgdesc='An extension of the Qwt library to support polar plots.' +arch=('i686' 'x86_64') +url="http://qwtpolar.sourceforge.net/" +license=('Qwt License, Version 1.0') +depends=('qwt') +conflicts=('qwtpolar') +makedepends=('subversion') + +_svntrunk='https://qwtpolar.svn.sourceforge.net/svnroot/qwtpolar/trunk/qwtpolar' +_svnmod='qwtpolar' + +build() { + svn co ${_svntrunk} ${_svnmod} + + msg 'SVN checkout or server timeout' + msg 'Building sofware...' + + cd qwtpolar/ + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/doc/\/usr\/share\/doc\/qwt\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/include/\/usr\/include\/qwt\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/lib/\/usr\/lib\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/features/\/usr\/share\/qwt\/features\//' qwtpolarconfig.pri + sed -i -e 's/^.*QwtPolarDesigner//' qwtpolarconfig.pri + sed -i -e 's/^.*QwtPolarExamples//' qwtpolarconfig.pri + echo "INCLUDEPATH += /usr/include/qwt" >> qwtpolarbuild.pri + + qmake + + make +} + +package() { + cd qwtpolar + + make INSTALL_ROOT=${pkgdir} install + + install -d ${pkgdir}/usr/share/licenses/qwtpolar-svn + install -m644 COPYING \ + ${pkgdir}/usr/share/licenses/qwtpolar-svn +} diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog new file mode 100644 index 000000000..16eab50c2 --- /dev/null +++ b/community-testing/exim/ChangeLog @@ -0,0 +1,26 @@ +2011-07-15 Angel Velasquez <angvp@archlinux.org> + * Rebuilt without tcp_wrappers + * Fixing logrotate issue FS#25094 + * ChangeLog file changed name from exim.changelog to ChangeLog + +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Rebuilt against db 5.2.28 + +2010-05-09 Angel Velasquez <angvp@archlinux.org> + * Updated to 4.76 + * Removed previous patch since is no longer needed + * Removed newaliases script FS#22744 + * Removed sudo dependency + +2010-05-07 Angel Velasquez <angvp@archlinux.org> + * Adding patch for security issue see: http://goo.gl/QBict + +2010-05-06 Angel Velasquez <angvp@archlinux.org> + * Setting sticky id to deliver mail. Closes FS#24109 + +2010-04-30 Angel Velasquez <angvp@archlinux.org> + * exim 4.75 + * Config updated with the aliases path. Closes FS#22743 + * Removed sed hackings and added a exim.Makefile . Closes FS#22744 + * Replaced creation of the user at build time. Closes FS#22745 + diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD new file mode 100644 index 000000000..536afe51d --- /dev/null +++ b/community-testing/exim/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 51832 2011-07-16 03:09:57Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: judd <jvinet@zeroflux.org> +pkgname=exim +pkgver=4.76 +pkgrel=3 +pkgdesc="A Message Transfer Agent" +arch=(i686 x86_64) +url="http://www.exim.org/" +license=('GPL') +backup=(etc/mail/aliases etc/mail/exim.conf \ + etc/logrotate.d/exim etc/conf.d/exim) +install=exim.install +changelog=ChangeLog +depends=('db' 'pcre' 'pam' 'openssl' 'libldap') +provides=('smtp-server') +conflicts=('smtp-server') +options=('!makeflags') +source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.tar.bz2 + aliases + exim + exim.logrotate + exim.conf.d + exim.Makefile + ) +md5sums=('58e784b33c7a2ab335ec6400346d6362' + '4874006f0585253ddab027d441009757' + '9aed772e87223213e8da9ca5e7376869' + 'e18a535218718c5eb394ed5c9296fe06' + 'b75fe4c6e960a59a25b5f51e8f61ba3a' + '61e76543476f52f136c1d6c80ac1c5a1') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h + # Make some configuration changes + cp ${srcdir}/${pkgname}.Makefile Local/Makefile + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim + install -D -m644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim + install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 + install -D -m755 ../exim ${pkgdir}/etc/rc.d/exim + mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ + ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin} + chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim + cd build-Linux-* + for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ + exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ + exim_fixdb eximstats exinext exiqgrep exiwhat + do + install -m 0755 $i ${pkgdir}/usr/sbin + done + + cd ${srcdir}/exim-${pkgver}/src + sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \ + sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ + >${pkgdir}/etc/mail/exim.conf + + cp ${srcdir}/aliases ${pkgdir}/etc/mail + cd ${pkgdir}/usr/sbin + for i in mailq rmail rsmtp runq sendmail + do + ln -s exim $i + done + # fhs compliancy + ln -s ../sbin/exim ../lib/sendmail + + mkdir -p ${pkgdir}/etc/rc.d + cp ${srcdir}/exim ${pkgdir}/etc/rc.d +} diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases new file mode 100644 index 000000000..5a76ff7d5 --- /dev/null +++ b/community-testing/exim/aliases @@ -0,0 +1,35 @@ +# +# /etc/mail/aliases +# +# NOTE: Make sure you run 'newaliases' after modifying this file +# + +# Basic system aliases -- these MUST be present. +MAILER-DAEMON: postmaster +postmaster: root +hostmaster: root +webmaster: hostmaster +ftpmaster: hostmaster +admin: hostmaster +administrator: hostmaster + +# General redirections for pseudo accounts. +bin: root +daemon: root +games: root +ingres: root +nobody: root +system: root +toor: root +uucp: root + +# Well-known aliases. +manager: root +dumper: root +operator: root + +# trap decode to catch security attacks +decode: root + +# Person who should get root's mail +#root: diff --git a/community-testing/exim/exim b/community-testing/exim/exim new file mode 100755 index 000000000..8e9640b32 --- /dev/null +++ b/community-testing/exim/exim @@ -0,0 +1,42 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/exim` + +case "$1" in + start) + stat_busy "Starting Exim" + [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon exim + stat_done + fi + ;; + stop) + stat_busy "Stopping Exim" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/exim.pid + rm_daemon exim + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile new file mode 100644 index 000000000..125f87dfb --- /dev/null +++ b/community-testing/exim/exim.Makefile @@ -0,0 +1,1227 @@ +# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ + +################################################## +# The Exim mail transport agent # +################################################## + +# This is the template for Exim's main build-time configuration file. It +# contains settings that are independent of any operating system. These are +# things that are mostly sysadmin choices. The items below are divided into +# those you must specify, those you probably want to specify, those you might +# often want to specify, and those that you almost never need to mention. + +# Edit this file and save the result to a file called Local/Makefile within the +# Exim distribution directory before running the "make" command. + +# Things that depend on the operating system have default settings in +# OS/Makefile-Default, but these are overridden for some OS by files called +# called OS/Makefile-<osname>. You can further override these by creating files +# called Local/Makefile-<osname>, where "<osname>" stands for the name of your +# operating system - look at the names in the OS directory to see which names +# are recognized. + +# However, if you are building Exim for a single OS only, you don't need to +# worry about setting up Local/Makefile-<osname>. Any build-time configuration +# settings you require can in fact be placed in the one file called +# Local/Makefile. It is only if you are building for several OS from the same +# source files that you need to worry about splitting off your own OS-dependent +# settings into separate files. (There's more explanation about how this all +# works in the toplevel README file, under "Modifying the building process", as +# well as in the Exim specification.) + +# One OS-specific thing that may need to be changed is the command for running +# the C compiler; the overall default is gcc, but some OS Makefiles specify cc. +# You can override anything that is set by putting CC=whatever in your +# Local/Makefile. + +# NOTE: You should never need to edit any of the distributed Makefiles; all +# overriding can be done in your Local/Makefile(s). This will make it easier +# for you when the next release comes along. + +# The location of the X11 libraries is something else that is quite variable +# even between different versions of the same operating system (and indeed +# there are different versions of X11 as well, of course). The four settings +# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB +# (dynamic run-time library). You need not worry about X11 unless you want to +# compile the Exim monitor utility. Exim itself does not use X11. + +# Another area of variability between systems is the type and location of the +# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. +# By default the code assumes ndbm; this often works with gdbm or DB, provided +# they are correctly installed, via their compatibility interfaces. However, +# Exim can also be configured to use the native calls for Berkeley DB (obsolete +# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm. + +# For some operating systems, a default DBM library (other than ndbm) is +# selected by a setting in the OS-specific Makefile. Most modern OS now have +# a DBM library installed as standard, and in many cases this will be selected +# for you by the OS-specific configuration. If Exim compiles without any +# problems, you probably do not have to worry about the DBM library. If you +# do want or need to change it, you should first read the discussion in the +# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's +# interface to the DBM library. + +# In Local/Makefiles blank lines and lines starting with # are ignored. It is +# also permitted to use the # character to add a comment to a setting, for +# example +# +# EXIM_GID=42 # the "mail" group +# +# However, with some versions of "make" this works only if there is no white +# space between the end of the setting and the #, so perhaps it is best +# avoided. A consequence of this facility is that it is not possible to have +# the # character present in any setting, but I can't think of any cases where +# this would be wanted. +############################################################################### + + + +############################################################################### +# THESE ARE THINGS YOU MUST SPECIFY # +############################################################################### + +# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and +# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number. + +# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it +# really is a very good idea to specify it here rather than at run time. This +# is particularly true if you let the logs go to their default location in the +# spool directory, because it means that the location of the logs is known +# before Exim has read the run time configuration file. + +#------------------------------------------------------------------------------ +# BIN_DIRECTORY defines where the exim binary will be installed by "make +# install". The path is also used internally by Exim when it needs to re-invoke +# itself, either to send an error message, or to recover root privilege. Exim's +# utility binaries and scripts are also installed in this directory. There is +# no "standard" place for the binary directory. Some people like to keep all +# the Exim files under one directory such as /usr/exim; others just let the +# Exim binaries go into an existing directory such as /usr/sbin or +# /usr/local/sbin. The installation script will try to create this directory, +# and any superior directories, if they do not exist. + +BIN_DIRECTORY=/usr/sbin + + +#------------------------------------------------------------------------------ +# CONFIGURE_FILE defines where Exim's run time configuration file is to be +# found. It is the complete pathname for the file, not just a directory. The +# location of all other run time files and directories can be changed in the +# run time configuration file. There is a lot of variety in the choice of +# location in different OS, and in the preferences of different sysadmins. Some +# common locations are in /etc or /etc/mail or /usr/local/etc or +# /usr/local/etc/mail. Another possibility is to keep all the Exim files under +# a single directory such as /usr/exim. Whatever you choose, the installation +# script will try to make the directory and any superior directories if they +# don't exist. It will also install a default runtime configuration if this +# file does not exist. + +CONFIGURE_FILE=/etc/mail/exim.conf + +# It is possible to specify a colon-separated list of files for CONFIGURE_FILE. +# In this case, Exim will use the first of them that exists when it is run. +# However, if a list is specified, the installation script no longer tries to +# make superior directories or to install a default runtime configuration. + + +#------------------------------------------------------------------------------ +# The Exim binary must normally be setuid root, so that it starts executing as +# root, but (depending on the options with which it is called) it does not +# always need to retain the root privilege. These settings define the user and +# group that is used for Exim processes when they no longer need to be root. In +# particular, this applies when receiving messages and when doing remote +# deliveries. (Local deliveries run as various non-root users, typically as the +# owner of a local mailbox.) Specifying these values as root is not supported. + +EXIM_USER=ref:exim + +# If you specify EXIM_USER as a name, this is looked up at build time, and the +# uid number is built into the binary. However, you can specify that this +# lookup is deferred until runtime. In this case, it is the name that is built +# into the binary. You can do this by a setting of the form: + +# EXIM_USER=ref:exim + +# In other words, put "ref:" in front of the user name. If you set EXIM_USER +# like this, any value specified for EXIM_GROUP is also passed "by reference". +# Although this costs a bit of resource at runtime, it is convenient to use +# this feature when building binaries that are to be run on multiple systems +# where the name may refer to different uids. It also allows you to build Exim +# on a system where there is no Exim user defined. + +# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must +# also be a setting of EXIM_GROUP. If, on the other hand, you use a name +# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless +# you want to use a group other than the default group for the given user. + +# EXIM_GROUP= + +# Many sites define a user called "exim", with an appropriate default group, +# and use +# +# EXIM_USER=exim +# +# while leaving EXIM_GROUP unspecified (commented out). + + +#------------------------------------------------------------------------------ +# SPOOL_DIRECTORY defines the directory where all the data for messages in +# transit is kept. It is strongly recommended that you define it here, though +# it is possible to leave this till the run time configuration. + +# Exim creates the spool directory if it does not exist. The owner and group +# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to +# all the files and directories that are created in the spool directory. + +# Almost all installations choose this: + +SPOOL_DIRECTORY=/var/spool/exim + + + +############################################################################### +# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # +############################################################################### + +# If you need extra header file search paths on all compiles, put the -I +# options in INCLUDE. If you want the extra searches only for certain +# parts of the build, see more specific xxx_INCLUDE variables below. + +# INCLUDE=-I/example/include + +# You need to specify some routers and transports if you want the Exim that you +# are building to be capable of delivering mail. You almost certainly need at +# least one type of lookup. You should consider whether you want to build +# the Exim monitor or not. + + +#------------------------------------------------------------------------------ +# These settings determine which individual router drivers are included in the +# Exim binary. There are no defaults in the code; those routers that are wanted +# must be defined here by setting the appropriate variables to the value "yes". +# Including a router in the binary does not cause it to be used automatically. +# It has also to be configured in the run time configuration file. By +# commenting out those you know you don't want to use, you can make the binary +# a bit smaller. If you are unsure, leave all of these included for now. + +ROUTER_ACCEPT=yes +ROUTER_DNSLOOKUP=yes +ROUTER_IPLITERAL=yes +ROUTER_MANUALROUTE=yes +ROUTER_QUERYPROGRAM=yes +ROUTER_REDIRECT=yes + +# This one is very special-purpose, so is not included by default. + +# ROUTER_IPLOOKUP=yes + + +#------------------------------------------------------------------------------ +# These settings determine which individual transport drivers are included in +# the Exim binary. There are no defaults; those transports that are wanted must +# be defined here by setting the appropriate variables to the value "yes". +# Including a transport in the binary does not cause it to be used +# automatically. It has also to be configured in the run time configuration +# file. By commenting out those you know you don't want to use, you can make +# the binary a bit smaller. If you are unsure, leave all of these included for +# now. + +TRANSPORT_APPENDFILE=yes +TRANSPORT_AUTOREPLY=yes +TRANSPORT_PIPE=yes +TRANSPORT_SMTP=yes + +# This one is special-purpose, and commonly not required, so it is not +# included by default. + +TRANSPORT_LMTP=yes + + +#------------------------------------------------------------------------------ +# The appendfile transport can write messages to local mailboxes in a number +# of formats. The code for three specialist formats, maildir, mailstore, and +# MBX, is included only when requested. If you do not know what this is about, +# leave these settings commented out. + +SUPPORT_MAILDIR=yes +# SUPPORT_MAILSTORE=yes +# SUPPORT_MBX=yes + + +#------------------------------------------------------------------------------ +# See below for dynamic lookup modules. +# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ +# If not using package management but using this anyway, then think about how +# you perform upgrades and revert them. You should consider the benefit of +# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can +# maintain two concurrent sets of modules. + +# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for +# your platform. Eg: +# CFLAGS_DYNAMIC=-shared -rdynamic +# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC + +#------------------------------------------------------------------------------ +# These settings determine which file and database lookup methods are included +# in the binary. See the manual chapter entitled "File and database lookups" +# for discussion. DBM and lsearch (linear search) are included by default. If +# you are unsure about the others, leave them commented out for now. +# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is +# for the specialist case of using the DNS as a general database facility (not +# common). +# If set to "2" instead of "yes" then the corresponding lookup will be +# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to +# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to +# EXTRALIBS so that dlopen() is available to Exim. You need to define +# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup +# modules. +# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and +# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS +# (where * is the name as given here in this list). That ensures that only +# the dynamic library and not the exim binary will be linked against the +# library. +# NOTE: LDAP cannot be built as a module! + +LOOKUP_DBM=yes +LOOKUP_LSEARCH=yes +LOOKUP_DNSDB=yes + +# LOOKUP_CDB=yes +LOOKUP_DSEARCH=yes +# LOOKUP_IBASE=yes +LOOKUP_LDAP=yes +# LOOKUP_MYSQL=yes +# LOOKUP_NIS=yes +# LOOKUP_NISPLUS=yes +# LOOKUP_ORACLE=yes +# LOOKUP_PASSWD=yes +# LOOKUP_PGSQL=yes +# LOOKUP_SQLITE=yes +# LOOKUP_WHOSON=yes + +# These two settings are obsolete; all three lookups are compiled when +# LOOKUP_LSEARCH is enabled. However, we retain these for backward +# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. + +# LOOKUP_WILDLSEARCH=yes +# LOOKUP_NWILDLSEARCH=yes + + +#------------------------------------------------------------------------------ +# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate +# which LDAP library you have. Unfortunately, though most of their functions +# are the same, there are minor differences. Currently Exim knows about four +# LDAP libraries: the one from the University of Michigan (also known as +# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes +# with Solaris 7 onwards. Uncomment whichever of these you are using. + +# LDAP_LIB_TYPE=OPENLDAP1 +LDAP_LIB_TYPE=OPENLDAP2 +# LDAP_LIB_TYPE=NETSCAPE +# LDAP_LIB_TYPE=SOLARIS + +# If you don't set any of these, Exim assumes the original University of +# Michigan (OpenLDAP 1) library. + + +#------------------------------------------------------------------------------ +# The PCRE library is required for exim. There is no longer an embedded +# version of the PCRE library included with the source code, instead you +# must use a system library or build your own copy of PCRE. +# In either case you must specify the library link info here. If the +# PCRE header files are not in the standard search path you must also +# modify the INCLUDE path (above) +# The default setting of PCRE_LIBS should work on the vast majority of +# systems + +PCRE_LIBS=-lpcre + + +#------------------------------------------------------------------------------ +# Additional libraries and include directories may be required for some +# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on +# the command for linking Exim itself, not on any auxiliary programs. You +# don't need to set LOOKUP_INCLUDE if the relevant directories are already +# specified in INCLUDE. The settings below are just examples; -lpq is for +# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. + +# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include +# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 + + +#------------------------------------------------------------------------------ +# Compiling the Exim monitor: If you want to compile the Exim monitor, a +# program that requires an X11 display, then EXIM_MONITOR should be set to the +# value "eximon.bin". Comment out this setting to disable compilation of the +# monitor. The locations of various X11 directories for libraries and include +# files are defaulted in the OS/Makefile-Default file, but can be overridden in +# local OS-specific make files. + + + + +#------------------------------------------------------------------------------ +# Compiling Exim with content scanning support: If you want to compile Exim +# with support for message body content scanning, set WITH_CONTENT_SCAN to +# the value "yes". This will give you malware and spam scanning in the DATA ACL, +# and the MIME ACL. Please read the documentation to learn more about these +# features. + +WITH_CONTENT_SCAN=yes + +# If you want to use the deprecated "demime" condition in the DATA ACL, +# uncomment the line below. Doing so will also explicitly turn on the +WITH_CONTENT_SCAN=yes +# the "demime" condition. + +WITH_OLD_DEMIME=yes + +# If you're using ClamAV and are backporting fixes to an old version, instead +# of staying current (which is the more usual approach) then you may need to +# use an older API which uses a STREAM command, now deprecated, instead of +# zINSTREAM. If you need to set this, please let the Exim developers know, as +# if nobody reports a need for it, we'll remove this option and clean up the +# code. zINSTREAM was introduced with ClamAV 0.95. +# +# WITH_OLD_CLAMAV_STREAM=yes + +#------------------------------------------------------------------------------ +# By default Exim includes code to support DKIM (DomainKeys Identified +# Mail, RFC4871) signing and verification. Verification of signatures is +# turned on by default. See the spec for information on conditionally +# disabling it. To disable the inclusion of the entire feature, set +# DISABLE_DKIM to "yes" + +# DISABLE_DKIM=yes + + +#------------------------------------------------------------------------------ +# Compiling Exim with experimental features. These are documented in +# experimental-spec.txt. "Experimental" means that the way these features are +# implemented may still change. Backward compatibility is not guaranteed. + +# Uncomment the following lines to add SPF support. You need to have libspf2 +# installed on your system (www.libspf2.org). Depending on where it is installed +# you may have to edit the CFLAGS and LDFLAGS lines. + +# EXPERIMENTAL_SPF=yes +# CFLAGS += -I/usr/local/include +# LDFLAGS += -lspf2 + +# Uncomment the following lines to add SRS (Sender rewriting scheme) support. +# You need to have libsrs_alt installed on your system (srs.mirtol.com). +# Depending on where it is installed you may have to edit the CFLAGS and +# LDFLAGS lines. + +# EXPERIMENTAL_SRS=yes +# CFLAGS += -I/usr/local/include +# LDFLAGS += -lsrs_alt + +# Uncomment the following lines to add Brightmail AntiSpam support. You need +# to have the Brightmail client SDK installed. Please check the experimental +# documentation for implementation details. You need to edit the CFLAGS and +# LDFLAGS lines. + +# EXPERIMENTAL_BRIGHTMAIL=yes +# CFLAGS += -I/opt/brightmail/bsdk-6.0/include +# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib + + + +############################################################################### +# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # +############################################################################### + +# The items in this section are those that are commonly changed according to +# the sysadmin's preferences, but whose defaults are often acceptable. The +# first five are concerned with security issues, where differing levels of +# paranoia are appropriate in different environments. Sysadmins also vary in +# their views on appropriate levels of defence in these areas. If you do not +# understand these issues, go with the defaults, which are used by many sites. + + +#------------------------------------------------------------------------------ +# Although Exim is normally a setuid program, owned by root, it refuses to run +# local deliveries as root by default. There is a runtime option called +# "never_users" which lists the users that must never be used for local +# deliveries. There is also the setting below, which provides a list that +# cannot be overridden at runtime. This guards against problems caused by +# unauthorized changes to the runtime configuration. You are advised not to +# remove "root" from this option, but you can add other users if you want. The +# list is colon-separated. It must NOT contain any spaces. + +# FIXED_NEVER_USERS=root:bin:daemon +FIXED_NEVER_USERS=root + + +#------------------------------------------------------------------------------ +# By default, Exim insists that its configuration file be owned by root. You +# can specify one additional permitted owner here. + +# CONFIGURE_OWNER= + +# If the configuration file is group-writeable, Exim insists by default that it +# is owned by root. You can specify one additional permitted group owner here. + +# CONFIGURE_GROUP= + +# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked +# up at build time, and the uid or gid number is built into the binary. +# However, you can specify that the lookup is deferred until runtime. In this +# case, it is the name that is built into the binary. You can do this by a +# setting of the form: + +# CONFIGURE_OWNER=ref:mail +# CONFIGURE_GROUP=ref:sysadmin + +# In other words, put "ref:" in front of the user or group name. Although this +# costs a bit of resource at runtime, it is convenient to use this feature when +# building binaries that are to be run on multiple systems where the names may +# refer to different uids or gids. It also allows you to build Exim on a system +# where the relevant user or group is not defined. + + +#------------------------------------------------------------------------------ +# The -C option allows Exim to be run with an alternate runtime configuration +# file. When this is used by root, root privilege is retained by the binary +# (for any other caller including the Exim user, it is dropped). You can +# restrict the location of alternate configurations by defining a prefix below. +# Any file used with -C must then start with this prefix (except that /dev/null +# is also permitted if the caller is root, because that is used in the install +# script). If the prefix specifies a directory that is owned by root, a +# compromise of the Exim account does not permit arbitrary alternate +# configurations to be used. The prefix can be more restrictive than just a +# directory (the second example). + +# ALT_CONFIG_PREFIX=/some/directory/ +# ALT_CONFIG_PREFIX=/some/directory/exim.conf- + + +#------------------------------------------------------------------------------ +# When a user other than root uses the -C option to override the configuration +# file (including the Exim user when re-executing Exim to regain root +# privileges for local message delivery), this will normally cause Exim to +# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which +# contains a list of trusted configuration filenames, one per line. If the -C +# option is used by the Exim user or by the user specified in the +# CONFIGURE_OWNER setting, to specify a configuration file which is listed in +# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. + +# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs + + +#------------------------------------------------------------------------------ +# Uncommenting this option disables the use of the -D command line option, +# which changes the values of macros in the runtime configuration file. +# This is another protection against somebody breaking into the Exim account. + +# DISABLE_D_OPTION=yes + + +#------------------------------------------------------------------------------ +# By contrast, you might be maintaining a system which relies upon the ability +# to override values with -D and assumes that these will be passed through to +# the delivery processes. As of Exim 4.73, this is no longer the case by +# default. Going forward, we strongly recommend that you use a shim Exim +# configuration file owned by root stored under TRUSTED_CONFIG_LIST. +# That shim can set macros before .include'ing your main configuration file. +# +# As a strictly transient measure to ease migration to 4.73, the +# WHITELIST_D_MACROS value definies a colon-separated list of macro-names +# which are permitted to be overriden from the command-line which will be +# honoured by the Exim user. So these are macros that can persist to delivery +# time. +# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the +# command-line are filtered to only permit: [A-Za-z0-9_/.-]* +# +# This option is highly likely to be removed in a future release. It exists +# only to make 4.73 as easy as possible to migrate to. If you use it, we +# encourage you to schedule time to rework your configuration to not depend +# upon it. Most people should not need to use this. +# +# By default, no macros are whitelisted for -D usage. + +# WHITELIST_D_MACROS=TLS:SPOOL + +#------------------------------------------------------------------------------ +# Exim has support for the AUTH (authentication) extension of the SMTP +# protocol, as defined by RFC 2554. If you don't know what SMTP authentication +# is, you probably won't want to include this code, so you should leave these +# settings commented out. If you do want to make use of SMTP authentication, +# you must uncomment at least one of the following, so that appropriate code is +# included in the Exim binary. You will then need to set up the run time +# configuration to make use of the mechanism(s) selected. + +AUTH_CRAM_MD5=yes +# AUTH_CYRUS_SASL=yes +AUTH_DOVECOT=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes + + +#------------------------------------------------------------------------------ +# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the +# Cyrus SASL library installed before trying to build Exim, and you probably +# want to uncomment the following line: + +# AUTH_LIBS=-lsasl2 + + +#------------------------------------------------------------------------------ +# When Exim is decoding MIME "words" in header lines, most commonly for use +# in the $header_xxx expansion, it converts any foreign character sets to the +# one that is set in the headers_charset option. The default setting is +# defined by this setting: + +HEADERS_CHARSET="ISO-8859-1" + +# If you are going to make use of $header_xxx expansions in your configuration +# file, or if your users are going to use them in filter files, and the normal +# character set on your host is something other than ISO-8859-1, you might +# like to specify a different default here. This value can be overridden in +# the runtime configuration, and it can also be overridden in individual filter +# files. +# +# IMPORTANT NOTE: The iconv() function is needed for character code +# conversions. Please see the next item... + + +#------------------------------------------------------------------------------ +# Character code conversions are possible only if the iconv() function is +# installed on your operating system. There are two places in Exim where this +# is relevant: (a) The $header_xxx expansion (see the previous item), and (b) +# the Sieve filter support. For those OS where iconv() is known to be installed +# as standard, the file in OS/Makefile-xxxx contains +# +# HAVE_ICONV=yes +# +# If you are not using one of those systems, but have installed iconv(), you +# need to uncomment that line above. In some cases, you may find that iconv() +# and its header file are not in the default places. You might need to use +# something like this: +# +# HAVE_ICONV=yes +# CFLAGS=-O -I/usr/local/include +# EXTRALIBS_EXIM=-L/usr/local/lib -liconv +# +# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM +# as well. + + +#------------------------------------------------------------------------------ +# The passwords for user accounts are normally encrypted with the crypt() +# function. Comparisons with encrypted passwords can be done using Exim's +# "crypteq" expansion operator. (This is commonly used as part of the +# configuration of an authenticator for use with SMTP AUTH.) At least one +# operating system has an extended function called crypt16(), which uses up to +# 16 characters of a password (the normal crypt() uses only the first 8). Exim +# supports the use of crypt16() as well as crypt() but note the warning below. + +# You can always indicate a crypt16-encrypted password by preceding it with +# "{crypt16}". If you want the default handling (without any preceding +# indicator) to use crypt16(), uncomment the following line: + +# DEFAULT_CRYPT=crypt16 + +# If you do that, you can still access the basic crypt() function by preceding +# an encrypted password with "{crypt}". For more details, see the description +# of the "crypteq" condition in the manual chapter on string expansions. + +# Some operating systems do not include a crypt16() function, so Exim has one +# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will +# be set in an OS-specific Makefile for the OS that have such a function, so +# you should not need to bother with it. + +# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** +# It turns out that the above is not entirely accurate. As well as crypt16() +# there is a function called bigcrypt() that some operating systems have. This +# may or may not use the same algorithm, and both of them may be different to +# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined. +# +# However, since there is now a move away from the traditional crypt() +# functions towards using SHA1 and other algorithms, tidying up this area of +# Exim is seen as very low priority. In practice, if you need to, you can +# define DEFAULT_CRYPT to the name of any function that has the same interface +# as the traditional crypt() function. +# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** + + +#------------------------------------------------------------------------------ +# Exim can be built to support the SMTP STARTTLS command, which implements +# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you +# must install the OpenSSL library package or the GnuTLS library. Exim contains +# no cryptographic code of its own. Uncomment the following lines if you want +# to build Exim with TLS support. If you don't know what this is all about, +# leave these settings commented out. + +# This setting is required for any TLS support (either OpenSSL or GnuTLS) +SUPPORT_TLS=yes + +# Uncomment this setting if you are using OpenSSL +TLS_LIBS=-L/usr/lib -lssl -lcrypto + +# Uncomment these settings if you are using GnuTLS +# USE_GNUTLS=yes +TLS_LIBS=-L/usr/lib -lssl -lcrypto + +# If you are running Exim as a server, note that just building it with TLS +# support is not all you need to do. You also need to set up a suitable +# certificate, and tell Exim about it by means of the tls_certificate +# and tls_privatekey run time options. You also need to set tls_advertise_hosts +# to specify the hosts to which Exim advertises TLS support. On the other hand, +# if you are running Exim only as a client, building it with TLS support +# is all you need to do. + +# Additional libraries and include files are required for both OpenSSL and +# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed +# with all your other libraries. If they are in a special directory, you may +# need something like + +TLS_LIBS=-L/usr/lib -lssl -lcrypto +# or +TLS_LIBS=-L/usr/lib -lssl -lcrypto + +TLS_LIBS=-L/usr/lib -lssl -lcrypto +# auxiliary programs. If the include files are not in a standard place, you can +# set TLS_INCLUDE to specify where they are, for example: + +TLS_INCLUDE=-I/usr/include/openssl +# or +TLS_INCLUDE=-I/usr/include/openssl + +# You don't need to set TLS_INCLUDE if the relevant directories are already +# specified in INCLUDE. + + +#------------------------------------------------------------------------------ +# The default distribution of Exim contains only the plain text form of the +# documentation. Other forms are available separately. If you want to install +# the documentation in "info" format, first fetch the Texinfo documentation +# sources from the ftp directory and unpack them, which should create files +# with the extension "texinfo" in the doc directory. You may find that the +# version number of the texinfo files is different to your Exim version number, +# because the main documentation isn't updated as often as the code. For +# example, if you have Exim version 4.43, the source tarball upacks into a +# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40. +# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you +# have unpacked them. Then set INFO_DIRECTORY to the location of your info +# directory. This varies from system to system, but is often /usr/share/info. +# Once you have done this, "make install" will build the info files and +# install them in the directory you have defined. + +# INFO_DIRECTORY=/usr/share/info + + +#------------------------------------------------------------------------------ +# Exim log directory and files: Exim creates several log files inside a +# single log directory. You can define the directory and the form of the +# log file name here. If you do not set anything, Exim creates a directory +# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses +# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change +# this, you can set LOG_FILE_PATH to a path name containing one occurrence of +# %s. This will be replaced by one of the strings "main", "panic", or "reject" +# to form the final file names. Some installations may want something like this: + +LOG_FILE_PATH=/var/log/exim/%slog + +# which results in files with names /var/log/exim_mainlog, etc. The directory +# in which the log files are placed must exist; Exim does not try to create +# it for itself. It is also your responsibility to ensure that Exim is capable +# of writing files using this path name. The Exim user (see EXIM_USER above) +# must be able to create and update files in the directory you have specified. + +# You can also configure Exim to use syslog, instead of or as well as log +# files, by settings such as these + +# LOG_FILE_PATH=syslog +# LOG_FILE_PATH=syslog:/var/log/exim_%slog + +# The first of these uses only syslog; the second uses syslog and also writes +# to log files. Do not include white space in such a setting as it messes up +# the building process. + + +#------------------------------------------------------------------------------ +# When logging to syslog, the following option caters for syslog replacements +# that are able to accept log entries longer than the 1024 characters allowed +# by RFC 3164. It is up to you to make sure your syslog daemon can handle this. +# Non-printable characters are usually unacceptable regardless, so log entries +# are still split on newline characters. + +# SYSLOG_LONG_LINES=yes + +# If you are not interested in the process identifier (pid) of the Exim that is +# making the call to syslog, then comment out the following line. + +SYSLOG_LOG_PID=yes + + +#------------------------------------------------------------------------------ +# Cycling log files: this variable specifies the maximum number of old +# log files that are kept by the exicyclog log-cycling script. You don't have +# to use exicyclog. If your operating system has other ways of cycling log +# files, you can use them instead. The exicyclog script isn't run by default; +# you have to set up a cron job for it if you want it. + +EXICYCLOG_MAX=10 + + +#------------------------------------------------------------------------------ +# The compress command is used by the exicyclog script to compress old log +# files. Both the name of the command and the suffix that it adds to files +# need to be defined here. See also the EXICYCLOG_MAX configuration. + +COMPRESS_COMMAND=/bin/gzip +COMPRESS_SUFFIX=gz + + +#------------------------------------------------------------------------------ +# If the exigrep utility is fed compressed log files, it tries to uncompress +# them using this command. + +ZCAT_COMMAND=/bin/zcat + + +#------------------------------------------------------------------------------ +# Compiling in support for embedded Perl: If you want to be able to +# use Perl code in Exim's string manipulation language and you have Perl +# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded +# Perl costs quite a lot of resources. Only do this if you really need it. + +# EXIM_PERL=perl.o + + +#------------------------------------------------------------------------------ +# Support for dynamically-loaded string expansion functions via ${dlfunc. If +# you are using gcc the dynamically-loaded object must be compiled with the +# -shared option, and you will need to add -export-dynamic to EXTRALIBS so +# that the local_scan API is made available by the linker. You may also need +# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. + +# EXPAND_DLFUNC=yes + + +#------------------------------------------------------------------------------ +# Exim has support for PAM (Pluggable Authentication Modules), a facility +# which is available in the latest releases of Solaris and in some GNU/Linux +# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim +# support, which is intended for use in conjunction with the SMTP AUTH +# facilities, is included only when requested by the following setting: + +SUPPORT_PAM=yes + +# You probably need to add -lpam to EXTRALIBS, and in some releases of +# GNU/Linux -ldl is also needed. + + +#------------------------------------------------------------------------------ +# Support for authentication via Radius is also available. The Exim support, +# which is intended for use in conjunction with the SMTP AUTH facilities, +# is included only when requested by setting the following parameter to the +# location of your Radius configuration file: + +# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf +# RADIUS_CONFIG_FILE=/etc/radius.conf + +# If you have set RADIUS_CONFIG_FILE, you should also set one of these to +# indicate which RADIUS library is used: + +# RADIUS_LIB_TYPE=RADIUSCLIENT +# RADIUS_LIB_TYPE=RADIUSCLIENTNEW +# RADIUS_LIB_TYPE=RADLIB + +# RADIUSCLIENT is the radiusclient library; you probably need to add +# -lradiusclient to EXTRALIBS. +# +# The API for the radiusclient library was changed at release 0.4.0. +# Unfortunately, the header file does not define a version number that clients +# can use to support both the old and new APIs. If you are using version 0.4.0 +# or later of the radiusclient library, you should use RADIUSCLIENTNEW. +# +# RADLIB is the Radius library that comes with FreeBSD (the header file is +# called radlib.h); you probably need to add -lradius to EXTRALIBS. +# +# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library, +# using the original API. + + +#------------------------------------------------------------------------------ +# Support for authentication via the Cyrus SASL pwcheck daemon is available. +# Note, however, that pwcheck is now deprecated in favour of saslauthd (see +# next item). The Exim support for pwcheck, which is intented for use in +# conjunction with the SMTP AUTH facilities, is included only when requested by +# setting the following parameter to the location of the pwcheck daemon's +# socket. +# +# There is no need to install all of SASL on your system. You just need to run +# ./configure --with-pwcheck, cd to the pwcheck directory within the sources, +# make and make install. You must create the socket directory (default +# /var/pwcheck) and chown it to exim's user and group. Once you have installed +# pwcheck, you should arrange for it to be started by root at boot time. + +# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck + + +#------------------------------------------------------------------------------ +# Support for authentication via the Cyrus SASL saslauthd daemon is available. +# The Exim support, which is intented for use in conjunction with the SMTP AUTH +# facilities, is included only when requested by setting the following +# parameter to the location of the saslauthd daemon's socket. +# +# There is no need to install all of SASL on your system. You just need to run +# ./configure --with-saslauthd (and any other options you need, for example, to +# select or deselect authentication mechanisms), cd to the saslauthd directory +# within the sources, make and make install. You must create the socket +# directory (default /var/state/saslauthd) and chown it to exim's user and +# group. Once you have installed saslauthd, you should arrange for it to be +# started by root at boot time. + +# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux + + +#------------------------------------------------------------------------------ +# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment +# this setting. See the manual section entitled "Use of tcpwrappers" in the +# chapter on building and installing Exim. +# +USE_TCP_WRAPPERS=yes +# +# You may well also have to specify a local "include" file and an additional +# library for TCP wrappers, so you probably need something like this: +# +USE_TCP_WRAPPERS=yes +# CFLAGS=-O -I/usr/local/include +# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap +# +# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM +# as well. +# +# To use a name other than exim in the tcpwrappers config file, +# e.g. if you're running multiple daemons with different access lists, +# or multiple MTAs with the same access list, define +# TCP_WRAPPERS_DAEMON_NAME accordingly +# +# TCP_WRAPPERS_DAEMON_NAME="exim" + + +#------------------------------------------------------------------------------ +# The default action of the exim_install script (which is run by "make +# install") is to install the Exim binary with a unique name such as +# exim-4.43-1, and then set up a symbolic link called "exim" to reference it, +# moving the symbolic link from any previous version. If you define NO_SYMLINK +# (the value doesn't matter), the symbolic link is not created or moved. You +# will then have to "turn Exim on" by setting up the link manually. + +# NO_SYMLINK=yes + + +#------------------------------------------------------------------------------ +# Another default action of the install script is to install a default runtime +# configuration file if one does not exist. This configuration has a router for +# expanding system aliases. The default assumes that these aliases are kept +# in the traditional file called /etc/aliases. If such a file does not exist, +# the installation script creates one that contains just comments (no actual +# aliases). The following setting can be changed to specify a different +# location for the system alias file. + +SYSTEM_ALIASES_FILE=/etc/mail/aliases + + +#------------------------------------------------------------------------------ +# There are some testing options (-be, -bt, -bv) that read data from the +# standard input when no arguments are supplied. By default, the input lines +# are read using the standard fgets() function. This does not support line +# editing during interactive input (though the terminal's "erase" character +# works as normal). If your operating system has the readline() function, and +# in addition supports dynamic loading of library functions, you can cause +# Exim to use readline() for the -be testing option (only) by uncommenting the +# following setting. Dynamic loading is used so that the library is loaded only +# when the -be testing option is given; by the time the loading occurs, +# Exim has given up its root privilege and is running as the calling user. This +# is the reason why readline() is NOT supported for -bt and -bv, because Exim +# runs as root or as exim, respectively, for those options. When USE_READLINE +# is "yes", as well as supporting line editing, a history of input lines in the +# current run is maintained. + +# USE_READLINE=yes + +# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. +# Note that this option adds to the size of the Exim binary, because the +# dynamic loading library is not otherwise included. + + + +############################################################################### +# THINGS YOU ALMOST NEVER NEED TO MENTION # +############################################################################### + +# The settings in this section are available for use in special circumstances. +# In the vast majority of installations you need not change anything below. + + +#------------------------------------------------------------------------------ +# The following commands live in different places in some OS. Either the +# ultimate default settings, or the OS-specific files should already point to +# the right place, but they can be overridden here if necessary. These settings +# are used when building various scripts to ensure that the correct paths are +# used when the scripts are run. They are not used in the Makefile itself. Perl +# is not necessary for running Exim unless you set EXIM_PERL (see above) to get +# it embedded, but there are some utilities that are Perl scripts. If you +# haven't got Perl, Exim will still build and run; you just won't be able to +# use those utilities. + +# CHOWN_COMMAND=/usr/bin/chown +# CHGRP_COMMAND=/usr/bin/chgrp +# CHMOD_COMMAND=/usr/bin/chmod +# MV_COMMAND=/bin/mv +# RM_COMMAND=/bin/rm +# TOUCH_COMMAND=/usr/bin/touch +# PERL_COMMAND=/usr/bin/perl + + +#------------------------------------------------------------------------------ +# The following macro can be used to change the command for building a library +# of functions. By default the "ar" command is used, with options "cq". +# Only in rare circumstances should you need to change this. + +# AR=ar cq + + +#------------------------------------------------------------------------------ +# In some operating systems, the value of the TMPDIR environment variable +# controls where temporary files are created. Exim does not make use of +# temporary files, except when delivering to MBX mailboxes. However, if Exim +# calls any external libraries (e.g. DBM libraries), they may use temporary +# files, and thus be influenced by the value of TMPDIR. For this reason, when +# Exim starts, it checks the environment for TMPDIR, and if it finds it is set, +# it replaces the value with what is defined here. Commenting this setting +# suppresses the check altogether. + +TMPDIR="/tmp" + + +#------------------------------------------------------------------------------ +# The following macros can be used to change the default modes that are used +# by the appendfile transport. In most installations the defaults are just +# fine, and in any case, you can change particular instances of the transport +# at run time if you want. + +# APPENDFILE_MODE=0600 +# APPENDFILE_DIRECTORY_MODE=0700 +# APPENDFILE_LOCKFILE_MODE=0600 + + +#------------------------------------------------------------------------------ +# In some installations there may be multiple machines sharing file systems, +# where a different configuration file is required for Exim on the different +# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look +# for a configuration file whose name is that defined by CONFIGURE_FILE, +# with the node name obtained by uname() tacked on the end, separated by a +# period (for example, /usr/exim/configure.host.in.some.domain). If this file +# does not exist, then the bare configuration file name is tried. + +# CONFIGURE_FILE_USE_NODE=yes + + +#------------------------------------------------------------------------------ +# In some esoteric configurations two different versions of Exim are run, +# with different setuid values, and different configuration files are required +# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then +# Exim will first look for a configuration file whose name is that defined +# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by +# a period (for eximple, /usr/exim/configure.0). If this file does not exist, +# then the bare configuration file name is tried. In the case when both +# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files +# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. + +# CONFIGURE_FILE_USE_EUID=yes + + +#------------------------------------------------------------------------------ +# The size of the delivery buffers: These specify the sizes (in bytes) of +# the buffers that are used when copying a message from the spool to a +# destination. There is rarely any need to change these values. + +# DELIVER_IN_BUFFER_SIZE=8192 +# DELIVER_OUT_BUFFER_SIZE=8192 + + +#------------------------------------------------------------------------------ +# The mode of the database directory: Exim creates a directory called "db" +# in its spool directory, to hold its databases of hints. This variable +# determines the mode of the created directory. The default value in the +# source is 0750. + +# EXIMDB_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# Database file mode: The mode of files created in the "db" directory defaults +# to 0640 in the source, and can be changed here. + +# EXIMDB_MODE=0640 + + +#------------------------------------------------------------------------------ +# Database lock file mode: The mode of zero-length files created in the "db" +# directory to use for locking purposes defaults to 0640 in the source, and +# can be changed here. + +# EXIMDB_LOCKFILE_MODE=0640 + + +#------------------------------------------------------------------------------ +# This parameter sets the maximum length of the header portion of a message +# that Exim is prepared to process. The default setting is one megabyte. The +# limit exists in order to catch rogue mailers that might connect to your SMTP +# port, start off a header line, and then just pump junk at it for ever. The +# message_size_limit option would also catch this, but it may not be set. +# The value set here is the default; it can be changed at runtime. + +# HEADER_MAXSIZE="(1024*1024)" + + +#------------------------------------------------------------------------------ +# The mode of the input directory: The input directory is where messages are +# kept while awaiting delivery. Exim creates it if necessary, using a mode +# which can be defined here (default 0750). + +# INPUT_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The mode of Exim's log directory, when it is created by Exim inside the spool +# directory, defaults to 0750 but can be changed here. + +# LOG_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The log files themselves are created as required, with a mode that defaults +# to 0640, but which can be changed here. + +# LOG_MODE=0640 + + +#------------------------------------------------------------------------------ +# The TESTDB lookup is for performing tests on the handling of lookup results, +# and is not useful for general running. It should be included only when +# debugging the code of Exim. + +# LOOKUP_TESTDB=yes + + +#------------------------------------------------------------------------------ +# /bin/sh is used by default as the shell in which to run commands that are +# defined in the makefiles. This can be changed if necessary, by uncommenting +# this line and specifying another shell, but note that a Bourne-compatible +# shell is expected. + +# MAKE_SHELL=/bin/sh + + +#------------------------------------------------------------------------------ +# The maximum number of named lists of each type (address, domain, host, and +# local part) can be increased by changing this value. It should be set to +# a multiple of 16. + +MAX_NAMED_LIST=16 + + +#------------------------------------------------------------------------------ +# Network interfaces: Unless you set the local_interfaces option in the runtime +# configuration file to restrict Exim to certain interfaces only, it will run +# code to find all the interfaces there are on your host. Unfortunately, +# the call to the OS that does this requires a buffer large enough to hold +# data for all the interfaces - it was designed in the days when a host rarely +# had more than three or four interfaces. Nowadays hosts can have very many +# virtual interfaces running on the same hardware. If you have more than 250 +# virtual interfaces, you will need to uncomment this setting and increase the +# value. + +# MAXINTERFACES=250 + + +#------------------------------------------------------------------------------ +# Per-message logs: While a message is in the process of being delivered, +# comments on its progress are written to a message log, for the benefit of +# human administrators. These logs are held in a directory called "msglog" +# in the spool directory. Its mode defaults to 0750, but can be changed here. +# The message log directory is also used for storing files that are used by +# transports for returning data to a message's sender (see the "return_output" +# option for transports). + +# MSGLOG_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# There are three options which are used when compiling the Perl interface and +# when linking with Perl. The default values for these are placed automatically +# at the head of the Makefile by the script which builds it. However, if you +# want to override them, you can do so here. + +# PERL_CC= +# PERL_CCOPTS= +# PERL_LIBS= + + +#------------------------------------------------------------------------------ +# Identifying the daemon: When an Exim daemon starts up, it writes its pid +# (process id) to a file so that it can easily be identified. The path of the +# file can be specified here. Some installations may want something like this: + +PID_FILE_PATH=/var/run/exim.pid + +# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory +# using the name "exim-daemon.pid". + +# If you start up a daemon without the -bd option (for example, with just +# the -q15m option), a pid file is not written. Also, if you override the +# configuration file with the -oX option, no pid file is written. In other +# words, the pid file is written only for a "standard" daemon. + + +#------------------------------------------------------------------------------ +# If Exim creates the spool directory, it is given this mode, defaulting in the +# source to 0750. + +# SPOOL_DIRECTORY_MODE=0750 + + +#------------------------------------------------------------------------------ +# The mode of files on the input spool which hold the contents of messages can +# be changed here. The default is 0640 so that information from the spool is +# available to anyone who is a member of the Exim group. + +# SPOOL_MODE=0640 + + +#------------------------------------------------------------------------------ +# Moving frozen messages: If the following is uncommented, Exim is compiled +# with support for automatically moving frozen messages out of the main spool +# directory, a facility that is found useful by some large installations. A +# run time option is required to cause the moving actually to occur. Such +# messages become "invisible" to the normal management tools. + +# SUPPORT_MOVE_FROZEN_MESSAGES=yes + + +#------------------------------------------------------------------------------ +# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you +# really, really, really know what you are doing. And even then, think again. +# You should never uncomment this when compiling a binary for distribution. +# Use it only when compiling Exim for your own use. +# +# Uncommenting this line enables the use of a runtime option called +# disable_fsync, which can be used to stop Exim using fsync() to ensure that +# files are written to disc before proceeding. When this is disabled, crashes +# and hardware problems such as power outages can cause data to be lost. This +# feature should only be used in very exceptional circumstances. YOU HAVE BEEN +# WARNED. + +# ENABLE_DISABLE_FSYNC=yes + +HAVE_IPV6=YES +LOOKUP_LIBS=-lldap +EXTRALIBS_EXIM=-lwrap -lpam +# End of EDITME for Exim 4. diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d new file mode 100644 index 000000000..b9bec4335 --- /dev/null +++ b/community-testing/exim/exim.conf.d @@ -0,0 +1 @@ +EXIM_ARGS="-bd -q15m" diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install new file mode 100644 index 000000000..8ed329559 --- /dev/null +++ b/community-testing/exim/exim.install @@ -0,0 +1,25 @@ +# arg 1: the new package version +post_install() { + getent group exim >/dev/null 2>&1 || groupadd -g 79 exim + if getent passwd exim > /dev/null 2>&1; then + usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1 + else + usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim + fi + passwd -l exim > /dev/null + chown root.exim /var/spool/exim /var/log/exim + chown exim.exim /var/spool/exim/db + chmod u+s /usr/sbin/exim +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + getent passwd exim >/dev/null 2>&1 && userdel exim +} + diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate new file mode 100644 index 000000000..070ba4747 --- /dev/null +++ b/community-testing/exim/exim.logrotate @@ -0,0 +1,6 @@ +/var/log/exim/*log { + su exim exim + missingok + notifempty + delaycompress +} diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD index 4dc7cf4cd..90e48d272 100644 --- a/community-testing/lightspark/PKGBUILD +++ b/community-testing/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.5.0rc1 -pkgrel=1 +pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' @@ -12,12 +12,18 @@ conflicts=('lightspark-git') depends=('mesa' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++') makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost') optdepends=('gnash-gtk: fallback support') -install="lightspark.install" -source=("http://launchpad.net/lightspark/trunk/lightspark-0.5.0/+download/lightspark-0.5.0~rc1.tar.gz") -md5sums=('bf668cf6178fbbb75a7898bd6c6dd1e5') +install='lightspark.install' +source=("http://launchpad.net/lightspark/trunk/lightspark-0.5.0/+download/lightspark-0.5.0~rc1.tar.gz" + 'git-fixes-set-sys-in-destroystream-class.diff') +md5sums=('bf668cf6178fbbb75a7898bd6c6dd1e5' + '57b1b5a975f5e2518c2a96d61b925f41') _pkgver='0.5.0~rc1' build() { + cd lightspark-${_pkgver} + patch -Np1 -i ${srcdir}/git-fixes-set-sys-in-destroystream-class.diff + cd ${srcdir} + rm -rf build mkdir build cd build diff --git a/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff b/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff new file mode 100644 index 000000000..d20239d29 --- /dev/null +++ b/community-testing/lightspark/git-fixes-set-sys-in-destroystream-class.diff @@ -0,0 +1,1180 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8eea6b..aae2d71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,7 +167,7 @@ if(Boost_FOUND) + ENDIF(Boost_FOUND) + IF(UNIX) + INCLUDE(FindPkgConfig REQUIRED) +- pkg_check_modules(EXTRA_LIBS REQUIRED x11 fontconfig cairo pangocairo) ++ pkg_check_modules(EXTRA_LIBS REQUIRED x11 cairo pangocairo) + ENDIF(UNIX) + + IF(WIN32) +diff --git a/conf/FindFTGL.cmake b/conf/FindFTGL.cmake +deleted file mode 100644 +index d63178f..0000000 +--- a/conf/FindFTGL.cmake ++++ /dev/null +@@ -1,27 +0,0 @@ +-# - Find FTGL +-# Find the native FTGL headers and libraries. +-# +-# FTGL_INCLUDE_DIRS - where to find pcre.h, etc. +-# FTGL_LIBRARIES - List of libraries when using ftgl +-# FTGL_FOUND - True if ftgl found. +- +-# Look for the header file. +-FIND_PATH(FTGL_INCLUDE_DIR NAMES FTGL/ftgl.h) +-MARK_AS_ADVANCED(FTGL_INCLUDE_DIR) +- +-# Look for the library. +-FIND_LIBRARY(FTGL_LIBRARY NAMES +- ftgl +- ftgl_d +-) +-MARK_AS_ADVANCED(FTGL_LIBRARY) +- +-# handle the QUIETLY and REQUIRED arguments and set FTGL_FOUND to TRUE if +-# all listed variables are TRUE +-INCLUDE(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FTGL DEFAULT_MSG FTGL_LIBRARY FTGL_INCLUDE_DIR) +- +-IF(FTGL_FOUND) +- SET(FTGL_LIBRARIES ${FTGL_LIBRARY}) +- SET(FTGL_INCLUDE_DIRS ${FTGL_INCLUDE_DIR}) +-ENDIF(FTGL_FOUND) +diff --git a/src/asobject.cpp b/src/asobject.cpp +index f2f9620..6808c14 100644 +--- a/src/asobject.cpp ++++ b/src/asobject.cpp +@@ -556,6 +556,7 @@ ASFUNCTIONBODY(ASObject,hasOwnProperty) + name.name_type=multiname::NAME_STRING; + name.name_s=args[0]->toString(); + name.ns.push_back(nsNameAndKind("",NAMESPACE)); ++ name.isAttribute=false; + bool ret=obj->hasPropertyByMultiname(name, true); + return abstract_b(ret); + } +diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp +index 46c25bc..279d1f7 100644 +--- a/src/backends/decoder.cpp ++++ b/src/backends/decoder.cpp +@@ -26,7 +26,7 @@ + #include "graphics.h" + #include "backends/rendering.h" + +-#if LIBAVUTIL_VERSION_MAJOR < 52 ++#if LIBAVUTIL_VERSION_MAJOR < 51 + #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO + #define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO + #endif +diff --git a/src/backends/netutils.cpp b/src/backends/netutils.cpp +index ce08dbc..8e4ff6a 100644 +--- a/src/backends/netutils.cpp ++++ b/src/backends/netutils.cpp +@@ -681,7 +681,6 @@ void Downloader::allocateBuffer(size_t size) + //Create buffer + if(buffer == NULL) + { +- + buffer = (uint8_t*) calloc(size, sizeof(uint8_t)); + stableBuffer = buffer; + setg((char*)buffer,(char*)buffer,(char*)buffer); +@@ -690,7 +689,7 @@ void Downloader::allocateBuffer(size_t size) + else + { + assert(!cached); +- intptr_t curLen = (intptr_t) (egptr()-eback()); ++ intptr_t curLen = receivedLength; + //We have to extend the buffer, so create a new one + if(stableBuffer!=buffer) + { +diff --git a/src/backends/rendering.cpp b/src/backends/rendering.cpp +index ea7f5ec..b52b8f2 100644 +--- a/src/backends/rendering.cpp ++++ b/src/backends/rendering.cpp +@@ -223,13 +223,13 @@ void* RenderThread::worker(RenderThread* th) + LOG(LOG_ERROR,_("glX not present")); + return NULL; + } +- int attrib[10]={GLX_BUFFER_SIZE,24,GLX_DOUBLEBUFFER,True,None}; ++ int attrib[10]={GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, GLX_DOUBLEBUFFER, True, None}; + GLXFBConfig* fb=glXChooseFBConfig(d, 0, attrib, &a); + if(!fb) + { +- attrib[2]=None; +- fb=glXChooseFBConfig(d, 0, attrib, &a); ++ attrib[6]=None; + LOG(LOG_ERROR,_("Falling back to no double buffering")); ++ fb=glXChooseFBConfig(d, 0, attrib, &a); + } + if(!fb) + { +diff --git a/src/backends/urlutils.cpp b/src/backends/urlutils.cpp +index 7575e49..176b7db 100644 +--- a/src/backends/urlutils.cpp ++++ b/src/backends/urlutils.cpp +@@ -332,14 +332,14 @@ std::string URLInfo::encode(const std::string& u, ENCODING type) + str += '+'; + //Additionally ENCODE_URICOMPONENT and ENCODE_URI don't encode: + //- _ . ! ~ * ' ( ) +- else if((type == ENCODE_URI || ENCODE_URICOMPONENT) && ++ else if((type == ENCODE_URI || type == ENCODE_URICOMPONENT || type == ENCODE_ESCAPE) && + (u[i] == '-' || u[i] == '_' || u[i] == '.' || u[i] == '!' || + u[i] == '~' || u[i] == '*' || u[i] == '\'' || u[i] == '(' || + u[i] == ')')) + str += u[i]; + //Additionally ENCODE_URI doesn't encode: + //; / ? : @ & = + $ , # +- else if(type == ENCODE_URI && ++ else if((type == ENCODE_URI || type == ENCODE_ESCAPE) && + (u[i] == ';' || u[i] == '/' || u[i] == '?' || u[i] == ':' || + u[i] == '@' || u[i] == '&' || u[i] == '=' || u[i] == '+' || + u[i] == '$' || u[i] == ',' || u[i] == '#')) +diff --git a/src/parsing/streams.cpp b/src/parsing/streams.cpp +index 8a5d7b0..b7894b0 100644 +--- a/src/parsing/streams.cpp ++++ b/src/parsing/streams.cpp +@@ -27,167 +27,6 @@ + + using namespace std; + +-sync_stream::sync_stream():head(0),tail(0),wait_notfull(false),wait_notempty(false),buf_size(1024*1024),failed(false),ended(false),consumed(0) +-{ +- buffer=new char[buf_size]; +- sem_init(&mutex,0,1); +- sem_init(¬full,0,0); +- sem_init(¬empty,0,0); +- setg(buffer,buffer,buffer); +-} +- +-sync_stream::~sync_stream() +-{ +- delete[] buffer; +- sem_destroy(&mutex); +- sem_destroy(¬full); +- sem_destroy(¬empty); +-} +- +-void sync_stream::stop() +-{ +- sem_wait(&mutex); +- failed=true; +- if(wait_notfull) +- { +- wait_notfull=false; +- sem_post(¬full); +- sem_wait(&mutex); +- } +- if(wait_notempty) +- { +- wait_notempty=false; +- sem_post(¬empty); +- sem_wait(&mutex); +- } +- sem_post(&mutex); +-} +- +-void sync_stream::eof() +-{ +- sem_wait(&mutex); +- ended=true; +- if(wait_notempty) +- { +- wait_notempty=false; +- sem_post(¬empty); +- } +- else +- sem_post(&mutex); +-} +- +-sync_stream::pos_type sync_stream::seekoff(off_type off, ios_base::seekdir dir,ios_base::openmode mode) +-{ +- assert(off==0); +- //The current offset is the amount of byte completely consumed plus the amount used in the buffer +- int ret=consumed+(gptr()-eback()); +- return ret; +-} +- +-sync_stream::int_type sync_stream::underflow() +-{ +- assert(gptr()==egptr()); +- +- sem_wait(&mutex); +- //First of all we add the length of the buffer to the consumed variable +- int consumedNow=(gptr()-eback()); +- consumed+=consumedNow; +- head+=consumedNow; +- head%=buf_size; +- if(failed) +- { +- sem_post(&mutex); +- //Return EOF +- return -1; +- } +- if(tail==head) +- { +- if(ended) //There is no way more data will arrive +- { +- sem_post(&mutex); +- //Return EOF +- return -1; +- } +- wait_notempty=true; +- sem_post(&mutex); +- sem_wait(¬empty); +- if(failed || ended) +- { +- sem_post(&mutex); +- //Return EOF +- return -1; +- } +- } +- +- if(head<tail) +- setg(buffer+head,buffer+head,buffer+tail); +- else +- setg(buffer+head,buffer+head,buffer+buf_size); +- +- //Verify that there is room +- if(wait_notfull && ((tail-head+buf_size)%buf_size)<buf_size-1) +- { +- wait_notfull=true; +- sem_post(¬full); +- } +- else +- sem_post(&mutex); +- +- //Cast to unsigned, otherwise 0xff would become eof +- return (unsigned char)buffer[head]; +-} +- +-uint32_t sync_stream::write(char* buf, int len) +-{ +- sem_wait(&mutex); +- if(failed) +- { +- sem_post(&mutex); +- return 0; +- } +- if(((tail-head+buf_size)%buf_size)==buf_size-1) +- { +- wait_notfull=true; +- sem_post(&mutex); +- sem_wait(¬full); +- if(failed) +- { +- sem_post(&mutex); +- return 0; +- } +- } +- +- if((head-tail+buf_size-1)%buf_size<len) +- len=(head-tail+buf_size-1)%buf_size; +- +- if(tail+len>buf_size) +- { +- int i=buf_size-tail; +- memcpy(buffer+tail,buf,i); +- memcpy(buffer,buf+i,len-i); +- } +- else +- memcpy(buffer+tail,buf,len); +- tail+=len; +- tail%=buf_size; +- assert(head!=tail); +- if(wait_notempty) +- { +- wait_notempty=false; +- sem_post(¬empty); +- } +- else +- sem_post(&mutex); +- return len; +-} +- +-uint32_t sync_stream::getFree() +-{ +- sem_wait(&mutex); +- uint32_t freeBytes=(head-tail+buf_size-1)%buf_size; +- sem_post(&mutex); +- return freeBytes; +-} + + zlib_filter::zlib_filter(streambuf* b):backend(b),consumed(0) + { +diff --git a/src/parsing/streams.h b/src/parsing/streams.h +index c631e45..988dcf2 100644 +--- a/src/parsing/streams.h ++++ b/src/parsing/streams.h +@@ -43,31 +43,6 @@ public: + ~zlib_filter(); + }; + +-class DLL_PUBLIC sync_stream: public std::streambuf +-{ +-public: +- sync_stream(); +- void stop(); +- void eof(); +- ~sync_stream(); +- uint32_t write(char* buf, int len); +- uint32_t getFree(); +- virtual int_type underflow(); +- virtual pos_type seekoff(off_type, std::ios_base::seekdir, std::ios_base::openmode); +-private: +- char* buffer; +- int head; +- int tail; +- sem_t mutex; +- sem_t notfull; +- sem_t notempty; +- bool wait_notfull; +- bool wait_notempty; +- const int buf_size; +- bool failed; +- bool ended; +- int consumed; +-}; + + class bytes_buf:public std::streambuf + { +diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp +index ffb578d..fd60233 100644 +--- a/src/plugin/plugin.cpp ++++ b/src/plugin/plugin.cpp +@@ -569,6 +569,7 @@ int32_t nsPluginInstance::Write(NPStream *stream, int32_t offset, int32_t len, v + + NPError nsPluginInstance::DestroyStream(NPStream *stream, NPError reason) + { ++ sys=m_sys; + NPDownloader* dl=static_cast<NPDownloader*>(stream->pdata); + assert(dl); + //Check if async destructin of this downloader has been requested +@@ -586,6 +587,7 @@ NPError nsPluginInstance::DestroyStream(NPStream *stream, NPError reason) + } + //Notify our downloader of what happened + URLNotify(stream->url, reason, stream->pdata); ++ sys=NULL; + return NPERR_NO_ERROR; + } + +diff --git a/src/scripting/flashdisplay.cpp b/src/scripting/flashdisplay.cpp +index bfdf846..5df6f98 100644 +--- a/src/scripting/flashdisplay.cpp ++++ b/src/scripting/flashdisplay.cpp +@@ -323,6 +323,7 @@ void Loader::execute() + contentLoaderInfo->incRef(); + //Use a local variable to store the new root, as the localRoot member may change + _R<RootMovieClip> newRoot=_MR(RootMovieClip::getInstance(contentLoaderInfo.getPtr())); ++ newRoot->setOrigin(url.getParsedURL(), ""); + + _addChildAt(newRoot,0); + +@@ -2972,7 +2973,10 @@ ASFUNCTIONBODY(Graphics,beginGradientFill) + assert_and_throw(args[2]->getObjectType()==T_ARRAY); + Array* alphas=Class<Array>::cast(args[2]); + +- assert_and_throw(args[3]->getObjectType()==T_ARRAY); ++ //assert_and_throw(args[3]->getObjectType()==T_ARRAY); ++ //Work around for bug in YouTube player of July 13 2011 ++ if(args[3]->getObjectType()==T_UNDEFINED) ++ return NULL; + Array* ratios=Class<Array>::cast(args[3]); + + int NumGradient = colors->size(); +diff --git a/src/scripting/flashgeom.cpp b/src/scripting/flashgeom.cpp +index db5236e..660bb85 100644 +--- a/src/scripting/flashgeom.cpp ++++ b/src/scripting/flashgeom.cpp +@@ -1127,12 +1127,12 @@ ASFUNCTIONBODY(Matrix,concat) + + number_t ta, tb, tc, td, tx, ty; + +- ta = th->a * m->a + th->c * m->b; +- tb = th->b * m->a + th->d * m->b; +- tc = th->a * m->c + th->c * m->d; +- td = th->b * m->c + th->d * m->d; +- tx = th->a * m->tx + th->c * m->ty + th->tx; +- ty = th->b * m->tx + th->d * m->ty + th->ty; ++ ta = m->a * th->a + m->c * th->b; ++ tb = m->b * th->a + m->d * th->b; ++ tc = m->a * th->c + m->c * th->d; ++ td = m->b * th->c + m->d * th->d; ++ tx = m->a * th->tx + m->c * th->ty + m->tx; ++ ty = m->b * th->tx + m->d * th->ty + m->ty; + + th->a = ta; + th->b = tb; +diff --git a/src/scripting/flashutils.cpp b/src/scripting/flashutils.cpp +index f44b61e..04cce66 100644 +--- a/src/scripting/flashutils.cpp ++++ b/src/scripting/flashutils.cpp +@@ -784,36 +784,52 @@ ASFUNCTIONBODY(lightspark,describeType) + ret+=(isStatic)?"\"true\"":"\"false\""; + ret+=">"; + //TODO: add support for extendsClass and implementsInterface and factory +- auto it=args[0]->Variables.Variables.begin(); +- for(;it!=args[0]->Variables.Variables.end();it++) ++ type=static_cast<Class_base*>(args[0]); ++ do + { +- if(isStatic && it->second.kind==BORROWED_TRAIT) +- continue; +- +- //TODO: add support for constant, method, parameter +- if(it->second.var.getter) +- { +- //Output an accessor +- //TODO: add support in accessor for access,type,declaredBy +- ret+="<accessor name=\""; +- ret+=it->first.raw_buf(); +- ret+="\"/>"; +- } +- else if(it->second.var.var) ++ auto it=type->Variables.Variables.begin(); ++ for(;it!=type->Variables.Variables.end();it++) + { +- //Output a variable +- ret+="<variable name=\""; +- ret+=it->first.raw_buf(); +- ret+="\""; +- if(it->second.var.type) ++ if(isStatic && it->second.kind==BORROWED_TRAIT) ++ continue; ++ ++ //TODO: add support for constant, method, parameter ++ if(it->second.var.getter) ++ { ++ //Output an accessor ++ //TODO: add support in accessor for access,type,declaredBy ++ ret+="<accessor name=\""; ++ ret+=it->first.raw_buf(); ++ ret+="\"/>"; ++ } ++ else if(it->second.var.var) + { +- ret+=" type=\""; +- ret+=it->second.var.type->class_name.getQualifiedName().raw_buf(); +- ret+="\""; ++ if(it->second.var.var->getObjectType()==T_FUNCTION) ++ { ++ //Output a method ++ //TODO: add support in method for declaredBy,returnType ++ ret+="<method name=\""; ++ ret+=it->first.raw_buf(); ++ ret+="\"/>"; ++ } ++ else ++ { ++ //Output a variable ++ ret+="<variable name=\""; ++ ret+=it->first.raw_buf(); ++ ret+="\""; ++ if(it->second.var.type) ++ { ++ ret+=" type=\""; ++ ret+=it->second.var.type->class_name.getQualifiedName().raw_buf(); ++ ret+="\""; ++ } ++ ret+="/>"; ++ } + } +- ret+="/>"; + } + } ++ while((type=type->getPrototype())!=NULL); + ret+="</type>"; + + return Class<XML>::getInstanceS(ret);; +diff --git a/src/scripting/toplevel.cpp b/src/scripting/toplevel.cpp +index c64403c..69709f5 100644 +--- a/src/scripting/toplevel.cpp ++++ b/src/scripting/toplevel.cpp +@@ -271,6 +271,10 @@ ASFUNCTIONBODY(Array,lastIndexOf) + + int unsigned i = th->data.size()-1; + int j; ++ ++ if(argslen == 2 && std::isnan(args[1]->toNumber())) ++ return abstract_i(0); ++ + if(argslen == 2 && args[1]->getObjectType() != T_UNDEFINED && !std::isnan(args[1]->toNumber())) + { + j = args[1]->toInt(); //Preserve sign +@@ -314,24 +318,30 @@ ASFUNCTIONBODY(Array,shift) + ASFUNCTIONBODY(Array,splice) + { + Array* th=static_cast<Array*>(obj); +- ++ + int startIndex=args[0]->toInt(); + int deleteCount=args[1]->toUInt(); + int totalSize=th->data.size(); +- +- //A negative startIndex is relative to the end +- assert_and_throw(abs(startIndex)<totalSize); +- startIndex=(startIndex+totalSize)%totalSize; ++ Array* ret=Class<Array>::getInstanceS(); ++ ++ if(totalSize) ++ { ++ //A negative startIndex is relative to the end ++ assert_and_throw(abs(startIndex)<totalSize); ++ startIndex=(startIndex+totalSize)%totalSize; ++ } + if((startIndex+deleteCount)>totalSize) + deleteCount=totalSize-startIndex; +- +- Array* ret=Class<Array>::getInstanceS(); +- ret->data.reserve(deleteCount); + +- for(int i=0;i<deleteCount;i++) +- ret->data.push_back(th->data[startIndex+i]); +- +- th->data.erase(th->data.begin()+startIndex,th->data.begin()+startIndex+deleteCount); ++ if(deleteCount) ++ { ++ ret->data.reserve(deleteCount); ++ ++ for(int i=0;i<deleteCount;i++) ++ ret->data.push_back(th->data[startIndex+i]); ++ ++ th->data.erase(th->data.begin()+startIndex,th->data.begin()+startIndex+deleteCount); ++ } + + //Insert requested values starting at startIndex + for(unsigned int i=2,n=0;i<argslen;i++,n++) +@@ -982,8 +992,15 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl) + return NULL; + } + ++ bool isAttr=name.isAttribute; + const tiny_string& normalizedName=name.normalizedName(); +- if(name.isAttribute) ++ const char *buf=normalizedName.raw_buf(); ++ if(normalizedName[0]=='@') ++ { ++ isAttr=true; ++ buf+=1; ++ } ++ if(isAttr) + { + //Lookup attribute + //TODO: support namespaces +@@ -994,7 +1011,7 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl) + xmlpp::Element* element=dynamic_cast<xmlpp::Element*>(node); + if(element==NULL) + return NULL; +- xmlpp::Attribute* attr=element->get_attribute(normalizedName.raw_buf()); ++ xmlpp::Attribute* attr=element->get_attribute(buf); + if(attr==NULL) + return NULL; + +@@ -1021,7 +1038,7 @@ ASObject* XML::getVariableByMultiname(const multiname& name, bool skip_impl) + assert_and_throw(name.ns.size()>0 && name.ns[0].name==""); + //Normalize the name to the string form + assert(node); +- const xmlpp::Node::NodeList& children=node->get_children(normalizedName.raw_buf()); ++ const xmlpp::Node::NodeList& children=node->get_children(buf); + xmlpp::Node::NodeList::const_iterator it=children.begin(); + + std::vector<_R<XML>> ret; +@@ -1055,8 +1072,15 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic) + if(considerDynamic==false) + return ASObject::hasPropertyByMultiname(name, considerDynamic); + ++ bool isAttr=name.isAttribute; + const tiny_string& normalizedName=name.normalizedName(); +- if(name.isAttribute) ++ const char *buf=normalizedName.raw_buf(); ++ if(normalizedName[0]=='@') ++ { ++ isAttr=true; ++ buf+=1; ++ } ++ if(isAttr) + { + //Lookup attribute + //TODO: support namespaces +@@ -1067,7 +1091,7 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic) + xmlpp::Element* element=dynamic_cast<xmlpp::Element*>(node); + if(element==NULL) + return NULL; +- xmlpp::Attribute* attr=element->get_attribute(normalizedName.raw_buf()); ++ xmlpp::Attribute* attr=element->get_attribute(buf); + if(attr!=NULL) + return true; + } +@@ -1078,7 +1102,7 @@ bool XML::hasPropertyByMultiname(const multiname& name, bool considerDynamic) + assert_and_throw(name.ns.size()>0 && name.ns[0].name==""); + //Normalize the name to the string form + assert(node); +- const xmlpp::Node::NodeList& children=node->get_children(normalizedName.raw_buf()); ++ const xmlpp::Node::NodeList& children=node->get_children(buf); + if(!children.empty()) + return true; + } +diff --git a/src/swf.cpp b/src/swf.cpp +index 6378dd6..b50907e 100644 +--- a/src/swf.cpp ++++ b/src/swf.cpp +@@ -468,6 +468,8 @@ void SystemState::setShutdownFlag() + shutdown=true; + + sem_post(&terminated); ++ if(standalone) ++ gtk_main_quit(); + } + + void SystemState::wait() +@@ -1132,7 +1134,7 @@ void ParseThread::execute() + } + catch(std::exception& e) + { +- LOG(LOG_ERROR,_("Stream exception in ParseThread")); ++ LOG(LOG_ERROR,_("Stream exception in ParseThread ") << e.what()); + root->parsingFailed(); + } + pt=NULL; +diff --git a/tests/Dictionary_test.mxml b/tests/Dictionary_test.mxml +index d0d6897..226eb94 100644 +--- a/tests/Dictionary_test.mxml ++++ b/tests/Dictionary_test.mxml +@@ -1,57 +1,57 @@ +-<?xml version="1.0"?>
+-<mx:Application name="lightspark_Dictionary_test"
+- xmlns:mx="http://www.adobe.com/2006/mxml"
+- layout="absolute"
+- applicationComplete="appComplete();"
+- backgroundColor="white">
+-
+-<mx:Script>
+-<![CDATA[
+- import Tests;
+- private function appComplete():void
+- {
+- var dict:Dictionary = new Dictionary();
+- var o:Object = new Object();
+-
+- dict["foo"] = 5;
+- dict[o] = "muffins";
+-
+- Tests.assertTrue(dict.hasOwnProperty("foo"),"hasOwnProperty with string");
+-
+- Tests.assertEquals(dict["foo"], 5, "dict[\"foo\"] = 5", true);
+- Tests.assertEquals(dict[o], "muffins", "dict[Object]", true);
+-
+- var count:int = 0;
+- for each (var tmp:* in dict)
+- count++;
+-
+- Tests.assertEquals(2, count, "iterator: primitive and object keys");
+-
+- delete dict["foo"];
+-
+- dict[2] = "number two";
+- Tests.assertTrue(dict.hasOwnProperty(2), "hasOwnProperty with number");
+- Tests.assertEquals(dict["2"], "number two", "primitive keys behaviour", true);
+- Tests.assertFalse(dict["foo"] == 5, "delete dict[\"key\"]");
+-
+- var dict2:Dictionary = new Dictionary();
+- dict2.weakKeys = true;
+- {
+- var a:Object = new Object();
+- dict[a] = "test";
+- }
+-
+- var n:int = 0;
+- for (var key:* in dict2)
+- n++;
+-
+- Tests.assertEquals(n, 1, "Dictionary.weakKeys");
+-
+- Tests.report(visual, name);
+- }
+-]]>
+-</mx:Script>
+-
+-<mx:UIComponent id="visual" />
+-
+-</mx:Application>
++<?xml version="1.0"?> ++<mx:Application name="lightspark_Dictionary_test" ++ xmlns:mx="http://www.adobe.com/2006/mxml" ++ layout="absolute" ++ applicationComplete="appComplete();" ++ backgroundColor="white"> ++ ++<mx:Script> ++<![CDATA[ ++ import Tests; ++ private function appComplete():void ++ { ++ var dict:Dictionary = new Dictionary(); ++ var o:Object = new Object(); ++ ++ dict["foo"] = 5; ++ dict[o] = "muffins"; ++ ++ Tests.assertTrue(dict.hasOwnProperty("foo"),"hasOwnProperty with string"); ++ ++ Tests.assertEquals(dict["foo"], 5, "dict[\"foo\"] = 5", true); ++ Tests.assertEquals(dict[o], "muffins", "dict[Object]", true); ++ ++ var count:int = 0; ++ for each (var tmp:* in dict) ++ count++; ++ ++ Tests.assertEquals(2, count, "iterator: primitive and object keys"); ++ ++ delete dict["foo"]; ++ ++ dict[2] = "number two"; ++ Tests.assertTrue(dict.hasOwnProperty(2), "hasOwnProperty with number"); ++ Tests.assertEquals(dict["2"], "number two", "primitive keys behaviour", true); ++ Tests.assertFalse(dict["foo"] == 5, "delete dict[\"key\"]"); ++ ++ var dict2:Dictionary = new Dictionary(); ++ dict2.weakKeys = true; ++ { ++ var a:Object = new Object(); ++ dict[a] = "test"; ++ } ++ ++ var n:int = 0; ++ for (var key:* in dict2) ++ n++; ++ ++ Tests.assertEquals(n, 1, "Dictionary.weakKeys"); ++ ++ Tests.report(visual, name); ++ } ++]]> ++</mx:Script> ++ ++<mx:UIComponent id="visual" /> ++ ++</mx:Application> +diff --git a/tests/Object_test.mxml b/tests/Object_test.mxml +index d78adab..d057823 100644 +--- a/tests/Object_test.mxml ++++ b/tests/Object_test.mxml +@@ -13,6 +13,11 @@ + var o:Object = {foo: "bar", foo2: "bar2", foo: "bar3"}; + Tests.assertEquals(o.foo2,"bar2","Simple assignment in object literal"); + Tests.assertEquals(o.foo,"bar","Duplicated assignment in object literal"); ++ ++ var s:String = "Lightspark"; ++ var c:Class = s.constructor; ++ Tests.assertTrue(c == String, "Constructor property"); ++ + Tests.report(visual, this.name); + } + ]]> +diff --git a/tests/XML_test.mxml b/tests/XML_test.mxml +index cb18282..54587d7 100644 +--- a/tests/XML_test.mxml ++++ b/tests/XML_test.mxml +@@ -44,6 +44,9 @@ + Tests.assertTrue(Object("123")==simplexml, "equality: string and simple XML"); + Tests.assertTrue(Object(123)==simplexml, "equality: integer and simple XML"); + ++ var cdata:XML = new XML("<![CDATA[Lightspark]"+"]>"); ++ Tests.assertEquals(cdata, "Lightspark", "Only CDATA node in file"); ++ + Tests.report(visual, this.name); + } + ]]> +diff --git a/tests/geom_Matrix_test.mxml b/tests/geom_Matrix_test.mxml +index 667904a..89d2a5d 100644 +--- a/tests/geom_Matrix_test.mxml ++++ b/tests/geom_Matrix_test.mxml +@@ -1,64 +1,64 @@ +-<?xml version="1.0"?>
+-<mx:Application name="lightspark_geom_Matrix_test"
+- xmlns:mx="http://www.adobe.com/2006/mxml"
+- layout="absolute"
+- applicationComplete="appComplete();"
+- backgroundColor="white">
+-
+-<mx:Script>
+-<![CDATA[
+- import flash.display.DisplayObject;
+- import flash.display.Sprite;
+- import Tests;
+-
+- private function matrixEqual(m1:Matrix, m2:Matrix):Boolean {
+- return m1.a == m2.a && m1.b == m2.b && m1.c == m2.c && m1.d == m2.d && m1.tx == m2.tx && m1.ty == m2.ty;
+- }
+-
+- private function appComplete():void
+- {
+- var mat:Matrix = new Matrix();
+- Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "new Matrix()");
+-
+- var matc:Matrix = mat.clone();
+- Tests.assertTrue(matrixEqual(mat, matc), "matrix.clone");
+-
+- var matm1:Matrix = new Matrix(1, 4, 2, 5, 3, 5);
+- var matm2:Matrix = new Matrix(2, 4, 5, 7, 9, 11);
+- var matm3:Matrix = new Matrix(10, 28, 19, 55, 34, 96);
+- matm1.concat(matm2);
+- Tests.assertTrue(matrixEqual(matm1, matm3), "matrix.concat");
+-
+- mat.a = 50; mat.b = 60; mat.c = 5; mat.d = 100;
+- mat.identity();
+- Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "Matrix.identity");
+-
+- var mat2:Matrix = new Matrix();
+- mat2.rotate(Math.PI / 2);
+- Tests.assertTrue(mat2.a == 0 && mat2.b == 1 && mat2.c == -1 && mat2.d == 0, "Matrix.rotate");
+-
+- var mat3:Matrix = new Matrix();
+- mat3.scale(4, 2);
+- Tests.assertTrue(mat3.a == 4 && mat3.b == 0 && mat3.c == 0 && mat3.d == 2, "Matrix.scale");
+-
+- var mat4:Matrix = new Matrix();
+- mat4.translate(4, 2);
+- Tests.assertTrue(mat4.tx == 4 && mat4.ty == 2, "Matrix.translate");
+-
+- var mati1:Matrix = new Matrix(1, 4, 2, 5, 0, 0);
+- var mati2:Matrix = mati1.clone();
+- mati2.invert();
+- mati1.concat(mati2);
+- Tests.assertTrue(matrixEqual(mati1, new Matrix(1, 0, 0, 1, 0, 0)), "matrix.invert");
+-
+- Tests.report(visual, this.name);
+- }
+-]]>
+-</mx:Script>
+-
+-<mx:UIComponent id="visual" />
+-
+-</mx:Application>
+-
+-
+-
++<?xml version="1.0"?> ++<mx:Application name="lightspark_geom_Matrix_test" ++ xmlns:mx="http://www.adobe.com/2006/mxml" ++ layout="absolute" ++ applicationComplete="appComplete();" ++ backgroundColor="white"> ++ ++<mx:Script> ++<![CDATA[ ++ import flash.display.DisplayObject; ++ import flash.display.Sprite; ++ import Tests; ++ ++ private function matrixEqual(m1:Matrix, m2:Matrix):Boolean { ++ return m1.a == m2.a && m1.b == m2.b && m1.c == m2.c && m1.d == m2.d && m1.tx == m2.tx && m1.ty == m2.ty; ++ } ++ ++ private function appComplete():void ++ { ++ var mat:Matrix = new Matrix(); ++ Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "new Matrix()"); ++ ++ var matc:Matrix = mat.clone(); ++ Tests.assertTrue(matrixEqual(mat, matc), "matrix.clone"); ++ ++ var matm1:Matrix = new Matrix(1, 4, 2, 5, 3, 5); ++ var matm2:Matrix = new Matrix(2, 4, 5, 7, 9, 11); ++ var matm3:Matrix = new Matrix(22, 32, 29, 43, 40, 58); ++ matm1.concat(matm2); ++ Tests.assertTrue(matrixEqual(matm1, matm3), "matrix.concat"); ++ ++ mat.a = 50; mat.b = 60; mat.c = 5; mat.d = 100; ++ mat.identity(); ++ Tests.assertTrue(mat.a == 1 && mat.b == 0 && mat.c == 0 && mat.d == 1, "Matrix.identity"); ++ ++ var mat2:Matrix = new Matrix(); ++ mat2.rotate(Math.PI / 2); ++ Tests.assertTrue(mat2.a == 0 && mat2.b == 1 && mat2.c == -1 && mat2.d == 0, "Matrix.rotate"); ++ ++ var mat3:Matrix = new Matrix(); ++ mat3.scale(4, 2); ++ Tests.assertTrue(mat3.a == 4 && mat3.b == 0 && mat3.c == 0 && mat3.d == 2, "Matrix.scale"); ++ ++ var mat4:Matrix = new Matrix(); ++ mat4.translate(4, 2); ++ Tests.assertTrue(mat4.tx == 4 && mat4.ty == 2, "Matrix.translate"); ++ ++ var mati1:Matrix = new Matrix(1, 4, 2, 5, 0, 0); ++ var mati2:Matrix = mati1.clone(); ++ mati2.invert(); ++ mati1.concat(mati2); ++ Tests.assertTrue(matrixEqual(mati1, new Matrix(1, 0, 0, 1, 0, 0)), "matrix.invert"); ++ ++ Tests.report(visual, this.name); ++ } ++]]> ++</mx:Script> ++ ++<mx:UIComponent id="visual" /> ++ ++</mx:Application> ++ ++ ++ +diff --git a/tests/geom_Point_test.mxml b/tests/geom_Point_test.mxml +index f8d926c..25bbaa3 100644 +--- a/tests/geom_Point_test.mxml ++++ b/tests/geom_Point_test.mxml +@@ -1,52 +1,52 @@ +-<?xml version="1.0"?>
+-<mx:Application name="lightspark_geom_Point_test"
+- xmlns:mx="http://www.adobe.com/2006/mxml"
+- layout="absolute"
+- applicationComplete="appComplete();"
+- backgroundColor="white">
+-
+-<mx:Script>
+-<![CDATA[
+- import flash.geom.Point;
+- private function appComplete():void
+- {
+-
+- var point:Point = new Point();
+- Tests.assertEquals(0, point.x, "new Point().x == 0", false);
+- Tests.assertEquals(0, point.y, "new Point().y == 0", false);
+-
+- var point2:Point = new Point(6, 8);
+- Tests.assertEquals(6, point2.x, "new Point(6,8).x == 6", false);
+- Tests.assertEquals(8, point2.y, "new Point(6,8).y == 8", false);
+-
+- var point3:Point = Point.interpolate(point, point2, 0.5);
+- Tests.assertEquals(3, point3.x,"Point.interpolate (x)", false);
+- Tests.assertEquals(4, point3.y, "Point.interpolate (y)", false);
+-
+- Tests.assertEquals(10, Point.distance(point, point2), "Point.distance", false);
+-
+- var point4:Point = new Point(3, 2).add(point2);
+- Tests.assertEquals(9, point4.x, "Point.add (x)", false);
+- Tests.assertEquals(10, point4.y, "Point.add (y)", false);
+-
+- var point5:Point = point4.clone();
+- Tests.assertTrue(point4.equals(point5), "Point.equals");
+-
+- var point6:Point = new Point(0, 5);
+- point6.normalize(1);
+- Tests.assertEquals(1, point6.y, "Point.normalize", false);
+-
+- var point7:Point = new Point(0, 0);
+- point7.offset(2, 3);
+- Tests.assertEquals(2, point7.x, "Point.offset (x)", false);
+- Tests.assertEquals(3, point7.y, "Point.offset (y)", false);
+-
+- Tests.report(visual, name);
+- }
+-]]>
+-</mx:Script>
+-
+-<mx:UIComponent id="visual" />
+-
+-</mx:Application>
+-
++<?xml version="1.0"?> ++<mx:Application name="lightspark_geom_Point_test" ++ xmlns:mx="http://www.adobe.com/2006/mxml" ++ layout="absolute" ++ applicationComplete="appComplete();" ++ backgroundColor="white"> ++ ++<mx:Script> ++<![CDATA[ ++ import flash.geom.Point; ++ private function appComplete():void ++ { ++ ++ var point:Point = new Point(); ++ Tests.assertEquals(0, point.x, "new Point().x == 0", false); ++ Tests.assertEquals(0, point.y, "new Point().y == 0", false); ++ ++ var point2:Point = new Point(6, 8); ++ Tests.assertEquals(6, point2.x, "new Point(6,8).x == 6", false); ++ Tests.assertEquals(8, point2.y, "new Point(6,8).y == 8", false); ++ ++ var point3:Point = Point.interpolate(point, point2, 0.5); ++ Tests.assertEquals(3, point3.x,"Point.interpolate (x)", false); ++ Tests.assertEquals(4, point3.y, "Point.interpolate (y)", false); ++ ++ Tests.assertEquals(10, Point.distance(point, point2), "Point.distance", false); ++ ++ var point4:Point = new Point(3, 2).add(point2); ++ Tests.assertEquals(9, point4.x, "Point.add (x)", false); ++ Tests.assertEquals(10, point4.y, "Point.add (y)", false); ++ ++ var point5:Point = point4.clone(); ++ Tests.assertTrue(point4.equals(point5), "Point.equals"); ++ ++ var point6:Point = new Point(0, 5); ++ point6.normalize(1); ++ Tests.assertEquals(1, point6.y, "Point.normalize", false); ++ ++ var point7:Point = new Point(0, 0); ++ point7.offset(2, 3); ++ Tests.assertEquals(2, point7.x, "Point.offset (x)", false); ++ Tests.assertEquals(3, point7.y, "Point.offset (y)", false); ++ ++ Tests.report(visual, name); ++ } ++]]> ++</mx:Script> ++ ++<mx:UIComponent id="visual" /> ++ ++</mx:Application> ++ +diff --git a/tests/geom_Rectangle_test.mxml b/tests/geom_Rectangle_test.mxml +index b8450c4..43734db 100644 +--- a/tests/geom_Rectangle_test.mxml ++++ b/tests/geom_Rectangle_test.mxml +@@ -1,72 +1,72 @@ +-<?xml version="1.0"?>
+-<mx:Application name="lightspark_geom_Rectangle_test"
+- xmlns:mx="http://www.adobe.com/2006/mxml"
+- layout="absolute"
+- applicationComplete="appComplete();"
+- backgroundColor="white">
+-
+-<mx:Script>
+-<![CDATA[
+- import flash.geom.Rectangle;
+- import flash.geom.Point;
+-
+- private function appComplete():void
+- {
+-
+- var rect:Rectangle = new Rectangle(0, 0, 10, 10);
+-
+- Tests.assertEquals(rect.clone(), rect, "rectangle.clone");
+-
+- Tests.assertTrue(rect.contains(1, 1), "rectangle.contains")
+-
+- var point:Point = new Point(1, 1);
+- Tests.assertTrue(rect.containsPoint(point), "rectangle.containsPoint")
+-
+- var rect2:Rectangle = new Rectangle(1, 1, 9, 9);
+- Tests.assertTrue(rect.containsRect(rect2), "rectangle.containsRect")
+-
+- Tests.assertTrue(rect.equals(new Rectangle(0, 0, 10, 10)), "rectangle.equals")
+-
+- var rectinflated:Rectangle = new Rectangle(0, 0, 11, 11);
+- rect2.inflate(1, 1);
+- Tests.assertEquals(rect2, rectinflated, "rectangle.inflate");
+-
+- var rect3:Rectangle = new Rectangle(1, 1, 9, 9);
+- rect3.inflatePoint(new Point(1, 1));
+- Tests.assertEquals(rect3, rectinflated, "rectangle.inflatePoint");
+-
+- var rect4:Rectangle = new Rectangle(5, 5, 10, 10);
+- Tests.assertEquals(rect.intersection(rect4), new Rectangle(5, 5, 5, 5), "rectangle.intersection");
+-
+- Tests.assertTrue(rect.intersects(rect4), "rectangle.intersects")
+-
+- Tests.assertFalse(rect.isEmpty(), "rectangle.isEmpty")
+-
+- var rect5:Rectangle = new Rectangle(-1, -1, 10, 10);
+- rect5.offset(1, 1);
+- Tests.assertEquals(rect5, rect, "rectangle.offset");
+-
+- var rect6:Rectangle = new Rectangle(-1, -1, 10, 10);
+- var point2:Point = new Point(1, 1);
+- rect6.offsetPoint(point2);
+- Tests.assertEquals(rect6, rect, "rectangle.offsetPoint");
+-
+- rect6.setEmpty();
+- Tests.assertTrue(rect6.isEmpty(), "rectangle.setEmpty")
+-
+- var rect9:Rectangle = new Rectangle(0, 0, 10, 10);
+- Tests.assertEquals(rect9.toString(), "(x=0.00, y=0.00, w=10.00, h=10.00)", "rectangle.toString");
+-
+- var rect7:Rectangle = new Rectangle(0, 0, 10, 10);
+- var rect8:Rectangle = new Rectangle(10, 10, 10, 10);
+- Tests.assertEquals(rect7.union(rect8), new Rectangle(0, 0, 20, 20), "rectangle.union");
+-
+- Tests.report(visual, name);
+- }
+-]]>
+-</mx:Script>
+-
+-<mx:UIComponent id="visual" />
+-
+-</mx:Application>
+-
++<?xml version="1.0"?> ++<mx:Application name="lightspark_geom_Rectangle_test" ++ xmlns:mx="http://www.adobe.com/2006/mxml" ++ layout="absolute" ++ applicationComplete="appComplete();" ++ backgroundColor="white"> ++ ++<mx:Script> ++<![CDATA[ ++ import flash.geom.Rectangle; ++ import flash.geom.Point; ++ ++ private function appComplete():void ++ { ++ ++ var rect:Rectangle = new Rectangle(0, 0, 10, 10); ++ ++ Tests.assertEquals(rect.clone(), rect, "rectangle.clone"); ++ ++ Tests.assertTrue(rect.contains(1, 1), "rectangle.contains") ++ ++ var point:Point = new Point(1, 1); ++ Tests.assertTrue(rect.containsPoint(point), "rectangle.containsPoint") ++ ++ var rect2:Rectangle = new Rectangle(1, 1, 9, 9); ++ Tests.assertTrue(rect.containsRect(rect2), "rectangle.containsRect") ++ ++ Tests.assertTrue(rect.equals(new Rectangle(0, 0, 10, 10)), "rectangle.equals") ++ ++ var rectinflated:Rectangle = new Rectangle(0, 0, 11, 11); ++ rect2.inflate(1, 1); ++ Tests.assertEquals(rect2, rectinflated, "rectangle.inflate"); ++ ++ var rect3:Rectangle = new Rectangle(1, 1, 9, 9); ++ rect3.inflatePoint(new Point(1, 1)); ++ Tests.assertEquals(rect3, rectinflated, "rectangle.inflatePoint"); ++ ++ var rect4:Rectangle = new Rectangle(5, 5, 10, 10); ++ Tests.assertEquals(rect.intersection(rect4), new Rectangle(5, 5, 5, 5), "rectangle.intersection"); ++ ++ Tests.assertTrue(rect.intersects(rect4), "rectangle.intersects") ++ ++ Tests.assertFalse(rect.isEmpty(), "rectangle.isEmpty") ++ ++ var rect5:Rectangle = new Rectangle(-1, -1, 10, 10); ++ rect5.offset(1, 1); ++ Tests.assertEquals(rect5, rect, "rectangle.offset"); ++ ++ var rect6:Rectangle = new Rectangle(-1, -1, 10, 10); ++ var point2:Point = new Point(1, 1); ++ rect6.offsetPoint(point2); ++ Tests.assertEquals(rect6, rect, "rectangle.offsetPoint"); ++ ++ rect6.setEmpty(); ++ Tests.assertTrue(rect6.isEmpty(), "rectangle.setEmpty") ++ ++ var rect9:Rectangle = new Rectangle(0, 0, 10, 10); ++ Tests.assertEquals(rect9.toString(), "(x=0.00, y=0.00, w=10.00, h=10.00)", "rectangle.toString"); ++ ++ var rect7:Rectangle = new Rectangle(0, 0, 10, 10); ++ var rect8:Rectangle = new Rectangle(10, 10, 10, 10); ++ Tests.assertEquals(rect7.union(rect8), new Rectangle(0, 0, 20, 20), "rectangle.union"); ++ ++ Tests.report(visual, name); ++ } ++]]> ++</mx:Script> ++ ++<mx:UIComponent id="visual" /> ++ ++</mx:Application> ++ diff --git a/community-testing/stunnel/Makefile.patch b/community-testing/stunnel/Makefile.patch new file mode 100644 index 000000000..27be911d6 --- /dev/null +++ b/community-testing/stunnel/Makefile.patch @@ -0,0 +1,21 @@ +--- tools/Makefile.in 2010-03-31 04:45:09.000000000 -0500 ++++ tools/Makefile.in 2010-04-11 17:17:41.000000000 -0500 +@@ -334,8 +334,7 @@ + + info-am: + +-install-data-am: install-confDATA install-data-local \ +- install-examplesDATA ++install-data-am: install-confDATA install-examplesDATA + + install-dvi: install-dvi-am + +@@ -377,7 +376,7 @@ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-confDATA install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ ++ install-dvi install-dvi-am \ + install-examplesDATA install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ diff --git a/community-testing/stunnel/PKGBUILD b/community-testing/stunnel/PKGBUILD new file mode 100644 index 000000000..eb2a50995 --- /dev/null +++ b/community-testing/stunnel/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 51826 2011-07-16 00:11:50Z dreisner $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Kevin Piche <kevin@archlinux.org> + +pkgname=stunnel +pkgver=4.39 +pkgrel=1 +pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" +arch=('i686' 'x86_64') +url="http://www.stunnel.org" +license=('GPL') +depends=('openssl') +install=stunnel.install +options=('!libtool') +source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz" + 'Makefile.patch' 'stunnel.rc.d') +md5sums=('853739119a8364daea750154af6d7e79' + 'f15398497e10e080c2406d2fc541660c' + 'cb647c71ff4cb1e035b6e515d5f13ebf') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # don't create a certificate... + patch -p0 < $srcdir/Makefile.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-ipv6 \ + --disable-libwrap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=$pkgdir install + + for i in ca.pl importCA.sh; do + install -Dm755 tools/$i $pkgdir/usr/share/stunnel/$i + done + install -Dm755 $srcdir/stunnel.rc.d $pkgdir/etc/rc.d/stunnel + sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ + -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ + -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \ + -i ${pkgdir}/etc/stunnel/stunnel.conf-sample + install -Dm644 tools/stunnel.cnf $pkgdir/etc/stunnel/stunnel.cnf +} diff --git a/community-testing/stunnel/stunnel.install b/community-testing/stunnel/stunnel.install new file mode 100644 index 000000000..f7bbbffcb --- /dev/null +++ b/community-testing/stunnel/stunnel.install @@ -0,0 +1,35 @@ +post_install() { + # add stunnel group + if [ ! `grep stunnel /etc/group` ]; then + groupadd -g 16 stunnel &>/dev/null + fi + + # add stunnel user + id stunnel &>/dev/null || \ + useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel + + # create chroot dir if necessary. + if [ ! -d /var/run/stunnel ]; then + install -d -m 770 -o stunnel -g stunnel /var/run/stunnel + fi + + cat << EOF + +NOTE +---- +Copy /etc/stunnel/stunnel.conf-sample to /etc/stunnel/stunnel.conf +& edit it to match your setup before invoking the daemon (/etc/rc.d/stunnel). + +EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + # remove users & groups + userdel stunnel &> /dev/null + groupdel stunnel &> /dev/null + rm -rf /var/run/stunnel +} diff --git a/community-testing/stunnel/stunnel.rc.d b/community-testing/stunnel/stunnel.rc.d new file mode 100644 index 000000000..15816abe8 --- /dev/null +++ b/community-testing/stunnel/stunnel.rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/stunnel` +case "$1" in + start) + stat_busy "Starting stunnel" + [ -z "$PID" ] && /usr/bin/stunnel + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon stunnel + stat_done + fi + ;; + stop) + stat_busy "Stopping stunnel" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon stunnel + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD index e31e50d9d..602aa9e00 100644 --- a/community/alltray/PKGBUILD +++ b/community/alltray/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 79020 2010-04-30 01:30:58Z dgriffiths $ +# $Id: PKGBUILD 51791 2011-07-15 09:01:45Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : James Rayner <iphitus@gmail.com> # Contributor: Roberto Salas <ro0xito@gmail.com> pkgname=alltray -pkgver=0.7.4dev -pkgrel=2 +pkgver=0.7.5dev +pkgrel=1 pkgdesc="Drops any app in the tray." license=('GPL') arch=('i686' 'x86_64') url="http://alltray.trausch.us/" -depends=('gconf' 'libgtop' 'libwnck') -options=('!libtool' 'force') +depends=('libxpm' 'libgtop' 'libwnck') +options=('!libtool') source=(https://code.launchpad.net/alltray/trunk/${pkgver}/+download/alltray-${pkgver}.tar.gz) -md5sums=('646d6d751f815e6aeb8a58a9e5d17db9') +md5sums=('faef46b14a3f9c14d4e5efd65245796e') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1b70cc96d..5a13a4516 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51442 2011-07-09 05:30:27Z giovanni $ +# $Id: PKGBUILD 51821 2011-07-15 23:43:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.9 +pkgver=0.8.10 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('0f962987c33eb65c65d4fd8dad21d121' +md5sums=('5fa9268d004ad0a5ffec9d0067f30340' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD index 78e1c30c6..0a1a7a01d 100644 --- a/community/gcc-avr/PKGBUILD +++ b/community/gcc-avr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 43891 2011-03-30 19:48:35Z bfanella $ +# $Id: PKGBUILD 51816 2011-07-15 23:03:40Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=gcc-avr -pkgver=4.6.0 -pkgrel=3 +pkgver=4.6.1 +pkgrel=1 pkgdesc="The GNU avr Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') @@ -13,8 +13,8 @@ url="http://gcc.gnu.org/" depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) -md5sums=('b1957f3209080b2f55bc3756d3a62b7c' - 'a30090fa655d0db4c970740d353c81f1') +md5sums=('0c0e7e35d2215e19de9c97efba507553' + '0d75ca7ca35b1e7f252223f9d23a6ad1') build() { export CFLAGS="-O2 -pipe" diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index aa2be0e57..4d2916ec1 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51016 2011-07-04 12:35:27Z ibiru $ +# $Id: PKGBUILD 51807 2011-07-15 20:01:05Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.10 -pkgrel=2 +pkgver=4.0.12 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -16,8 +16,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh 18-system-xorg.patch - change_default_driver_dir.patch - usb-2.0.patch) + change_default_driver_dir.patch) _kernver=2.6.39-ARCH build() { @@ -26,9 +25,8 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" - patch -Np1 -i "$srcdir/18-system-xorg.patch" +# patch -Np1 -i "$srcdir/18-system-xorg.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - patch -Np0 -i "$srcdir/usb-2.0.patch" cp "$srcdir/LocalConfig.kmk" . @@ -168,9 +166,9 @@ package_virtualbox-guest-additions(){ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv.so \ + install -D vboxmouse_drv_110.so \ "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv.so \ + install -D vboxvideo_drv_110.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" @@ -207,8 +205,8 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('956af570597850ab4d3275b54bbed049' - '75cdbfe8621be72b67666187c5acf172' +md5sums=('5b39b99c2a36c96a062913e8ac67c60f' + '34cfb9a430a231a274aba3550c3d0e00' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' @@ -217,5 +215,4 @@ md5sums=('956af570597850ab4d3275b54bbed049' 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' '8a22b33c9dfaf8fb79bb2d26304e650b' - 'ac43f7cf44b934d8dbdbc3bb6f7879ad' - '696002ad0017512fc27781b07259f37c') + 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD index 7e224400a..1b88938d3 100644 --- a/extra/aspell/PKGBUILD +++ b/extra/aspell/PKGBUILD @@ -1,36 +1,33 @@ -# $Id: PKGBUILD 107951 2011-01-28 03:53:36Z eric $ +# $Id: PKGBUILD 131851 2011-07-16 03:59:19Z eric $ # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aspell -pkgver=0.60.6 +pkgver=0.60.6.1 _pkgmajorver=0.60 -pkgrel=5 +pkgrel=1 pkgdesc="A spell checker designed to eventually replace Ispell" -url="http://aspell.net/" arch=('i686' 'x86_64') +url="http://aspell.net/" license=('LGPL') -depends=('gcc-libs' 'ncurses>=5.6-7') +depends=('gcc-libs' 'ncurses') optdepends=('perl: to import old dictionaries') options=('!libtool') install=aspell.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('bc80f0198773d5c05086522be67334eb') -sha1sums=('335bcb560e00f59d89ec9e4c4114c325fb0e65f4') +md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7') +sha1sums=('ff1190db8de279f950c242c6f4c5d5cdc2cbdc49') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - ln -s ${pkgname}-${_pkgmajorver} \ - "${pkgdir}/usr/lib/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s ${pkgname}-${_pkgmajorver} "${pkgdir}/usr/lib/${pkgname}" } diff --git a/extra/aspell/aspell.install b/extra/aspell/aspell.install index 5a128ae41..4bb848e30 100644 --- a/extra/aspell/aspell.install +++ b/extra/aspell/aspell.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(aspell.info aspell-dev.info) post_install() { diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index fc8fce46d..c971f7337 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119805 2011-04-15 11:51:39Z stephane $ +# $Id: PKGBUILD 131166 2011-07-11 13:06:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> -# Contributer: Jason Chu <jason@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') @@ -13,27 +13,25 @@ license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') makedepends=('tk' 'sqlite3' 'valgrind') -optdepends=('tk: for tkinter') +optdepends=('tk: for tkinter' 'sqlite3') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz - CVE-2011-1521.patch) -sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00' - '561161ce5ae3a91254352c09a33e3e4434444e14') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('ab5cf4a4c21abe590dea87473a1dee6820699d79') + build() { cd "${srcdir}/Python-${pkgver}" + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* - # urllib Security Vulnerability - # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html - patch -Np1 -i ../CVE-2011-1521.patch - ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -69,7 +67,7 @@ package() { "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" # Clean-up reference to build directory - sed -i "s#$srcdir/Python-${pkgver}:##" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" # License install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index ec339174d..8bd7c546b 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,42 +1,42 @@ -# $Id: PKGBUILD 64675 2010-01-21 21:29:39Z eric $ +# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $ # Maintainer: damir <damir@archlinux.org> pkgname=qwtplot3d pkgver=0.2.7 -origver=0.2.7 -pkgrel=2 +pkgrel=3 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" arch=("i686" "x86_64") license=('custom:zlib') url="http://qwtplot3d.sourceforge.net/" -depends=('qt>=4.3' 'qwt>=5.0.2') -source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$origver.tgz" +depends=('qt' 'qwt' 'mesa') +source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" qwtplot3d-gcc44.patch) -md5sums=('2f14660152e2e26bfeaaeec479ed9f2b' '92ad261ed5344bc773cba05b324cfe74') sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215') build() { - cd $startdir/src/$pkgname - patch -p1 < ../qwtplot3d-gcc44.patch || return 1 - # . /etc/profile.d/qt3.sh + cd ${srcdir}/${pkgname} + patch -p1 < ../qwtplot3d-gcc44.patch + # build qwt: qmake qwtplot3d.pro - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname} # install qwtplot3d: (by hand, because the Makefile do not provide a "install:") - mkdir -p $startdir/pkg/usr/{include/qwtplot3d,lib} - # mkdir -p $startdir/pkg/usr/man/man3 .. no manpages yet + install -d ${pkgdir}/usr/{include/qwtplot3d,lib} for n in include/* ; do - cp -d $n $startdir/pkg/usr/include/qwtplot3d || return 1 + cp -d $n ${pkgdir}/usr/include/qwtplot3d done for n in lib/libqwtplot3d.so* ; do - cp -d $n $startdir/pkg/usr/lib || return 1 + cp -d $n ${pkgdir}/usr/lib done - # for n in doc/man/man3/*.3 ; do - # install -m 644 $n $startdir/pkg/usr/man/man3 - # done + # install custom license + install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE } diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index a829449da..0cf2bb88d 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127449 2011-06-15 09:33:37Z eric $ +# $Id: PKGBUILD 131846 2011-07-16 03:10:20Z eric $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -6,25 +6,22 @@ pkgbase=ruby pkgname=('ruby' 'ruby-docs') -pkgver=1.9.2_p180 -pkgrel=3 +pkgver=1.9.2_p290 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64') url="http://www.ruby-lang.org/en/" license=('custom') makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz') options=('!emptydirs' '!makeflags') -source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2") -md5sums=('68510eeb7511c403b91fe5476f250538') -sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +md5sums=('096758c3e853b839dc980b183227b182') +sha1sums=('8f25a74f50a10fdd9724e3c74ccd7bae596e198b') build() { cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-pthread \ - --disable-rpath + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shared --enable-pthread --disable-rpath make } @@ -41,7 +38,6 @@ package_ruby() { package_ruby-docs() { pkgdesc="Documentation files for ruby" - depends=('ruby') cd "${srcdir}/${pkgbase}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install-doc install-capi diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 50f7af45a..cb1e131ca 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122171 2011-05-02 16:51:49Z ibiru $ +# $Id: PKGBUILD 131782 2011-07-15 06:46:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ groups=('gnome-extra') url="http://www.gnome.org" options=(!emptydirs) install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ca2d72f70d2a94e31e63d0267ec41820aab168c6545954c355a609f3c6c31923') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..a100ad0a1 --- /dev/null +++ b/staging/kdeplasma-addons/PKGBUILD @@ -0,0 +1,609 @@ +# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.6.5 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' + 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + "kdeobservatory-qwt6.patch") +sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8' + '140b2611fb23aed583c2691a77870e5c48152409') + +build() { + cd ${srcdir} + + # qwt 6.0.0 patch + patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch + + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'kdegraphics-libs') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeplasma-addons/kdeobservatory-qwt6.patch b/staging/kdeplasma-addons/kdeobservatory-qwt6.patch new file mode 100644 index 000000000..46ba0345d --- /dev/null +++ b/staging/kdeplasma-addons/kdeobservatory-qwt6.patch @@ -0,0 +1,12 @@ +diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp +--- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200 ++++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200 +@@ -124,7 +124,7 @@ + plot->setCanvasBackground(QColor(0, 0, 140)); + + QwtPlotCurve *curve = new QwtPlotCurve; +- curve->setData(x, y, j); ++ curve->setSamples(x, y, j); + delete []x; + delete []y; + diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/qwtplot3d/PKGBUILD b/staging/qwtplot3d/PKGBUILD new file mode 100644 index 000000000..5b4b28295 --- /dev/null +++ b/staging/qwtplot3d/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 131787 2011-07-15 09:10:59Z ronald $ +# Maintainer: damir <damir@archlinux.org> + +pkgname=qwtplot3d +pkgver=0.2.7 +pkgrel=2 +pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" +arch=("i686" "x86_64") +license=('custom:zlib') +url="http://qwtplot3d.sourceforge.net/" +depends=('qt' 'qwt' 'mesa') +source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" + qwtplot3d-gcc44.patch) +sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215') + +build() { + cd ${srcdir}/${pkgname} + patch -p1 < ../qwtplot3d-gcc44.patch + + # build qwt: + qmake qwtplot3d.pro + make +} + +package() { + cd ${srcdir}/${pkgname} + + # install qwtplot3d: (by hand, because the Makefile do not provide a "install:") + install -d ${pkgdir}/usr/{include/qwtplot3d,lib} + + for n in include/* ; do + cp -d $n ${pkgdir}/usr/include/qwtplot3d + done + + for n in lib/libqwtplot3d.so* ; do + cp -d $n ${pkgdir}/usr/lib + done + + # install custom license + install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE +} + diff --git a/staging/qwtplot3d/qwtplot3d-gcc44.patch b/staging/qwtplot3d/qwtplot3d-gcc44.patch new file mode 100644 index 000000000..a76fe831a --- /dev/null +++ b/staging/qwtplot3d/qwtplot3d-gcc44.patch @@ -0,0 +1,12 @@ +diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h +--- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400 ++++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400 +@@ -2,6 +2,7 @@ + #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
+
+ #include "qwt3d_gridmapping.h"
++#include <cstdio>
+
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/testing/esound/PKGBUILD b/testing/esound/PKGBUILD new file mode 100644 index 000000000..b6d035b22 --- /dev/null +++ b/testing/esound/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +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 new file mode 100755 index 000000000..d90ef55fa --- /dev/null +++ b/testing/esound/esd @@ -0,0 +1,37 @@ +#!/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 new file mode 100644 index 000000000..f2fb716ba --- /dev/null +++ b/testing/esound/esd-0.2.38-alsa-drain.patch @@ -0,0 +1,11 @@ +--- 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/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD new file mode 100644 index 000000000..19feb931e --- /dev/null +++ b/testing/inetutils/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +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 new file mode 100644 index 000000000..f660f0035 --- /dev/null +++ b/testing/inetutils/ftpd.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to ftpd +# +FTPD_ARGS="" diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc new file mode 100644 index 000000000..3d0d34421 --- /dev/null +++ b/testing/inetutils/ftpd.rc @@ -0,0 +1,37 @@ +#!/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 new file mode 100644 index 000000000..b338fa498 --- /dev/null +++ b/testing/inetutils/inetutils.install @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000..4659e4745 --- /dev/null +++ b/testing/inetutils/rexec.xinetd @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..5c72f86df --- /dev/null +++ b/testing/inetutils/rlogin.xinetd @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..a13738c31 --- /dev/null +++ b/testing/inetutils/rsh.xinetd @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..6abef359c --- /dev/null +++ b/testing/inetutils/talk.xinetd @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..bd3a5e4b1 --- /dev/null +++ b/testing/inetutils/telnet.xinetd @@ -0,0 +1,10 @@ +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/mysql/PKGBUILD b/testing/mysql/PKGBUILD new file mode 100644 index 000000000..54248034e --- /dev/null +++ b/testing/mysql/PKGBUILD @@ -0,0 +1,130 @@ +# $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/testing/mysql/my.cnf b/testing/mysql/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/testing/mysql/my.cnf @@ -0,0 +1,145 @@ +# 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/testing/mysql/mysql.install b/testing/mysql/mysql.install new file mode 100644 index 000000000..9a4479215 --- /dev/null +++ b/testing/mysql/mysql.install @@ -0,0 +1,26 @@ +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 new file mode 100755 index 000000000..1ac88a7cc --- /dev/null +++ b/testing/mysql/mysqld @@ -0,0 +1,77 @@ +#!/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/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD new file mode 100644 index 000000000..a1f72cb01 --- /dev/null +++ b/testing/net-snmp/PKGBUILD @@ -0,0 +1,48 @@ +# $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/testing/net-snmp/libnl-2.patch b/testing/net-snmp/libnl-2.patch new file mode 100644 index 000000000..7c140fe83 --- /dev/null +++ b/testing/net-snmp/libnl-2.patch @@ -0,0 +1,67 @@ +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 new file mode 100644 index 000000000..9f1b83f64 --- /dev/null +++ b/testing/net-snmp/snmpd.rc @@ -0,0 +1,38 @@ +#!/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/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD new file mode 100644 index 000000000..3adca96d4 --- /dev/null +++ b/testing/nfs-utils/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 131837 2011-07-16 00:22:48Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> +# Contributor: abelstr <abel@pinklf.eu> +# Contributor: Marco Lima <cipparello gmail com> + +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 new file mode 100644 index 000000000..8f4aac598 --- /dev/null +++ b/testing/nfs-utils/exports @@ -0,0 +1,15 @@ +# /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 new file mode 100644 index 000000000..b1b23afe9 --- /dev/null +++ b/testing/nfs-utils/idmapd.conf @@ -0,0 +1,14 @@ +[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 new file mode 100644 index 000000000..13742bde3 --- /dev/null +++ b/testing/nfs-utils/nfs-common @@ -0,0 +1,319 @@ +#!/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 </etc/fstab + + while read DEV MTPT FSTYPE OPTS REST; do + if [ "$FSTYPE" = "nfs4" ]; then + AUTO_NEED_IDMAPD=yes + fi + case "$OPTS" in + sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) + AUTO_NEED_GSSD=yes + ;; + esac + done + + exec 0<&9 9<&- +fi + +# We also need idmapd if we run an NFSv4 server. It's fairly difficult +# to autodetect whether there are NFSv4 exports or not, and idmapd is not a +# particularily heavy daemon, so we auto-enable it if we find an /etc/exports +# file. This does not mean that there are NFSv4 or other mounts active (or +# even that nfs-kernel-server is installed), but it matches what the "start" +# condition in nfs-kernel-server's init script does, which has a value in +# itself. +if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then + AUTO_NEED_IDMAPD=yes +fi + +case "$NEED_STATD" in + yes|no) + ;; + *) + NEED_STATD=yes + ;; +esac + +case "$NEED_IDMAPD" in + yes|no) + ;; + *) + NEED_IDMAPD=$AUTO_NEED_IDMAPD + ;; +esac + +case "$NEED_GSSD" in + yes|no) + ;; + *) + NEED_GSSD=$AUTO_NEED_GSSD + ;; +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 + 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 new file mode 100644 index 000000000..12466b3e5 --- /dev/null +++ b/testing/nfs-utils/nfs-common.conf @@ -0,0 +1,40 @@ +# 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 new file mode 100644 index 000000000..9574cbc12 --- /dev/null +++ b/testing/nfs-utils/nfs-server @@ -0,0 +1,303 @@ +#!/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 new file mode 100644 index 000000000..4054d6b88 --- /dev/null +++ b/testing/nfs-utils/nfs-server.conf @@ -0,0 +1,29 @@ +# 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 new file mode 100644 index 000000000..4a5a138e7 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch @@ -0,0 +1,138 @@ +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 new file mode 100644 index 000000000..c9e60afc7 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +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 new file mode 100644 index 000000000..ea50a21d8 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..7f6c7a751 --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch @@ -0,0 +1,69 @@ +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 new file mode 100644 index 000000000..917136a8c --- /dev/null +++ b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch @@ -0,0 +1,57 @@ +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 new file mode 100644 index 000000000..7dcdf9575 --- /dev/null +++ b/testing/nfs-utils/nfs-utils.install @@ -0,0 +1,32 @@ +## 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 new file mode 100644 index 000000000..38c60a784 --- /dev/null +++ b/testing/nfs-utils/start-statd.patch @@ -0,0 +1,22 @@ +--- 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/openssh/PKGBUILD b/testing/openssh/PKGBUILD new file mode 100644 index 000000000..bf45e6396 --- /dev/null +++ b/testing/openssh/PKGBUILD @@ -0,0 +1,70 @@ +# $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/testing/openssh/authfile.c.patch b/testing/openssh/authfile.c.patch new file mode 100644 index 000000000..6c18fe807 --- /dev/null +++ b/testing/openssh/authfile.c.patch @@ -0,0 +1,198 @@ +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/testing/openssh/sshd b/testing/openssh/sshd new file mode 100755 index 000000000..2ee1091f0 --- /dev/null +++ b/testing/openssh/sshd @@ -0,0 +1,48 @@ +#!/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 new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/testing/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam new file mode 100644 index 000000000..ff8829fe9 --- /dev/null +++ b/testing/openssh/sshd.pam @@ -0,0 +1,11 @@ +#%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 new file mode 100644 index 000000000..4bae71589 --- /dev/null +++ b/testing/quota-tools/LICENSE @@ -0,0 +1,33 @@ +/* + * 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 new file mode 100644 index 000000000..79bb209a4 --- /dev/null +++ b/testing/quota-tools/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +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 new file mode 100644 index 000000000..97c5bc482 --- /dev/null +++ b/testing/quota-tools/nulls.diff @@ -0,0 +1,20 @@ +#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 new file mode 100644 index 000000000..6a43cee6c --- /dev/null +++ b/testing/quota-tools/quotaon.diff @@ -0,0 +1,216 @@ +# 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 <getopt.h> + #include <string.h> + #include <stdlib.h> ++#include <stdarg.h> + + #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 new file mode 100644 index 000000000..3d79497d9 --- /dev/null +++ b/testing/quota-tools/repquota.diff @@ -0,0 +1,91 @@ +# 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 new file mode 100644 index 000000000..94f4d66da --- /dev/null +++ b/testing/quota-tools/system_inodes.diff @@ -0,0 +1,18 @@ +# 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/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD new file mode 100644 index 000000000..2395df342 --- /dev/null +++ b/testing/rrdtool/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +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 new file mode 100644 index 000000000..458009ce3 --- /dev/null +++ b/testing/socat/PKGBUILD @@ -0,0 +1,32 @@ +# $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 +} diff --git a/testing/tftp-hpa/LICENSE b/testing/tftp-hpa/LICENSE new file mode 100644 index 000000000..6dade6984 --- /dev/null +++ b/testing/tftp-hpa/LICENSE @@ -0,0 +1,32 @@ +/* + * 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 new file mode 100644 index 000000000..4ffee8765 --- /dev/null +++ b/testing/tftp-hpa/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 131815 2011-07-15 23:11:48Z dan $ +# Contributor: Jose Javier <jojapa@terra.es> +pkgname=tftp-hpa +pkgver=5.1 +pkgrel=0 +pkgdesc="Official tftp server" +arch=('i686' 'x86_64') +url="http://www.kernel.org/pub/software/network/tftp/" +license=('BSD') +depends=('readline>=6.0') +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) +md5sums=('d086b1bd6e5ed6375ad407e273afccdf' + 'a974d02526f19222146c8e3d3b598871' + '414a79dc891bced056d99a9bb790fc9e' + '6ce21e27b6fdc1a1adf85c81e42aeecf') + +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" +} diff --git a/testing/tftp-hpa/tftpd.conf b/testing/tftp-hpa/tftpd.conf new file mode 100644 index 000000000..4705cc3a9 --- /dev/null +++ b/testing/tftp-hpa/tftpd.conf @@ -0,0 +1,4 @@ +# +# 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 new file mode 100755 index 000000000..b21f87f5c --- /dev/null +++ b/testing/tftp-hpa/tftpd.rc @@ -0,0 +1,38 @@ +#!/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 in.tftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping TFTPD" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon in.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 new file mode 100644 index 000000000..c35fe02de --- /dev/null +++ b/testing/vsftpd/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +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 new file mode 100644 index 000000000..27310855c --- /dev/null +++ b/testing/vsftpd/vsftpd.d @@ -0,0 +1,67 @@ +#!/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 new file mode 100644 index 000000000..48f134e24 --- /dev/null +++ b/testing/vsftpd/vsftpd.install @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 000000000..eff2eb3db --- /dev/null +++ b/testing/vsftpd/vsftpd.xinetd @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..27bf3b2a0 --- /dev/null +++ b/testing/xinetd/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ +# Maintainer: +# Contributor: Judd <jvinet@zeroflux.org> + +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 new file mode 100644 index 000000000..f064c8d7a --- /dev/null +++ b/testing/xinetd/servers @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000..4ea304c4f --- /dev/null +++ b/testing/xinetd/services @@ -0,0 +1,10 @@ +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 new file mode 100755 index 000000000..4b8fa369a --- /dev/null +++ b/testing/xinetd/xinetd @@ -0,0 +1,38 @@ +#!/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 new file mode 100644 index 000000000..b15d9f649 --- /dev/null +++ b/testing/xinetd/xinetd.conf @@ -0,0 +1,14 @@ +# +# /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 |