diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
commit | 60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch) | |
tree | 83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /extra | |
parent | 8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff) | |
parent | 21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/lightspark/PKGBUILD
community/camlp5/PKGBUILD
community/gnote/PKGBUILD
community/gtk-gnutella/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/koffice/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/virtuoso/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gthumb/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/wine/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra')
28 files changed, 489 insertions, 237 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index dce50714f..8e1bc9f12 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136921 2011-09-02 23:48:57Z giovanni $ +# $Id: PKGBUILD 138463 2011-09-24 09:30:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10602 +pkgver=10616 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -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=('17e61b690fa52b7ee5a4e7bf350967a0') +md5sums=('b94fa71f713e1bd3c39ad12b08ca8a2f') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 913e1f593..85354f042 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137652 2011-09-10 10:56:27Z pierre $ +# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.59 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 35af04bad..ba2e71452 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136398 2011-08-29 05:25:50Z bisson $ +# $Id: PKGBUILD 138478 2011-09-24 16:46:33Z stephane $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD index 115645330..0ecbf3586 100644 --- a/extra/chkrootkit/PKGBUILD +++ b/extra/chkrootkit/PKGBUILD @@ -1,31 +1,42 @@ -# $Id: PKGBUILD 137609 2011-09-10 03:51:07Z eric $ +# $Id: PKGBUILD 138434 2011-09-23 03:32:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=chkrootkit pkgver=0.49 -pkgrel=2 +pkgrel=3 pkgdesc="Locally checks for signs of a rootkit" arch=('i686' 'x86_64' 'mips64el') url="http://www.chkrootkit.org" depends=('sh' 'net-tools') license=('BSD') -source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz fix-tools-path.patch) +source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz chkrootkit.cron \ + fix-tools-path.patch backslashes.patch kallsyms.patch) md5sums=('304d840d52840689e0ab0af56d6d3a18' - '6a2f3038114b8b14e1ad74e30fe44eee') + 'f4b6494270f708bf016e087104681739' + '3e5f2d5e2f4fa7a0d780baec9039c07f' + '758f892dcf73e8a2a4694662fba366d4' + 'd087f3aad8a9e97fea496ef83e4f1d48') sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' - 'f192cda177ec1920ce3313ed983ac44ee571ca6c') + '6dda90abf779b6f5c3bacd638e1231f34635575d' + '7fcad8117a064f0a6910134e8bb3a55de110650f' + 'e22546f445c145cf05dbc1a10f7b196fcd1c8202' + 'dc5b402ee69a7a5ae622ecfd733682516df54e88') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c patch -p0 -i "${srcdir}/fix-tools-path.patch" + patch -p1 -i "${srcdir}/backslashes.patch" + patch -p1 -i "${srcdir}/kallsyms.patch" make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit chkrootkit.orig \ + for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \ chkutmp chkwtmp ifpromisc strings-static ; do - install -D -m755 $i "${pkgdir}/usr/bin/$i" + install -D -m755 $i "${pkgdir}/usr/sbin/$i" done + install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit" install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch new file mode 100644 index 000000000..6ac981441 --- /dev/null +++ b/extra/chkrootkit/backslashes.patch @@ -0,0 +1,22 @@ +Author: James R. Van Zandt <jrv@debian.org> +Description: Two of the chkrootkit messages have unnecessary backslashes (#498063) +--- a/chkrootkit ++++ b/chkrootkit +@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h + if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \ + "$SYSTEM" != "FreeBSD" ] + then +- echo "Possible t0rn v8 \(or variation\) rootkit installed" ++ echo "Possible t0rn v8 (or variation) rootkit installed" + else + if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi + fi +@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h + + if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \ + -d ${ROOTDIR}usr/doc/"... " ]; then +- echo "Possible Ambient's rootkit \(ark\) installed" ++ echo "Possible Ambient's rootkit (ark) installed" + else + if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi + fi diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron new file mode 100644 index 000000000..0fc84ded8 --- /dev/null +++ b/extra/chkrootkit/chkrootkit.cron @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/sbin/chkrootkit -q diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch index 2f3c38528..d45f07901 100644 --- a/extra/chkrootkit/fix-tools-path.patch +++ b/extra/chkrootkit/fix-tools-path.patch @@ -1,161 +1,11 @@ ---- chkrootkit 2008-01-19 11:01:15.000000000 +0100 -+++ chkrootkit 2008-11-01 13:11:14.000000000 +0100 -@@ -158,23 +158,23 @@ - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./ifpromisc" -v -+ expertmode_output "/usr/bin/ifpromisc" -v - return 5 - fi -- if [ ! -x ./ifpromisc ]; then -- echo "not tested: can't exec ./ifpromisc" -+ if [ ! -x /usr/bin/ifpromisc ]; then -+ echo "not tested: can't exec /usr/bin/ifpromisc" - return ${NOT_TESTED} - else -- [ "${QUIET}" != "t" ] && ./ifpromisc -v || ./ifpromisc -q -+ [ "${QUIET}" != "t" ] && /usr/bin/ifpromisc -v || /usr/bin/ifpromisc -q - fi - } - - chkutmp() { -- if [ ! -x ./chkutmp ]; then -- echo "not tested: can't exec ./chkutmp" -+ if [ ! -x /usr/bin/chkutmp ]; then -+ echo "not tested: can't exec /usr/bin/chkutmp" - return ${NOT_TESTED} - fi -- if ./chkutmp -+ if /usr/bin/chkutmp - then - if [ "${QUIET}" != "t" ]; then echo "chkutmp: nothing deleted"; fi - fi -@@ -182,8 +182,8 @@ - } - - z2 () { -- if [ ! -x ./chklastlog ]; then -- echo "not tested: can't exec ./chklastlog" -+ if [ ! -x /usr/bin/chklastlog ]; then -+ echo "not tested: can't exec /usr/bin/chklastlog" - return ${NOT_TESTED} - fi - -@@ -196,32 +196,32 @@ - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./chklastlog -f ${WTMP} -l ${LASTLOG}" -+ expertmode_output "/usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG}" - return 5 - fi - -- if ./chklastlog -f ${WTMP} -l ${LASTLOG} -+ if /usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG} - then - if [ "${QUIET}" != "t" ]; then echo "chklastlog: nothing deleted"; fi - fi - } - - wted () { -- if [ ! -x ./chkwtmp ]; then -- echo "not tested: can't exec ./chkwtmp" -+ if [ ! -x /usr/bin/chkwtmp ]; then -+ echo "not tested: can't exec /usr/bin/chkwtmp" - return ${NOT_TESTED} - fi - - if [ "$SYSTEM" = "SunOS" ]; then -- if [ ! -x ./check_wtmpx ]; then -- echo "not tested: can't exec ./check_wtmpx" -+ if [ ! -x /usr/bin/check_wtmpx ]; then -+ echo "not tested: can't exec /usr/bin/check_wtmpx" - else - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./check_wtmpx" -+ expertmode_output "/usr/bin/check_wtmpx" - return 5 - fi - if [ -f ${ROOTDIR}var/adm/wtmp ]; then -- if ./check_wtmpx -+ if /usr/bin/check_wtmpx - then - if [ "${QUIET}" != "t" ]; then \ - echo "check_wtmpx: nothing deleted in /var/adm/wtmpx"; fi -@@ -232,12 +232,12 @@ - WTMP=`loc wtmp wtmp "${ROOTDIR}var/log ${ROOTDIR}var/adm"` - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./chkwtmp -f ${WTMP}" -+ expertmode_output "/usr/bin/chkwtmp -f ${WTMP}" - return 5 - fi - fi - -- if ./chkwtmp -f ${WTMP} -+ if /usr/bin/chkwtmp -f ${WTMP} - then - if [ "${QUIET}" != "t" ]; then echo "chkwtmp: nothing deleted"; fi - fi -@@ -275,8 +275,8 @@ - prog="" - if [ \( "${SYSTEM}" = "Linux" -o \( "${SYSTEM}" = "FreeBSD" -a \ - `echo ${V} | ${awk} '{ if ($1 > 4.3 || $1 < 6.0) print 1; else print 0 }'` -eq 1 \) \) -a "${ROOTDIR}" = "/" ]; then -- [ -x ./chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="./chkproc" -- [ -x ./chkdirs ] && prog="$prog ./chkdirs" -+ [ -x /usr/bin/chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="/usr/bin/chkproc" -+ [ -x /usr/bin/chkdirs ] && prog="$prog /usr/bin/chkdirs" - if [ "$prog" = "" ]; then - echo "not tested: can't exec $prog" - return ${NOT_TESTED} -@@ -288,7 +288,7 @@ - PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` - [ "$PV" = "" ] && PV=2 - [ "${SYSTEM}" = "SunOS" ] && PV=0 -- expertmode_output "./chkproc -v -v -p $PV" -+ expertmode_output "/usr/bin/chkproc -v -v -p $PV" - return 5 - fi - -@@ -315,7 +315,7 @@ - if [ "${DEBUG}" = "t" ]; then - ${echo} "*** PV=$PV ***" - fi -- if ./chkproc -p ${PV}; then -+ if /usr/bin/chkproc -p ${PV}; then - if [ "${QUIET}" != "t" ]; then echo "chkproc: nothing detected"; fi - else - echo "chkproc: Warning: Possible LKM Trojan installed" -@@ -324,7 +324,7 @@ - for i in /usr/share /usr/bin /usr/sbin /lib; do - [ -d $i ] && dirs="$dirs $i" - done -- if ./chkdirs $dirs; then -+ if /usr/bin/chkdirs $dirs; then - if [ "${QUIET}" != "t" ]; then echo "chkdirs: nothing detected"; fi - else - echo "chkdirs: Warning: Possible LKM Trojan installed" -@@ -1690,18 +1690,18 @@ - - if [ "${SYSTEM}" = "Linux" ] - then -- if [ ! -x ./strings-static ]; then -- printn "can't exec ./strings-static, " -+ if [ ! -x /usr/bin/strings-static ]; then -+ printn "can't exec /usr/bin/strings-static, " - return ${NOT_TESTED} - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./strings-static -a ${CMD}" -+ expertmode_output "/usr/bin/strings-static -a ${CMD}" - return 5 - fi - - ### strings must be a statically linked binary. -- if ./strings-static -a ${CMD} > /dev/null 2>&1 -+ if /usr/bin/strings-static -a ${CMD} > /dev/null 2>&1 - then - STATUS=${INFECTED} - fi +--- chkrootkit ++++ chkrootkit +@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1 + unalias ps > /dev/null 2>&1 + unalias dirname > /dev/null 2>&1 + ++cd /usr/sbin ++ + # Workaround for recent GNU coreutils + _POSIX2_VERSION=199209 + export _POSIX2_VERSION diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch new file mode 100644 index 000000000..4e3694aad --- /dev/null +++ b/extra/chkrootkit/kallsyms.patch @@ -0,0 +1,30 @@ +--- a/chkrootkit ++++ b/chkrootkit +@@ -308,7 +316,7 @@ lkm () + fi + + if [ "${EXPERT}" = "t" ]; then +- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null ++ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null + [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null + PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` + [ "$PV" = "" ] && PV=2 +@@ -318,14 +326,14 @@ lkm () + fi + + ### adore LKM +- [ -r /proc/ksyms ] && \ +- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then ++ [ -r /proc/kallsyms ] && \ ++ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then + echo "Warning: Adore LKM installed" + fi + + ### sebek LKM (Adore based) +- [ -r /proc/ksyms ] && \ +- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then ++ [ -r /proc/kallsyms ] && \ ++ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then + echo "Warning: Sebek LKM installed" + fi + diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index ce46b36b6..73d29edab 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126103 2011-06-01 14:26:46Z stephane $ +# $Id: PKGBUILD 138480 2011-09-24 16:46:36Z stephane $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=2 +pkgrel=3 pkgdesc="intelligent blend tool for overlapping picture" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index f92f76cb0..0bbd13537 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138105 2011-09-16 14:11:53Z ibiru $ +# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110916 +pkgver=20110923 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('d065a16866c9bcf4d06c5452b2fbdc56' +md5sums=('36111c640a2eea19f677924ac3193ce4' '081d03278559a351322157a441fabcf5') build() { @@ -47,7 +47,10 @@ build() { make make tools/qt-faststart make doc/ff{mpeg,play,server}.1 +} +package() { + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 2222f461e..a9d3b9d69 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138349 2011-09-20 14:19:11Z dan $ +# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.6.3 +pkgver=1.7.6.4 _manver=1.7.6.1 pkgrel=1 pkgdesc="the fast distributed version control system" @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('c8f9390f970079495085d343671d6646' +md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8' 'cae559424a62507cb2c15252d85a158e' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('b8c7642f7e2b6638c442c0d3f907d197023b8c9a35cb03681643ed7ec619eff8' +sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6' 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index e573f7b8d..51a9e9ea3 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ +# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'mesa') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') +sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD index b7cbc2aaa..a5f6db925 100644 --- a/extra/gstreamer0.10-ffmpeg/PKGBUILD +++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 100249 2010-11-22 10:52:57Z jgc $ +# $Id: PKGBUILD 138452 2011-09-23 18:40:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-ffmpeg -pkgver=0.10.11 +pkgver=0.10.12 pkgrel=1 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gstreamer0.10-base>=0.10.30' 'bzip2') +depends=('gstreamer0.10-base' 'bzip2') makedepends=('pkgconfig' 'yasm' 'sdl') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') +options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2) -sha256sums=('ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e') +sha256sums=('b17707102b4bfa5e0d5095be3608ee2d4388268eab822c9a0ce7a18011bdd73b') build() { cd "${srcdir}/gst-ffmpeg-${pkgver}" @@ -20,6 +21,10 @@ build() { unset CXXFLAGS ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" make +} + +package() { + cd "${srcdir}/gst-ffmpeg-${pkgver}" + make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}"/usr/lib/gstreamer-0.10/*.la } diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 155602fa5..c6ffd408a 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132767 2011-07-25 23:16:55Z eric $ +# $Id: PKGBUILD 138484 2011-09-24 16:46:40Z stephane $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 58f37c8a3..c5f1d0ece 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137987 2011-09-13 21:30:06Z eric $ +# $Id: PKGBUILD 138489 2011-09-25 02:10:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.5 +pkgver=6.7.2.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,9 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('ce0294e6bc7ca3ece03a432518143a29' - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' +sha1sums=('227cc36d2a82d438cfb8b34ff1c7049e43d287ea' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index dfa38f908..49ce18484 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137656 2011-09-10 10:56:33Z pierre $ +# $Id: PKGBUILD 138486 2011-09-24 16:46:43Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index 71ef0e32e..a36a57435 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136206 2011-08-24 08:33:01Z ibiru $ +# $Id: PKGBUILD 138456 2011-09-23 18:49:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.11 +pkgver=3.12 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -12,7 +12,7 @@ url="http://www.infradead.org/openconnect.html" depends=('libxml2' 'openssl' 'libproxy') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b66927f98cfeb577b3016f8b83005d6b') +md5sums=('2f4fceb3f921ca8deb3a7cbd19a5e008') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD index f59e0e8d5..b24f162b7 100644 --- a/extra/pyopenssl/PKGBUILD +++ b/extra/pyopenssl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 132041 2011-07-19 13:27:24Z ibiru $ +# $Id: PKGBUILD 138458 2011-09-23 18:52:47Z ibiru $ # Maintainer : Ionut Biru<ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgbase=pyopenssl pkgname=('pyopenssl' 'python2-pyopenssl') -pkgver=0.12 +pkgver=0.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/pyopenssl/" +url="http://pypi.python.org/pypi/pyOpenSSL" license=('LGPL2.1') makedepends=('python' 'python2' 'openssl') source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) -md5sums=('60a7bbb6160950823eddcbba2cbcb0d6') +md5sums=('767bca18a71178ca353dff9e10941929') build() { cd "${srcdir}" @@ -21,7 +21,7 @@ build() { cd "pyOpenSSL-${pkgver}" python setup.py build - #build python 3 module + #build python 2 module cd ../"pyOpenSSL-${pkgver}-python2" python2 setup.py build } diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index f3e051171..556f359e8 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136236 2011-08-25 06:48:07Z tpowa $ +# $Id: PKGBUILD 138370 2011-09-21 09:30:05Z tpowa $ # Maintainer: andyrtr <andyrtr funnychar archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar -pkgver=1.2.2 -pkgrel=3 +pkgver=1.2.3 +pkgrel=1 pkgdesc="modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -23,14 +23,10 @@ options=('!libtool') install=${pkgname}.install backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 - org.freedesktop.udisks.pkla - fix-gvfs.patch - fix-samba.patch) + org.freedesktop.udisks.pkla) build() { cd ${srcdir}/Thunar-${pkgver} - patch -Np1 -i ../fix-gvfs.patch - patch -Np1 -i ../fix-samba.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -59,8 +55,5 @@ package() { install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ } - -md5sums=('a86df0212db71e61f459bda6bc7b7fb6' - 'a7ddb5eec02d9a8e91a2997862e73cd8' - '167c79462cddc5aaa1fcdc814041350b' - 'c8063873958d89402046f29b78c1d8d4') +md5sums=('0a2c36cdd3cb3a2ab52cbf6055415b85' + 'a7ddb5eec02d9a8e91a2997862e73cd8') diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD index fc5a39222..6f5de6602 100644 --- a/extra/trayer/PKGBUILD +++ b/extra/trayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122890 2011-05-07 04:26:20Z eric $ +# $Id: PKGBUILD 138436 2011-09-23 04:20:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=trayer pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight GTK2-based systray" arch=('i686' 'x86_64' 'mips64el') url="https://gna.org/projects/fvwm-crystal/" @@ -12,13 +12,15 @@ depends=('gtk2') makedepends=('libxmu') options=('!makeflags') source=(http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz - trayer.diff) + trayer.diff manpage.diff) md5sums=('e1b0b6464f991f2c296561e377585867' - '7f66eee885563871f9f76646bca6b14d') + '7f66eee885563871f9f76646bca6b14d' + '3f1c92bbe275f186b613c04a47e8e977') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../trayer.diff + patch -p1 -i ../manpage.diff sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } @@ -26,6 +28,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX="${pkgdir}/usr" install - install -D -m644 README "${pkgdir}/usr/share/doc/${pkgname}/README" + install -D -m644 trayer.1 "${pkgdir}/usr/share/man/man1/trayer.1" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/trayer/manpage.diff b/extra/trayer/manpage.diff new file mode 100644 index 000000000..c99fc71af --- /dev/null +++ b/extra/trayer/manpage.diff @@ -0,0 +1,204 @@ +Description: Debian manpage and path setup +Author: Jens Peter Secher <jps@debian.org> +Index: trayer/trayer.1 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ trayer/trayer.1 2011-05-08 21:38:37.000000000 +0200 +@@ -0,0 +1,197 @@ ++.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal" ++.SH NAME ++trayer \- a lightweight GTK2\-based systray for UNIX desktop ++.SH SYNOPSIS ++.B trayer \-h ++.br ++.B trayer \-v ++.br ++.B trayer ++.\" ++.RB [\| \-\-edge ++.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] ++.\" ++.RB [\| \-\-align ++.RI \| left \||\| right \||\| center \|] ++.\" ++.RB [\| \-\-margin ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-widthtype ++.RI \| request \||\| pixel \||\| percent ++.RI \|] ++.\" ++.RB [\| \-\-width ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-heighttype ++.RI \| <pixel> \|] ++.\" ++.RB [\| \-\-height ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-SetDockType ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-SetPartialStrut ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-transparent ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-alpha ++.RI \| <value> \|] ++.\" ++.RB [\| \-\-tint ++.RI \| <color> \|] ++.\" ++.RB [\| \-\-distance ++.RI \| <length> \|] ++.\" ++.RB [\| \-\-distancefrom ++.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] ++.\" ++.RB [\| \-\-expand ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-padding ++.RI \| <size> \|] ++.\" ++.SH DESCRIPTION ++.B trayer ++is a small program designed to provide system tray similar to these in ++.B GNOME ++/ ++.B KDE ++desktop environments for window managers which does not ++support that function. It is similar to other applications such as ++.B peksystray ++and \fBdocker\fP. ++.PP ++System tray is a place, where many applications put their icons, so they are ++always visible. Such icons may present status of an application and allow user ++to control the program. ++.PP ++\fBtrayer\fP's code was extracted from \fBfbpanel\fP application, you can find more ++about it on its homepage: http://fbpanel.sourceforge.net/. ++.SH OPTIONS ++This programs follow the usual GNU command line syntax, with long ++options starting with two dashes (`-'). ++A summary of options is included below. ++.TP ++.B \-\-help ++.TP ++.B \-h ++Show summary of options and exit. ++ ++.TP ++.B \-\-version ++.TP ++.B \-v ++Show version of program and exit. ++ ++.TP ++\fB\-\-edge\fP \fIleft\fP\||\|\fIright\fP\||\|\fItop\fP\||\|\fIbottom\fP\||\|\fInone\fP ++Specifies a screen edge to use. ++ ++.TP ++\fB\-\-align\fP \fIleft\fP\||\|\fIcenter\fP\||\|\fIright\fP ++Specifies an align of the icons. ++ ++.TP ++\fB\-\-margin\fP \fI<size>\fP ++Specifies length of margin (in pixels) ++ ++.TP ++\fB\-\-widthtype\fB \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP ++Specifies method of calculating trayer's window width: ++.RS ++.TP ++\fIrequest\fP ++Follow application icons' size, so trayer may shrink or expand dynamically. ++ ++.TP ++\fIpixel\fP ++Set a fixed size, given with \fB\-\-width\fP option in pixels. ++ ++.TP ++\fIpercent\fP ++Set a fixed size, given with \fB\-\-width\fP option in percentage of a length of screen edge. ++.RE ++ ++.TP ++\fB\-\-width\fP \fI<size>\fP ++Width of trayer's window. Ignored when \fB\-\-widthtype\fP is set to \fIrequest\fP. ++ ++.TP ++\fB\-\-heighttype\fP \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP ++Specifies method of calculating trayer's window height: ++.RS ++.TP ++\fIrequest\fP ++Follow application icons' size, so trayer may shrink or expand dynamically. ++ ++.TP ++\fIpixel\fP ++Set a fixed size, given with \fB\-\-height\fP option in pixels. ++ ++.TP ++\fIpercent\fP ++Set a fixed size, given with \fB\-\-height\fP option in percentage of a length of screen edge. ++.RE ++ ++.TP ++\fB\-\-height\fP \fI<size>\fP ++Height of trayer's window. Ignored when \fB\-\-heighttype\fP is set to \fIrequest\fP. ++ ++.TP ++\fB\-\-SetDockType\fP \fItrue\fP\||\|\fIfalse\fP ++Identify panel window type as dock. ++ ++.TP ++\fB\-\-SetPartialStrut\fP \fItrue\fP\||\|\fIfalse\fP ++Reserve panel space so that it will not be covered by maximized windows. ++ ++.TP ++\fB\-\-transparent\fP \fItrue\fP\||\|\fIfalse\fP ++Use transparency. ++ ++.TP ++\fB\-\-alpha\fP \fI<value>\fP ++Percentage of transparency (0 \- nontransparent, 255 \- fully transparent) ++ ++.TP ++\fB\-\-tint\fP \fI<color>\fP ++Color used to tint transparent background. Color is given as a 24-bit C hexadecimal integer, for example: 0xff0000 is red, 0xff8800 is orange and 0x00ff00 is green. ++ ++.TP ++\fB\-\-distance\fP \fI<length>\fP ++Specifies distance between trayer's window and screen edge (in pixels) ++ ++.TP ++\fB\-\-distancefrom\fP \fI<edge>\fP ++Specifies which edge to calculate distance from, see above. ++ ++.TP ++\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP ++Specifies whether trayer may accommodate extra space when there is too much ++icons. ++ ++.TP ++\fB\-\-padding\fP \fI<size>\fP ++Extra space between icons and trayer window's border. ++ ++.SH SEE ALSO ++.BR fbpanel (1) ++.SH AUTHORS ++Anatoly Asviyan <aanatoly@users.sf.net> \- fbpanel ++.br ++Rafal Bisingier <ravbc@man.poznan.pl> ++.br ++Maciej Delmanowski <harnir@users.berlios.de> ++.br ++Grzegorz Nieweglowski <hoppke@dobremiasto.net> ++.br ++Thomas Rydzynski ++.PP ++This manual page was written by Tomasz Melcer <liori@interia.pl>. diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 015cf6547..99b3d6d2e 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120497 2011-04-24 14:50:22Z andyrtr $ +# $Id: PKGBUILD 138386 2011-09-21 13:11:57Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.21 -pkgrel=3 +pkgver=0.1.22 +pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -12,10 +12,10 @@ arch=('i686' 'x86_64' 'mips64el') groups=('xfce4') depends=('poppler-glib' 'dbus-glib') makedepends=('intltool' 'ffmpegthumbnailer') -optdepends=('ffmpegthumbnailer: for video thunbnails') +optdepends=('ffmpegthumbnailer: for video thumbnails' + 'gstreamer0.10: for video thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2ef0d30750f95efe345de4655049d4f6') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -31,3 +31,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=$pkgdir install } +md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9') diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD new file mode 100644 index 000000000..05ab8890f --- /dev/null +++ b/extra/varnish/PKGBUILD @@ -0,0 +1,44 @@ +# $Id +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Douglas Soares de Andrade +# Contributor: Roberto Alsina <ralsina@kde.org> + +pkgname=varnish +pkgver=3.0.1 +pkgrel=1 +pkgdesc="High-performance HTTP accelerator" +arch=('i686' 'x86_64') +url="http://www.varnish-cache.org/" +license=('BSD') +depends=('gcc' 'libedit' 'pcre') +backup=('etc/conf.d/varnish') +install=$pkgname.install +options=('!libtool') +source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" + "$pkgname.conf.d" + "rc.$pkgname") +md5sums=('d01d9c1f2da2b2a1b18299a0b44c8580' + 'd42eebc7f0ac429d9740125ff1e61daf' + '18b7747020ecfe2eac7445971a7014e3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish new file mode 100644 index 000000000..2ebd97e33 --- /dev/null +++ b/extra/varnish/rc.varnish @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/varnish + +pidfile=/run/varnish.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case "$1" in + start) + stat_busy "Starting Varnish Reverse Proxy" + if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then + add_daemon varnish + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Varnish Reverse Proxy" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon varnish + 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/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d new file mode 100644 index 000000000..2970468b7 --- /dev/null +++ b/extra/varnish/varnish.conf.d @@ -0,0 +1,9 @@ +# +# Command line options to varnishd +# + +VARNISHD_OPTS="-a 0.0.0.0:80 \ + -b localhost:8080 \ + -T localhost:6082 \ + -s malloc,64M + -u nobody -g nobody" diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install new file mode 100644 index 000000000..fceaf4be7 --- /dev/null +++ b/extra/varnish/varnish.install @@ -0,0 +1,6 @@ +#!/bin/sh + +# remove localstatedir -- compiled VCL and slab files will still be here. +post_remove() { + rm -rf /var/lib/varnish +} diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index e64e3085f..988741d19 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 119933 2011-04-17 01:32:48Z andrea $ +# $Id: PKGBUILD 138426 2011-09-22 19:46:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=virtuoso pkgver=6.1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') depends=('openssl') makedepends=('bison' 'flex') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -md5sums=('7d4b0497411ff1c34d7ca247618cdd17') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz" + 'fix-unicode.patch') +md5sums=('7d4b0497411ff1c34d7ca247618cdd17' + '550dcc877dcbda707aa7ba53800e5d5b') build() { cd ${srcdir}/${pkgname}-opensource-${pkgver} + # Already fixed upstream + patch -p0 -i "${srcdir}"/fix-unicode.patch + ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch new file mode 100644 index 000000000..30046d233 --- /dev/null +++ b/extra/virtuoso/fix-unicode.patch @@ -0,0 +1,21 @@ +Index: libsrc/Wi/xqf.c +=================================================================== +RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v +retrieving revision 1.21.2.9 +retrieving revision 1.21.2.12 +diff -u -r1.21.2.9 -r1.21.2.12 +--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 ++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 +@@ -3520,6 +3552,12 @@ + desc = xqf_str_parser_descs + desc_idx; + if (DV_DB_NULL == arg_dtp) + return NEW_DB_NULL; ++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ ++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) ++ { ++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); ++ goto res_ready; ++ } + if (DV_STRING != arg_dtp) + { + caddr_t err = NULL; |