From cf9d4447ff8fd20c11fb870fd58e9d1a577a923e Mon Sep 17 00:00:00 2001 From: abveritas Date: Sun, 16 Dec 2012 23:18:31 +0000 Subject: [PATCH] openssl pf, openslp, spamassassin, pypy, python3, ortp, perl packages, php, rdesktop, rtmpdump --- openslp/PKGBUILD | 36 +++++--- openslp/openslp.service | 11 +++ openslp/rc.slpd | 38 -------- ortp/PKGBUILD | 6 +- perl-crypt-openssl-bignum/PKGBUILD | 9 +- perl-crypt-openssl-random/PKGBUILD | 11 ++- perl-net-ssleay/PKGBUILD | 9 +- php/PKGBUILD | 7 +- php/rc.d.php-fpm | 136 ----------------------------- postgresql/PKGBUILD | 11 ++- pypy/PKGBUILD | 4 +- python3/PKGBUILD | 2 +- rdesktop/PKGBUILD | 2 +- rtmpdump/PKGBUILD | 6 +- spamassassin/PKGBUILD | 11 ++- spamassassin/spamassassin.service | 14 +++ spamassassin/spamd | 54 ------------ telepathy-idle/PKGBUILD | 10 +-- 18 files changed, 96 insertions(+), 281 deletions(-) create mode 100644 openslp/openslp.service delete mode 100755 openslp/rc.slpd delete mode 100644 php/rc.d.php-fpm create mode 100644 spamassassin/spamassassin.service delete mode 100644 spamassassin/spamd diff --git a/openslp/PKGBUILD b/openslp/PKGBUILD index 9ba1f94ab..ec556337c 100644 --- a/openslp/PKGBUILD +++ b/openslp/PKGBUILD @@ -1,23 +1,37 @@ -# $Id: PKGBUILD 75251 2010-04-01 04:53:24Z allan $ -# Maintainer: Tobias Powalowski +# +# Platform Packages for Chakra, part of chakra-project.org +# +# maintainer abveritas[at]chakra-project[dot]org + pkgname=openslp pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Open-source implementation of Service Location Protocol" -arch=(i686 x86_64) +arch=('x86_64') url="http://www.openslp.org" license=('BSD') depends=('glibc' 'bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd) -md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'openslp.service') +md5sums=('ff9999d1b44017281dd00ed2c4d32330' + '296dc3c8f75e7a1823fcb9dd97ea0971') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 ../rc.slpd ${pkgdir}/etc/rc.d/slpd + + ./configure --prefix=/usr \ + --disable-static \ + --enable-slpv1 \ + --enable-slpv2-security + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/openslp/openslp.service b/openslp/openslp.service new file mode 100644 index 000000000..e17eb3b1d --- /dev/null +++ b/openslp/openslp.service @@ -0,0 +1,11 @@ +[Unit] +Description=Service Location Protocol +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=network.target diff --git a/openslp/rc.slpd b/openslp/rc.slpd deleted file mode 100755 index 4330c3760..000000000 --- a/openslp/rc.slpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/slpd` -case "$1" in - start) - stat_busy "Starting SLPD" - [ -z "$PID" ] && /usr/sbin/slpd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/slpd.pid - add_daemon slpd - stat_done - fi - ;; - stop) - stat_busy "Stopping SLPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/slpd.pid - rm_daemon slpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/ortp/PKGBUILD b/ortp/PKGBUILD index ecdcedb44..123df1ecd 100644 --- a/ortp/PKGBUILD +++ b/ortp/PKGBUILD @@ -6,14 +6,14 @@ pkgname=ortp pkgver=0.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Real-time Transport Protocol (RTP) library" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('LGPL') depends=('openssl') options=('!libtool') -source=(http://ftp.cc.uoc.gr/mirrors/nongnu.org/linphone/$pkgname/sources/$pkgname-$pkgver.tar.gz) +source=("http://ftp.cc.uoc.gr/mirrors/nongnu.org/linphone/$pkgname/sources/$pkgname-$pkgver.tar.gz") md5sums=('b3f2f02fc5b7ba7e294806c81d419f3c') build() { diff --git a/perl-crypt-openssl-bignum/PKGBUILD b/perl-crypt-openssl-bignum/PKGBUILD index 73ab0e24d..c1883a3f6 100644 --- a/perl-crypt-openssl-bignum/PKGBUILD +++ b/perl-crypt-openssl-bignum/PKGBUILD @@ -1,10 +1,13 @@ -# Platform packages for Chakra +# +# Platform Packages for Chakra, part of chakra-project.org +# +# maintainer abveritas[at]chakra-project[dot]org pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=1 +pkgrel=2 pkgdesc="OpenSSL's multiprecision integer arithmetic " -arch=('i686' 'x86_64') +arch=('x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" depends=('perl' 'openssl') license=('GPL') diff --git a/perl-crypt-openssl-random/PKGBUILD b/perl-crypt-openssl-random/PKGBUILD index 012040d03..f680feae8 100644 --- a/perl-crypt-openssl-random/PKGBUILD +++ b/perl-crypt-openssl-random/PKGBUILD @@ -1,15 +1,18 @@ -# Platform packages for Chakra +# +# Platform Packages for Chakra, part of chakra-project.org +# +# maintainer abveritas[at]chakra-project[dot]org pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=6 +pkgrel=7 pkgdesc="Interface to OpenSSL PRNG methods" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" depends=('perl' 'openssl') license=('GPL') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz") md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') build() { diff --git a/perl-net-ssleay/PKGBUILD b/perl-net-ssleay/PKGBUILD index 299d6e393..1ce1fdb84 100644 --- a/perl-net-ssleay/PKGBUILD +++ b/perl-net-ssleay/PKGBUILD @@ -1,11 +1,14 @@ +# # Platform Packages for Chakra, part of chakra-project.org +# +# maintainer abveritas[at]chakra-project[dot]org pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.48 +pkgver=1.50 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" -arch=('i686' 'x86_64') +arch=('x86_64') license=('custom:BSD') url="http://search.cpan.org/dist/${_cpanname}/" depends=('openssl') @@ -13,7 +16,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('4e10d9da28f26732e37807820bf72af5') +md5sums=('5e239c5aae70dece79fcd6a4307fc53e') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/php/PKGBUILD b/php/PKGBUILD index a263ab4b2..4a1305c45 100644 --- a/php/PKGBUILD +++ b/php/PKGBUILD @@ -26,7 +26,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.9 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('PHP') url='http://www.php.net' @@ -37,15 +37,13 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix' 'libv source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' - 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' - 'php-fpm.service' + 'php-fpm.service' 'php-fpm.tmpfiles') sha256sums=('c0649971cfa9723701d085e227376374569689689b8421e4dcfac56c2f6fcac5' '119c04af11f771b83b28660cecda85ce1c0f0f48c9067ef2c02def7164700d3f' '49f5a2e06a0decbcd451bc485fe489b96226b67b4c4c0ec3d0a8faa141f16f7b' - '065663d8ebb952524b346a2de35d495c985474225389dd2f5e536f26dd766766' '686d3612779d97d294c23036c5e289833049623680e14125d4c4196e3318ef4e' 'df0ebfaf826b9aca3e059bdf9c9f97a6f94729fd67e2e09863f566e09a6eeee3' '5ae2e10725e232c933aefbe51cf1a6b310f8cd48b0e66649496985a59cdd9e81' @@ -264,7 +262,6 @@ package_php-fpm() { install -D -m755 "${srcdir}/build-fpm/sapi/fpm/php-fpm" "${pkgdir}/usr/sbin/php-fpm" install -D -m644 "${srcdir}/build-fpm/sapi/fpm/php-fpm.8" "${pkgdir}/usr/share/man/man8/php-fpm.8" install -D -m644 "${srcdir}/build-fpm/sapi/fpm/php-fpm.conf" "${pkgdir}/etc/php/php-fpm.conf" - install -D -m755 "${srcdir}/rc.d.php-fpm" "${pkgdir}/etc/rc.d/php-fpm" install -D -m644 "${srcdir}/logrotate.d.php-fpm" "${pkgdir}/etc/logrotate.d/php-fpm" install -d -m755 "${pkgdir}/var/run/php-fpm" install -d -m755 "${pkgdir}/etc/php/fpm.d" diff --git a/php/rc.d.php-fpm b/php/rc.d.php-fpm deleted file mode 100644 index 35cf35652..000000000 --- a/php/rc.d.php-fpm +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -wait_for_pid () { - try=0 - - while test $try -lt 35 ; do - - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - stat_append '.' - try=`expr $try + 1` - sleep 1 - - done - -} - -[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm - -case "$1" in - start) - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - add_daemon php-fpm - stat_done - fi - ;; - - stop) - stat_busy 'Gracefully shutting down php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - force-quit) - stat_busy 'Terminating php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - stat_busy 'Reload service php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - logrotate) - stat_busy 'Reopen php-fpm log' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/postgresql/PKGBUILD b/postgresql/PKGBUILD index fb274cc0a..ad4e3fc27 100644 --- a/postgresql/PKGBUILD +++ b/postgresql/PKGBUILD @@ -1,15 +1,14 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer abveritas[at]chakra-project[dot]org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.1 +pkgver=9.2.2 _majorver=${pkgver%.*} -pkgrel=2 -arch=('i686' 'x86_64') +pkgrel=1 +arch=('x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') @@ -19,7 +18,7 @@ source=("ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar 'postgresql.logrotate' 'postgresql.service' 'postgresql-initdb') -sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' +sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3' '419550699aae3d19715e87e51f32d1ad50cbb5d3175794f5476697572383b4e3' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' diff --git a/pypy/PKGBUILD b/pypy/PKGBUILD index 0350d4184..08a4cdef8 100644 --- a/pypy/PKGBUILD +++ b/pypy/PKGBUILD @@ -3,9 +3,9 @@ pkgname=pypy pkgver=1.9 _shasum=('341e1e3821ff') -pkgrel=1 +pkgrel=2 pkgdesc="PyPy is a fast, compliant alternative implementation of the Python language (2.7.1)." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.pypy.org/" license=('MIT') depends=('expat' 'zlib' 'bzip2' 'openssl' 'python-greenlet') diff --git a/python3/PKGBUILD b/python3/PKGBUILD index 7162cc378..eec17427b 100644 --- a/python3/PKGBUILD +++ b/python3/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python3 pkgver=3.3.0 -pkgrel=1 +pkgrel=2 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('x86_64') diff --git a/rdesktop/PKGBUILD b/rdesktop/PKGBUILD index 2afeea2f6..170767d67 100644 --- a/rdesktop/PKGBUILD +++ b/rdesktop/PKGBUILD @@ -5,7 +5,7 @@ pkgname=rdesktop pkgver=1.7.1 -pkgrel=6 +pkgrel=7 depends=('libx11' 'openssl' 'libao' 'libsamplerate') pkgdesc="Is used to connect to windows terminal servers" url="http://www.rdesktop.org/" diff --git a/rtmpdump/PKGBUILD b/rtmpdump/PKGBUILD index 004d449cc..737f0d278 100644 --- a/rtmpdump/PKGBUILD +++ b/rtmpdump/PKGBUILD @@ -5,14 +5,14 @@ pkgname=rtmpdump pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://rtmpdump.mplayerhq.hu/" license=('GPL2' 'LGPL2.1') depends=('openssl') categories=('network') -source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tar.gz) +source=("http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tar.gz") md5sums=('8241345cf6476c1c1b9689494d6e820f') build() { diff --git a/spamassassin/PKGBUILD b/spamassassin/PKGBUILD index febfc9457..08d4aab3f 100644 --- a/spamassassin/PKGBUILD +++ b/spamassassin/PKGBUILD @@ -7,7 +7,7 @@ pkgname=spamassassin pkgver=3.3.2 pkgrel=2 pkgdesc="A mail filter to identify spam." -arch=('i686' 'x86_64') +arch=('x86_64') license=('APACHE') url="http://spamassassin.apache.org" depends=('perl>=5.14.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ @@ -16,8 +16,7 @@ depends=('perl>=5.14.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ 'perl-archive-tar' 'perl-io-socket-inet6' 'zlib' 're2c') makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam') -backup=('etc/conf.d/spamd' - 'etc/mail/spamassassin/local.cf' +backup=('etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' 'etc/mail/spamassassin/v310.pre' 'etc/mail/spamassassin/v312.pre' @@ -26,11 +25,11 @@ backup=('etc/conf.d/spamd' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamd') + 'spamd.conf.d' 'spamassassin.service') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' - '67921afdb115cc80fbe5bbf25fc0e621') + 'ded3e012a4d502df001f2d97c495cc4e') build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" @@ -58,5 +57,5 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" - install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" + install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" } diff --git a/spamassassin/spamassassin.service b/spamassassin/spamassassin.service new file mode 100644 index 000000000..2ccfa5b11 --- /dev/null +++ b/spamassassin/spamassassin.service @@ -0,0 +1,14 @@ +[Unit] +Description=Spamassassin daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/spamd.pid +ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/spamassassin/spamd b/spamassassin/spamd deleted file mode 100644 index b0de67f70..000000000 --- a/spamassassin/spamd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/var/run/spamd.pid -if [ -f $PIDFILE ]; then - PID=$(cat $PIDFILE) -else - PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat -fi - -case "$1" in - start) - stat_busy "Starting spamd" - [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spamd - stat_done - fi - ;; - stop) - stat_busy "Stopping spamd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - # Some users report that a second attempt at stopping the process - # works. So, take a little nap and give it another whirl... - sleep 2 - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spamd - stat_done - fi - else - rm_daemon spamd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/telepathy-idle/PKGBUILD b/telepathy-idle/PKGBUILD index 22be1c55f..19a389f8a 100644 --- a/telepathy-idle/PKGBUILD +++ b/telepathy-idle/PKGBUILD @@ -1,21 +1,21 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer (x86_64): Giuseppe calĂ  +# maintainer abveritas@chakra-project.org pkgname=telepathy-idle -pkgver=0.1.12 +pkgver=0.1.14 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e77e5b84cc8f77cf12d15727c30df366') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('c292c54aa08f61544ab53fda880d861c') build() { cd "${pkgname}-${pkgver}"