diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/calibre/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/oss/PKGBUILD | 48 | ||||
| -rw-r--r-- | community/oss/oss.install | 45 | ||||
| -rw-r--r-- | community/ucarp/PKGBUILD | 26 | ||||
| -rw-r--r-- | community/ucarp/ucarp.8 | 147 | ||||
| -rw-r--r-- | community/ucarp/ucarp.conf | 2 |
6 files changed, 205 insertions, 69 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 072e7ea43..a8f4c645b 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62819 2012-01-27 11:13:37Z giovanni $ +# $Id: PKGBUILD 63441 2012-02-03 13:48:06Z 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.37 +pkgver=0.8.38 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26' +md5sums=('4d054354bbede1ea74a063cac6688a48' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index 076e17329..cceef84a2 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 59729 2011-11-29 20:14:19Z bluewind $ +# $Id: PKGBUILD 63447 2012-02-03 17:52:25Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=oss -pkgver=4.2_2005 -pkgrel=2 -pkgdesc="Open Sound System UNIX audio architecture" +pkgbase=oss +pkgname=(oss libflashsupport-oss) +pkgver=4.2_2006 +pkgrel=1 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') -depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed') -makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils') -optdepends=('gtk2: for graphical mixer (ossxmix)') -conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') -replaces=('libflashsupport-oss') -install=oss.install -backup=('usr/lib/oss/soundon.user') +makedepends=('gtk2') source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" "rm-init-scripts.patch" "rc-script" "soundon.patch" "remove-hal.patch" ) -md5sums=('964b1ec63b48b22baba6688fe2fc0633' +md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c' 'b9a380a0ac8896390d71ac13676f27e1' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5') +_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl build() { - _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl cd "${srcdir}/${_dir}" # Avoid these flags conflicting with OSS build system. @@ -71,16 +65,19 @@ build() { sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh } -package() { - _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl +package_oss() { + pkgdesc="Open Sound System UNIX audio architecture" + depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') + optdepends=('gtk2: for graphical mixer (ossxmix)' + 'libflashsupport-oss: Adobe flash plugin support') + conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') + backup=('usr/lib/oss/soundon.user') + install=oss.install + cd "${srcdir}/${_dir}" msg "Copying files." - # Install libflashsupport.so - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" - cd "${srcdir}/build/prototype" cp -a * "${pkgdir}" @@ -89,3 +86,14 @@ package() { install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" } +package_libflashsupport-oss() { + pkgdesc="Adobe flash plugin support lib (OSSv4)" + conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') + depends=('oss') + + cd "${srcdir}/${_dir}" + + install -dm755 "$pkgdir/usr/lib" + ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" +} + diff --git a/community/oss/oss.install b/community/oss/oss.install index f665416db..672d63644 100644 --- a/community/oss/oss.install +++ b/community/oss/oss.install @@ -1,59 +1,30 @@ -_MSG_LIBOSSDIR=" Please note that OSS stores some of its configuration files - at /usr/lib/oss. If you are upgrading from an older OSS - release and it doesn't work properly, try removing that - directory and reinstall this package." - post_install() { echo "Running OSS install script..." - /bin/sh /usr/lib/oss/build/install.sh &> /dev/null - echo - echo "-------------------------------------------------------------" - echo " Open Sound System was installed. Now you should add 'oss'" - echo " to your DAEMONS variable at /etc/rc.conf, and start the" - echo " daemon by running /etc/rc.d/oss start." + sh /usr/lib/oss/build/install.sh &>/dev/null echo echo " Note that OSS can't currently work together with kernel" echo " ALSA modules, so they were moved out by the OSS install" echo " scripts. If you want the ALSA kernel modules back, you can" echo " just remove this package using pacman." - echo - echo "${_MSG_LIBOSSDIR}" - echo "-------------------------------------------------------------" - /bin/true } post_upgrade() { echo "Running OSS update script..." - /bin/sh /usr/lib/oss/build/install.sh &> /dev/null - echo - echo "-------------------------------------------------------------" - echo " Open Sound System was updated. Now you should restart the" - echo " daemon by running /etc/rc.d/oss restart." - echo - echo "${_MSG_LIBOSSDIR}" - echo "-------------------------------------------------------------" - /bin/true + sh /usr/lib/oss/build/install.sh &>/dev/null + + if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then + echo "libflashsupport.so has been split into a seperate package." + echo "If you want flash to use oss, please install libflashsupport-oss" + fi } pre_remove() { # Restore any replaced ALSA drivers. - /bin/sh /usr/lib/oss/scripts/restore_drv.sh - # Remove symlinks left by the 'install.sh' script. - rm -f /usr/lib/hal/scripts/oss_usb-create-devices - rm -f /usr/share/hal/fdi/policy/20thirdparty/90-oss_usb-create-device.fdi - /bin/true + sh /usr/lib/oss/scripts/restore_drv.sh } post_remove() { - echo - echo "-------------------------------------------------------------" echo " Open Sound System was now removed, and the ALSA kernel" echo " modules were restored." - echo - echo " Please note that OSS stores some of its configuration files" - echo " at /usr/lib/oss. If you don't plan to use OSS anymore, you" - echo " can remove this directory." - echo "-------------------------------------------------------------" - /bin/true } diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD index fa1879371..9b2d22f94 100644 --- a/community/ucarp/PKGBUILD +++ b/community/ucarp/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ucarp pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc='UCARP is a portable implementation of the CARP protocol' arch=('i686' 'x86_64') url='http://www.ucarp.org/project/ucarp' @@ -13,11 +13,13 @@ optdepends=('iproute2') source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz" 'ucarp.rc' 'ucarp.conf' + 'ucarp.8' '01-fix-getopt.patch' '02-fix-downscript-on-error.c') md5sums=('e3caa733316a32c09e5d3817617e9145' 'd941d2978c5b43154a29212115729519' - '35d1aabe416384e6fd8bd62312dbdb25' + '9b27f0cf552511716b1ce3678b7a77ca' + '05b64a5daeb7aab45a2a59e0f4d83c8f' '3f20699aaf2ef8139dcd337f1e7f06ab' '09d26233c37956cf08e629554a91b8cd') @@ -26,12 +28,12 @@ build() { patch -N -p1 -i ../01-fix-getopt.patch patch -N -p1 -i ../02-fix-downscript-on-error.c - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr make # fix iproute2 path - sed -i "s|/sbin|/usr/sbin|g" examples/linux/vip-down.sh - sed -i "s|/sbin|/usr/sbin|g" examples/linux/vip-up.sh + sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-down.sh + sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-up.sh } package() { @@ -39,12 +41,20 @@ package() { install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + # add manpage + install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -D -m 755 examples/linux/vip-down.sh "$pkgdir/etc/ucarp/vip-down.sh" - install -D -m 755 examples/linux/vip-up.sh "$pkgdir/etc/ucarp/vip-up.sh" + # install examples files + install -D -m 644 examples/linux/vip-down.sh \ + "$pkgdir/usr/share/doc/$pkgname/examples/vip-down.sh" + install -D -m 644 examples/linux/vip-up.sh \ + "$pkgdir/usr/share/doc/$pkgname/examples/vip-up.sh" + # install README + install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ucarp/ucarp.8 b/community/ucarp/ucarp.8 new file mode 100644 index 000000000..7854e8cf4 --- /dev/null +++ b/community/ucarp/ucarp.8 @@ -0,0 +1,147 @@ +.TH "UCARP" "8" +.SH "NAME" +ucarp \(em Automatic IP failover +.SH "SYNOPSIS" +.PP +\fBucarp\fR [\fB-i, \-\-interface=\fIINTERFACE\fR\fP] [\fB-s, \-\-srcip=\fIIPADDRESS\fR\fP] +.br +[\fB-v, \-\-vhid=\fIVHID\fR\fP] [\fB-p, \-\-pass=\fIPASSWORD\fR\fP] [\fB-o, \-\-passfile=\fIPASSFILE\fR\fP] +.br +[\fB-P, \-\-preempt\fP] [\fB-n, \-\-neutral\fP] [\fB-a, \-\-addr=\fIIPADDR\fR\fP] [\fB-h, \-\-help\fP] +.br +[\fB-b, \-\-advbase=\fISECS\fR\fP] [\fB-k, \-\-advskew=\fISKEW\fR\fP] [\fB-u, \-\-upscript=\fISCRIPT\fR\fP] +.br +[\fB-d, \-\-downscript=\fISCRIPT\fR\fP] [\fB-r, \-\-deadratio=\fIRATIO\fR\fP] [\fB-z, \-\-shutdown\fP] +.br +[\fB-B, \-\-daemonize\fP] [\fB-f, \-\-facility=\fIFACILITY\fR\fP] [\fB-x, \-\-xparam \fIPARAM\fR\fP] +.br +[\fB-S, \-\-ignoreifstate\fP] [\fB-M, \-\-nomcast\fP] +.SH "DESCRIPTION" +.PP +ucarp allows a pair of hosts to share common IP addresses in +order to provide automatic failover of an address from one machine to +another. It is a portable userland implementation of the secure and +patent-free Common Address Redundancy Protocol, (CARP), OpenBSD's +alternative to VRRP. +.SH "OPTIONS" +.PP +ucarp supports the following command line options: +.IP "\fB-i \fIINTERFACE\fR\fP\fB \-\-interface=\fIINTERFACE\fR\fP" 10 +The network interface to bind to. +.IP "\fB-s \fIIPADDRESS\fR\fP\fB \-\-srcip=\fIIPADDRESS\fR\fP" 10 +The persistent source address, (real IP), associated with this +interface. +.IP "\fB-v \fIVHID\fR\fP\fB \-\-vhid=\fIVHID\fR\fP" 10 +The id of the virtual server [1-255]. +.IP "\fB-p \fIPASSWORD\fR\fP\fB \-\-pass=\fIPASSWORD\fR\fP" 10 +The shared password, (this gets encrypted and is not sent in the +clear). +.IP "\fB-o \fIPASSFILE\fR\fP\fB \-\-passfile=\fIPASSFILE\fR\fP" 10 +File to read the shared password from. The file specified +should contain the password on the first line of the file. +.IP "\fB-P \fP\fB\-\-preempt\fP" 10 +Turn on preemptive failover. This causes an instance of +ucarp to assume master status right immediately. +.IP "\fB-n \fP\fB\-\-neutral\fP" 10 +Do not run the downscript on startup when the +initial state is backup. +.IP "\fB-a \fIIPADDRESS\fR\fP\fB \-\-addr=\fIIPADDRESS\fR\fP" 10 +The IP address of the virtual server. +.IP "\fB-h \fP\fB\-\-help\fP" 10 +Display a brief summary of the command line options. +.IP "\fB-b \fISECONDS\fR\fP\fB \-\-advbase=\fISECONDS\fR\fP" 10 +Interval in seconds that advertisements will occur, (defaults +to 1 second). +.IP "\fB-k \fISKEW\fR\fP\fB \-\-advskew=\fISKEW\fR\fP" 10 +Advertisement skew [1-255], (defaults to 0). +.IP "\fB-u \fICOMMAND\fR\fP\fB \-\-upscript=\fICOMMAND\fR\fP" 10 +Specifies the command to run after ucarp has successfully +become master, the interface name gets passed as an argument. +Typically a script used to bring up the virtual address, log the +result, add routes, clear arp cache entries, etc. +.IP "\fB-d \fICOMMAND\fR\fP\fB \-\-downscript=\fICOMMAND\fR\fP" 10 +Specifies the command that is run after ucarp has +transitioned to the backup state, the interface name is passed +as an argument. This is typically a script used to bring down +the virtual interface, log the action, remove routes, etc. +.IP "\fB-r \fIRATIO\fR\fP\fB \-\-deadratio=\fIRATIO\fR\fP" 10 +Ratio used by the backup to determine how long to wait for an +unresponsive master before considering it dead. +.IP "\fB-z\fP\fB \-\-shutdown\fP" 10 +Use of this command causes the command specified by the \-d +argument to be invoked when ucarp shuts down. +.IP "\fB-B\fP\fB \-\-daemonize\fP" 10 +Causes ucarp to detach from the terminal and run in the +background as a daemon. +.IP "\fB-f\fP\fB \-\-facility\fP" 10 +Set the syslog facility, defaults to daemon. +.IP "\fB-x \fIPARAMETER\fR\fP\fB \-\-xparam=\fIPARAMETER\fR\fP" 10 +Specify an extra parameter to be supplied to the up/down +scripts. +.IP "\fB-S\fP\fB \-\-ignoreifstate\fP" 10 +Ignore unplugged network cables. This option is useful when +ucarp nodes are connected with a crossover cable. Without +this option the master will transition to backup when the other +node is powered down, as it no longer has a link (NO-CARRIER). + +.IP "\fB-M\fP\fB \-\-nomcast\fP" 10 +Use broadcast instead of multicast advertisements. +.SH "EXAMPLES" +.PP +A host with a real IP of 10.1.1.10 configured to be the master +in a preemptive configuration with a virtual IP of 10.1.1.252. +.PP +.nf +\fB \fPucarp \-i eth0 \-s 10.1.1.10 \-v 10 \-p secret \-a 10.1.1.252 \\ +\fB \fP\-\-upscript=/usr/local/sbin/vip-up.sh \-\-downscript=/usr/local/sbin/vip-down.sh \-P +.fi +.PP +The backup might be configured something like this. +.PP +.nf +\fB \fPucarp \-i eth0 \-s 10.1.1.11 \-v 10 \-p secret \-a 10.1.1.252 \\ +\fB \fP\-\-upscript=/usr/local/sbin/vip-up.sh \-\-downscript=/usr/local/sbin/vip-down.sh +.fi +.PP +A machine with a real IP of 192.168.1.19 is the preferred master for +a virtual IP of 10.1.12.7, broadcasts are sent every 5 seconds. +.PP +.nf +\fB \fPucarp \-b 5 \-s 192.168.1.19 \-v 27 \-p badpass \-a 10.1.12.7 \\ +\fB \fP-u /usr/local/sbin/vip-up.sh \-d /usr/local/sbin/vip-down.sh \-z +.fi +.PP +The hot standby with an IP of 192.168.1.20 uses the following +command, (note the advskew of 50 putting it at a disadvantage and making +the first machine preferred). +.PP +.nf +\fB \fPucarp \-b 5 \-k 50 \-s 192.168.1.20 \-v 27 \-p badpass \-a 10.1.12.7 \\ +\fB \fP-u /usr/local/sbin/vip-up.sh \-d /usr/local/sbin/vip-down.sh \-z +.fi +.SH "SIGNALS" +.PP +Sending the ucarp process a SIGUSR1 will have it log a status +line to syslog, eg "Sep 13 12:59:56 localhost ucarp[2654]: [INFO] +MASTER on eth0 id 1" or "Sep 13 13:00:25 localhost ucarp[2644]: [INFO] +BACKUP on eth0 id 1" +.PP +Sending the ucarp process a SIGUSR2 will cause it to demote itself +from master to backup, pause 3 seconds, then proceed as usual to listen +for other masters, and promote itself if necessary. This could be useful +if you wish another node to take over master. + +.SH "AUTHOR" +.PP +ucarp was written by Frank Denis, <j@ucarp.org>. +.PP +This manual page was written by Eric Evans <eevans@debian.org> +for \fBDebian\fP and adapted by Sébastien Luttringer +<seblu@archlinux.org> for \fBArchlinux\fP. Permission is +granted to copy, distribute and/or modify this document under +the terms of the GNU General Public License, Version 2 or any +later version published by the Free Software Foundation. + +.PP +On Archlinux systems, the complete text of the GNU General Public +License can be found in /usr/share/licenses/common/GPL. diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf index 3b7ae2118..386c1df8f 100644 --- a/community/ucarp/ucarp.conf +++ b/community/ucarp/ucarp.conf @@ -1,3 +1,3 @@ # vim:set ts=2 sw=2 ft=sh noet: -DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/etc/ucarp/vip-up.sh --downscript=/etc/ucarp/vip-down.sh' +DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' |