summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/clamav/PKGBUILD17
-rw-r--r--extra/clamav/config.patch2
-rw-r--r--extra/clamav/install4
-rw-r--r--extra/clamav/logrotate4
-rw-r--r--extra/clamav/rc.d5
-rw-r--r--extra/clamav/tmpfiles.d1
-rw-r--r--extra/libdrm/PKGBUILD6
-rw-r--r--extra/libzip/PKGBUILD15
-rw-r--r--extra/qt/PKGBUILD32
-rw-r--r--extra/qt/gcc47.patch27
-rw-r--r--extra/xf86-video-ati/PKGBUILD8
11 files changed, 70 insertions, 51 deletions
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 7c4eb55fc..5fe88e742 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 153568 2012-03-16 04:06:01Z bisson $
+# $Id: PKGBUILD 154496 2012-03-29 15:43:20Z bisson $
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=clamav
pkgver=0.97.4
-pkgrel=1
+pkgrel=2
pkgdesc='Anti-virus toolkit for Unix'
url='http://www.clamav.net/'
license=('GPL')
@@ -17,12 +17,14 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
'rc.d'
'conf.d'
'logrotate'
+ 'tmpfiles.d'
'config.patch')
sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
- '50cfe02c97e4297a0efd25b23142408380305d30'
+ 'c9d508c1e5972f0f849d8694c1872455fa9e74de'
'cb116cdab49a810381a515cbcfb6a6c148547f07'
- 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
- '701a61571788d10ff7af01597785835c6bfea918')
+ '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
+ 'a224ea9b4d0f4f196827347d54bed51e11c197ea'
+ '1c8ef193919b041135115170acd6313f008de808')
install=install
@@ -44,15 +46,16 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- # make sure conf files get installed, because 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 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf"
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
+ # Un-distribute databases to require freshclam.
rm "${pkgdir}"/var/lib/clamav/*.cvd
}
diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch
index a0105bd48..0640df2c3 100644
--- a/extra/clamav/config.patch
+++ b/extra/clamav/config.patch
@@ -9,7 +9,7 @@ diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
+LogTime yes
@@ -61 +61 @@
-#PidFile /var/run/clamd.pid
-+PidFile /var/run/clamav/clamd.pid
++PidFile /run/clamav/clamd.pid
@@ -65 +65 @@
-#TemporaryDirectory /var/tmp
+TemporaryDirectory /tmp
diff --git a/extra/clamav/install b/extra/clamav/install
index 144134dde..a2092e815 100644
--- a/extra/clamav/install
+++ b/extra/clamav/install
@@ -2,9 +2,9 @@ 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/clamav
- chown clamav:root /var/log/clamav
chown -R clamav:clamav /var/lib/clamav
+ install -o clamav -g clamav -d /run/clamav
+ install -o clamav -g clamav -d /var/log/clamav
}
post_remove() {
diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate
index d1dc94dce..6a9051bed 100644
--- a/extra/clamav/logrotate
+++ b/extra/clamav/logrotate
@@ -2,7 +2,7 @@
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
+ /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
endscript
}
diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d
index 04e959903..127c86c0f 100644
--- a/extra/clamav/rc.d
+++ b/extra/clamav/rc.d
@@ -3,8 +3,7 @@
. /etc/rc.conf
. /etc/rc.d/functions
-[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav
-[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/clamav
+[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
@@ -24,7 +23,7 @@ case "$1" in
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
+ [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
if [[ $? -gt 0 ]]; then
stat_fail
else
diff --git a/extra/clamav/tmpfiles.d b/extra/clamav/tmpfiles.d
new file mode 100644
index 000000000..22d29941e
--- /dev/null
+++ b/extra/clamav/tmpfiles.d
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index dc9e17584..fa9f64eed 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153938 2012-03-20 20:33:27Z andyrtr $
+# $Id: PKGBUILD 154508 2012-03-29 17:30:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.32
+pkgver=2.4.33
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64 'mips64el')
@@ -17,7 +17,7 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
COPYING
# git_fixes.diff
)
-sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
+sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
'825ff5e0c4238b31bdea52f104bfec8949270e25'
'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 66338532f..c970e31d4 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 150601 2012-02-18 22:35:18Z pierre $
+# $Id: PKGBUILD 154546 2012-03-30 00:01:03Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libzip
-pkgver=0.10
-pkgrel=2
+pkgver=0.10.1
+pkgrel=1
pkgdesc="A C library for reading, creating, and modifying zip archives"
url="http://www.nih.at/libzip/index.html"
-license=('GPL2')
+license=('BSD')
arch=('i686' 'x86_64' 'mips64el')
depends=('zlib')
options=('!libtool')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'fix-headers.patch')
-md5sums=('47cdfcbc08c8bea0b52fdee4bf591622'
+md5sums=('d3e933ae049204badccf605f20aaecde'
'249395bd3a426c4c4e993e9d4753e1dd')
build() {
@@ -27,5 +27,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index ee76a64b1..26fc428d1 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 152665 2012-03-08 10:07:57Z andrea $
+# $Id: PKGBUILD 154524 2012-03-29 20:18:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=6
+pkgver=4.8.1
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,35 +18,23 @@ _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
- 'fix-qgraphicsscene-regression.patch'
- 'improved-filter-event.patch'
- 'qurl-backward-compatibility.patch'
- 'declarative-fix-sigbus.patch'
- 'improve-cups-support.patch')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
+ 'gcc47.patch'
+ 'declarative-fix-sigbus.patch')
+md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'c2e91fc028250a590e76effe234468e2'
- '444ebeb716d7c7379835efb8aa88e6c8'
- '7bc255a36733d0fbc80c1902ade4beca'
- 'aac963d05a9d5733e2bfce9e26607f51'
- 'c439c7731c25387352d8453ca7574971')
+ 'd8a0e81075b290ddc18ecd33b9b7ee22'
+ 'aac963d05a9d5733e2bfce9e26607f51')
build() {
cd "${srcdir}"/${_pkgfqn}
# MIPS N32-specific fix, shouldn't affect correctness on other platforms.
patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
- # (FS#28707)
- patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
- # (FS#27757) (KDEBUG#275469)
- patch -p1 -i "${srcdir}"/improved-filter-event.patch
- patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
-
- # (FS#28381) (KDEBUG#180051)
- patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ patch -p1 -i "${srcdir}"/gcc47.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
diff --git a/extra/qt/gcc47.patch b/extra/qt/gcc47.patch
new file mode 100644
index 000000000..62c436e6a
--- /dev/null
+++ b/extra/qt/gcc47.patch
@@ -0,0 +1,27 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+
+ class JSGlobalObject : public JSVariableObject {
+ protected:
+- using JSVariableObject::JSVariableObjectData;
+-
+- struct JSGlobalObjectData : public JSVariableObjectData {
++ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
+ // We use an explicit destructor function pointer instead of a
+ // virtual destructor because we want to avoid adding a vtable
+ // pointer to this struct. Adding a vtable pointer would force the
+diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+
+ class JSStaticScopeObject : public JSVariableObject {
+ protected:
+- using JSVariableObject::JSVariableObjectData;
+- struct JSStaticScopeObjectData : public JSVariableObjectData {
++ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
+ JSStaticScopeObjectData()
+ : JSVariableObjectData(&symbolTable, &registerStore + 1)
+ {
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 5cce5b37c..a9aae7f3d 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153325 2012-03-12 20:53:16Z andyrtr $
+# $Id: PKGBUILD 154506 2012-03-29 17:23:01Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xf86-video-ati
-pkgver=6.14.3
-pkgrel=2
+pkgver=6.14.4
+pkgrel=1
pkgdesc="X.org ati video driver"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.11.99.902')
groups=('xorg-drivers' 'xorg')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad')
+sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 03:49:59 +0000