aboutsummaryrefslogtreecommitdiffstats
path: root/main/conky/APKBUILD
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-17 19:33:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-17 19:33:14 +0000
commit88e633357b740fd805059e7902277ef67ec39ebc (patch)
tree85c1c86c935048d69af79c9f8a20194a2370dfa2 /main/conky/APKBUILD
parent0197c4c3d23966bc4b7c2f7a2e9a351c8b0b2e72 (diff)
main/conky: security fix CVE-2011-3616
ref #767
Diffstat (limited to 'main/conky/APKBUILD')
-rw-r--r--main/conky/APKBUILD26
1 files changed, 20 insertions, 6 deletions
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 0ff7ecf0d3c..a392ae680db 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conky
pkgver=1.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
url="http://conky.sourceforge.net/"
arch="all"
@@ -12,12 +12,23 @@ makedepends="pkgconfig alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
cairo-dev tolua++ ncurses-dev
"
subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.sourceforge.net/project/conky/conky/$pkgver/conky-$pkgver.tar.bz2"
+source="http://downloads.sourceforge.net/project/conky/conky/$pkgver/conky-$pkgver.tar.bz2
+ conky-1.8.1-curl-headers.patch
+ conky-1.8.1-secunia-SA43225.patch"
_builddir="$srcdir"/$pkgname-$pkgver
-build ()
-{
- cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+ cd "$_builddir"
+ local i
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
+
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
--enable-wlan \
@@ -35,6 +46,9 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ rm "$pkgdir"/usr/lib/conky/*.la
}
-md5sums="366dc6a5c2ebebfbe6f53da25061b5d6 conky-1.8.1.tar.bz2"
+md5sums="366dc6a5c2ebebfbe6f53da25061b5d6 conky-1.8.1.tar.bz2
+94e415b1189be5fb6d6ff5117c8df06e conky-1.8.1-curl-headers.patch
+e00e00b1e4dd77536f8caed7a2b851c1 conky-1.8.1-secunia-SA43225.patch"