From 622de23541903f9b6f85fe0a96d61de08372d23b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 10 Jun 2011 17:00:28 +0000 Subject: Fri Jun 10 17:00:28 UTC 2011 --- extra/amule/PKGBUILD | 6 +-- extra/clamav/PKGBUILD | 35 ++++++++------- extra/clamav/conf.d | 8 ++++ extra/clamav/install | 14 ++++++ extra/clamav/logrotate | 8 ++++ extra/clamav/rc.d | 72 +++++++++++++++++++++++++++++ extra/icedtea-web/PKGBUILD | 44 +++++++++--------- extra/qt/PKGBUILD | 110 +++++++-------------------------------------- extra/vlc/PKGBUILD | 15 ++++--- 9 files changed, 170 insertions(+), 142 deletions(-) create mode 100644 extra/clamav/conf.d create mode 100644 extra/clamav/install create mode 100644 extra/clamav/logrotate create mode 100644 extra/clamav/rc.d (limited to 'extra') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index cb362d105..81ba44c7d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $ +# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10561 +pkgver=10576 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd') +md5sums=('1a1f01d356b3d2d5c01004018ffa79c6') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 983458e51..35dc54939 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,35 +1,40 @@ -# $Id: PKGBUILD 109346 2011-02-08 18:56:38Z bisson $ -# Maintainer: Dale Blount +# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $ +# Contributor: Dale Blount # Contributor: Gregor Ibic +# Maintainer: Gaetan Bisson pkgname=clamav -pkgver=0.97 +pkgver=0.97.1 pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' arch=('i686' 'x86_64') depends=('bzip2' 'zlib' 'libtool') options=('!libtool') -install="$pkgname.install" license=('GPL') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') url='http://www.clamav.net/' source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - 'clamav' - 'clamav.confd' - 'clamav.logrotate' + 'rc.d' + 'conf.d' + 'logrotate' 'config.patch') - -sha1sums=('68f5a6736b3f67d608c4064ef839777877f09115' +sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387' '7f15f0b13a1c11235bc99ef0add01efd8a442f07' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' '701a61571788d10ff7af01597785835c6bfea918') +install=install + build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 < ../config.patch - ./configure --prefix=/usr --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav --disable-clamav + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/clamav \ + --with-dbdir=/var/lib/clamav \ + --disable-clamav \ + make } @@ -37,14 +42,14 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # make sure conf files get installed, cause make install + # make sure conf files get installed, because make install # doesn't do that if clamav is already installed upon building. install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf" install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf" - install -D -m644 ../clamav.logrotate "$pkgdir/etc/logrotate.d/clamav" - install -D -m644 ../clamav.confd "$pkgdir/etc/conf.d/clamav" - install -D -m755 ../clamav "$pkgdir/etc/rc.d/clamav" + install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav" + install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav" + install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav" # un-distribute databases to require freshclam rm "$pkgdir"/var/lib/clamav/*.cvd diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d new file mode 100644 index 000000000..9cd44d9f8 --- /dev/null +++ b/extra/clamav/conf.d @@ -0,0 +1,8 @@ +# clamav startup script config options + +# change these to "yes" to start +START_FRESHCLAM="no" +START_CLAMD="no" + +# Options to pass to freshclam (man freshclam for more info). +FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/install b/extra/clamav/install new file mode 100644 index 000000000..9116dc394 --- /dev/null +++ b/extra/clamav/install @@ -0,0 +1,14 @@ +post_install() { + getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null + getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null + + install -d /var/{log,run}/clamav + chown clamav:root /var/{log,run}/clamav + chown -R clamav:clamav /var/lib/clamav +} + +post_remove() { + getent passwd clamav &>/dev/null && userdel clamav >/dev/null + getent group clamav &>/dev/null && groupdel clamav >/dev/null + return 0 +} diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate new file mode 100644 index 000000000..d1dc94dce --- /dev/null +++ b/extra/clamav/logrotate @@ -0,0 +1,8 @@ +/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { + create 644 clamav clamav + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d new file mode 100644 index 000000000..8e9c6afa9 --- /dev/null +++ b/extra/clamav/rc.d @@ -0,0 +1,72 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav + +PID_FC=`pidof -o %PPID /usr/bin/freshclam` +PID_CD=`pidof -o %PPID /usr/sbin/clamd` + +case "$1" in + start) + # if clamd isn't started first, notifyclamd fails at times + if [ "$START_CLAMD" == "yes" ]; then + stat_busy "Starting ClamD" + [ -z "$PID_CD" ] && /usr/sbin/clamd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + + # give clamd enough time to start + sleep 1 + + if [ "$START_FRESHCLAM" == "yes" ]; then + stat_busy "Starting FreshClam" + [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + ;; + stop) + if [ "$START_CLAMD" == "yes" ]; then + stat_busy "Stopping ClamD" + [ -n "$PID_CD" ] && kill $PID_CD &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + + if [ "$START_FRESHCLAM" == "yes" ]; then + stat_busy "Stopping FreshClam" + [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + ;; + restart) + $0 stop + # will not start if not fully stopped, so sleep + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 19cd1fd16..95dbb9933 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,57 +1,56 @@ -# $Id: PKGBUILD 117733 2011-04-04 17:37:15Z andyrtr $ +# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.0.2 -pkgrel=1 +pkgver=1.1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') -install=$pkgname.install -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix-man-location.patch) -md5sums=('4b5d80f4b82e53f4947e6782a0472d54' - '58e305aa0d27d59f543d9cfddc6e175a') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('a7d70cb446c38213e554d4bdfb926f63') build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i $srcdir/fix-man-location.patch - autoreconf -v ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + + package_icedtea-web() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" depends=('openjdk6' 'gtk2' 'desktop-file-utils') - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi + install=$pkgname.install _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="$pkgdir" install-exec-local install-data-local + # Install desktop files. install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} install -m644 javaws.png ${pkgdir}/usr/share/pixmaps install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications # remove splitted doc files - rm -vrf ${pkgdir}/usr/share/doc + rm -rf ${pkgdir}/usr/share/doc # link binaries into /usr/bin + jre/bin install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin pushd ${pkgdir}/${_jvmdir}/bin for file in *; do ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin @@ -61,7 +60,7 @@ package_icedtea-web() { # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ } package_icedtea-web-doc() { @@ -72,11 +71,12 @@ package_icedtea-web-doc() { _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgbase-$pkgver" - install -m755 -d $pkgdir/${_jvmdir}/jre/lib +# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page - rm -vrf ${pkgdir}/usr/lib - rm -vrf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems } # plugin test here http://www.java.com/en/download/help/testvm.xml \ No newline at end of file diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 89e96034f..44a2cff98 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ +# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -32,6 +32,9 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + # FS#24601 + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + cd $srcdir/$_pkgfqn # Already fixed upstream @@ -125,98 +128,15 @@ package_qt-private-headers(){ pkgdesc="Qt private headers for development" depends=("qt=${pkgver}") - install -d ${pkgdir}/usr/include/phonon/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/Qt3Support/private - cd ${srcdir}/$_pkgfqn/src/qt3support/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtCore/private - cd ${srcdir}/$_pkgfqn/src/corelib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null + install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} - install -d ${pkgdir}/usr/include/QtDBus/private - cd ${srcdir}/$_pkgfqn/src/dbus/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDeclarative/private - cd ${srcdir}/$_pkgfqn/src/declarative/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDesigner/private - cd ${srcdir}/$_pkgfqn/tools/designer/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtGui/private - cd ${srcdir}/$_pkgfqn/src/gui/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtHelp/private - cd ${srcdir}/$_pkgfqn/tools/assistant/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtMultimedia/private - cd ${srcdir}/$_pkgfqn/src/multimedia/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtNetwork/private - cd ${srcdir}/$_pkgfqn/src/network/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtOpenGL/private - cd ${srcdir}/$_pkgfqn/src/opengl/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScript/private - cd ${srcdir}/$_pkgfqn/src/script/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScriptTools/private - cd ${srcdir}/$_pkgfqn/src/scripttools/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSql/private - cd ${srcdir}/$_pkgfqn/src/sql/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSvg/private - cd ${srcdir}/$_pkgfqn/src/svg/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtTest/private - cd ${srcdir}/$_pkgfqn/src/testlib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtUiTools/private - cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtWebKit/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtXmlPatterns/private - cd ${srcdir}/$_pkgfqn/src/xmlpatterns/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ + ${pkgdir}/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + done } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index f3b47e7ca..ecdad6626 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 126600 2011-06-06 13:01:06Z giovanni $ +# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' @@ -52,6 +52,7 @@ build() { --enable-pvr \ --enable-ncurses \ --with-live555-tree=/usr/lib/live \ + --enable-upnp \ --enable-realrtsp make } -- cgit v1.2.3-54-g00ecf