From 29f5aa692a3fa3ff3e743a47d1c57f1cc0341809 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Jan 2012 23:14:56 +0000 Subject: Sun Jan 1 23:14:56 UTC 2012 --- extra/cmake/PKGBUILD | 9 +++-- extra/graphicsmagick/PKGBUILD | 27 +++++++++------ extra/lftp/PKGBUILD | 6 ++-- extra/lyx/PKGBUILD | 21 ++++++----- extra/ntp/PKGBUILD | 11 +++--- extra/ntp/install | 9 +++++ extra/ntp/ntpd | 81 ++++++++++++++++++++----------------------- extra/ntp/ntpdate | 44 +++++++++++------------ extra/varnish/PKGBUILD | 6 ++-- extra/varnish/rc.varnish | 10 +++--- extra/varnish/varnish.install | 2 +- 11 files changed, 119 insertions(+), 107 deletions(-) (limited to 'extra') diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 0c7b1a706..c471fddf7 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 139853 2011-10-05 11:46:05Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 145779 2011-12-31 11:08:34Z andrea $ +# Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake -pkgver=2.8.6 +pkgver=2.8.7 pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') @@ -15,7 +14,7 @@ makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('2147da452fd9212bb9b4542a9eee9d5b') +md5sums=('e1b237aeaed880f65dec9c20602452f6') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 70b39d568..47e8fee3c 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 130047 2011-07-01 15:56:21Z ronald $ +# $Id: PKGBUILD 145789 2012-01-01 01:38:15Z bisson $ # Maintainer: Ronald van Haren +# Maintainer: Gaetan Bisson # Contributor: Jaroslav Lichtblau # Contributor: Anton Leontiev pkgname=graphicsmagick -pkgver=1.3.12 -pkgrel=2 -pkgdesc="Image processing system" +pkgver=1.3.13 +pkgrel=1 +pkgdesc='Image processing system' +url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') -url="http://www.graphicsmagick.org/" license=('MIT') makedepends=('perl') -depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms' 'libsm' - 'libtiff' 'libwmf' 'libxml2' 'libtool') +depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' + 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-history/1.3/GraphicsMagick-${pkgver}.tar.gz) -md5sums=('2cf6e2eea0d7af3019c9a89b81aad624') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") +sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6') build() { cd "${srcdir}/GraphicsMagick-$pkgver" - ./configure --prefix=/usr --with-perl --enable-shared --with-gs-font-dir=/usr/share/fonts/Type1 + ./configure \ + --prefix=/usr \ + --with-perl \ + --enable-shared \ + --disable-static \ + --with-gs-font-dir=/usr/share/fonts/Type1 \ + make } diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 1a568d541..3e1513ed6 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141035 2011-10-22 08:18:19Z andyrtr $ +# $Id: PKGBUILD 145777 2011-12-31 09:11:28Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.3.3 +pkgver=4.3.4 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('91757a201c1030714ac1996f27437cc7') +md5sums=('4840d0d20fafff3792b0b8ac305ab01e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index b07340749..bc0e7856f 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 144059 2011-12-02 20:54:39Z ibiru $ +# $Id: PKGBUILD 145773 2011-12-31 06:32:37Z schiv $ # Maintainer: Ronald van Haren # Contributor: Jason Chu pkgname=lyx -pkgver=2.0.1 -pkgrel=3 -pkgdesc="An advanced open-source document processor" +pkgver=2.0.2 +pkgrel=1 +pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64') url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') +depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') makedepends=('boost') +optdepends=('rcs: built-in version control system' + 'texlive-latexextra: float wrap support') license=('GPL') source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz lyx.desktop lyxrc.dist) backup=('etc/lyx/lyxrc.dist') install=lyx.install -sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a' - 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' - '56416642cc3da2a13b87b84e6b87c1a239f3d09a') - +options=('emptydirs') +md5sums=('f6421fdf118ace93d259220e6a3c4431' + '1f65a736f015a5350f8efb41b2f13abd' + 'b70fdeab95ba4a6c3ff72410dfa61823') + build() { cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index f72d52b7a..8da3f4178 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145633 2011-12-25 10:45:15Z bisson $ +# $Id: PKGBUILD 145791 2012-01-01 01:38:19Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=1 +pkgrel=2 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -19,8 +19,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntp.conf' 'ntpd.conf') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' - '97b41b8bc34f259f4e525ab2e58707c9724e72e2' - '63572457586379aa6bf75b6e899e71d651e643f4' + '4e324e625c1f080b5c028be5092aa71adbf9bd99' + '01394b8a952f5edc85d19df8335eeac3980320f4' 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' '6cfcb7bbd34499b30e31dffca2f3e1a036010271') @@ -29,7 +29,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${_realver}" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --mandir=/usr/share/man \ --enable-linux-caps \ diff --git a/extra/ntp/install b/extra/ntp/install index ad9a39d54..926b4126e 100644 --- a/extra/ntp/install +++ b/extra/ntp/install @@ -5,6 +5,15 @@ post_upgrade() { ==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf ==> If you made changes to the former, please update the latter. +EOF + fi + if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then + cat < The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid +==> and the new rc.d script only takes the latter into account. +==> To stop your old ntpd process, please kill it manually. + EOF fi } diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd index a3e886e1f..480fa1088 100755 --- a/extra/ntp/ntpd +++ b/extra/ntp/ntpd @@ -4,49 +4,44 @@ . /etc/rc.d/functions . /etc/conf.d/ntpd.conf -PIDFILE="/var/run/ntpd/ntpd.pid" -PID=$(cat $PIDFILE 2> /dev/null) +unset PID +PIDFILE='/run/ntpd.pid' + +if [[ -r ${PIDFILE} ]]; then + read -r PID <"${PIDFILE}" + if [[ -n ${PID} && ! -d /proc/${PID} ]]; then + rm -f "${PIDFILE}" + unset PID + fi +fi case "$1" in - start) - stat_busy "Starting NTP Daemon" - [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null - if [ -z "$PID" ]; then - /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [ -n "$PID" ]; then - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm $PIDFILE &>/dev/null - rm_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting NTP Daemon" + if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then + add_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Daemon" + if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then + rm ${PIDFILE} + rm_daemon ntpd + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate index 4f7c8375b..a8e746785 100755 --- a/extra/ntp/ntpdate +++ b/extra/ntp/ntpdate @@ -5,27 +5,25 @@ . /etc/conf.d/ntpd.conf case "$1" in - start) - stat_busy "Starting NTP Client" - /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ntpdate - stat_done - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting NTP Client" + if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then + add_daemon ntpdate + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping NTP Client" + rm_daemon ntpdate + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac - diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 269a1cbcf..506e911be 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145758 2011-12-30 04:10:39Z dreisner $ +# $Id: PKGBUILD 145793 2012-01-01 02:41:17Z dreisner $ # Maintainer: Dave Reisner # Contributor: Jaroslav Lichtblau # Contributor: Douglas Soares de Andrade @@ -6,7 +6,7 @@ pkgname=varnish pkgver=3.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') url="http://www.varnish-cache.org/" @@ -21,7 +21,7 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "rc.$pkgname") md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' 'edd1237d097d72173d9772754335890c' - 'fc9bf7a47479c4ad01c0e555d4e74f91') + '8366f51568c0bbb3d3891aa0cc724369') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish index 4e4fde60d..2841665e5 100644 --- a/extra/varnish/rc.varnish +++ b/extra/varnish/rc.varnish @@ -12,7 +12,7 @@ reload_vcl() { return 1 fi - activecfg=$(varnishadm -T localhost:6082 "vcl.list" | awk '/active/{ print $3 }') + activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') if [[ -z $activecfg ]]; then printf '==> ERROR: No active VCL found!\n' return 1 @@ -20,9 +20,9 @@ reload_vcl() { printf -v newcfg 'vcl-%(%s)T' -1 - varnishadm -T localhost:6082 "vcl.load $newcfg $VARNISH_CFG" && - varnishadm -T localhost:6082 "vcl.use $newcfg" && - varnishadm -T localhost:6082 "vcl.discard $activecfg" || return 1 + varnishadm "vcl.load $newcfg $VARNISH_CFG" && + varnishadm "vcl.use $newcfg" && + varnishadm "vcl.discard $activecfg" || return 1 } pidfile=/run/varnish.pid @@ -35,7 +35,7 @@ if [[ -r $pidfile ]]; then fi fi -case "$1" in +case $1 in start) stat_busy "Starting Varnish Reverse Proxy" if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install index fceaf4be7..1cbb1f16e 100644 --- a/extra/varnish/varnish.install +++ b/extra/varnish/varnish.install @@ -2,5 +2,5 @@ # remove localstatedir -- compiled VCL and slab files will still be here. post_remove() { - rm -rf /var/lib/varnish + rm -rf var/lib/varnish } -- cgit v1.2.3-54-g00ecf