aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-01-12 08:02:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-12 08:02:45 +0000
commit0ca38d965d18ba8c5c0c1a4a9cd4b453cfed6f14 (patch)
tree0500a3f9ed5f94a2a851f766d915dc8c678a24ea
parent34a1678ba2664362e9f27e7ef530946c39edcad1 (diff)
downloadaports-0ca38d965d18ba8c5c0c1a4a9cd4b453cfed6f14.tar.bz2
aports-0ca38d965d18ba8c5c0c1a4a9cd4b453cfed6f14.tar.xz
x11/xarchiver: fix stack smash
-rw-r--r--x11/xarchiver/APKBUILD13
-rw-r--r--x11/xarchiver/xarchiver-0.5.2-stack-smash.patch20
2 files changed, 30 insertions, 3 deletions
diff --git a/x11/xarchiver/APKBUILD b/x11/xarchiver/APKBUILD
index 0ed45971e0..d114f14ca3 100644
--- a/x11/xarchiver/APKBUILD
+++ b/x11/xarchiver/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xarchiver
pkgver=0.5.2
-pkgrel=0
+pkgrel=1
pkgdesc="GTK+ frontend to various command line archivers"
url="http://xarchiver.xfce.org/"
license="GPL"
@@ -9,7 +9,13 @@ depends="desktop-file-utils hicolor-icon-theme tar"
makedepends="intltool gtk+-dev"
install=
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+ xarchiver-0.5.2-stack-smash.patch"
+
+prepare() {
+ cd "$srcdir/xarchiver-$pkgver"
+ patch -p1 -i "$srcdir"/xarchiver-0.5.2-stack-smash.patch
+}
build() {
cd "$srcdir/xarchiver-$pkgver"
@@ -22,4 +28,5 @@ package() {
cd "$srcdir/xarchiver-$pkgver"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="2bc7f06403cc6582dd4a8029ec9d038d xarchiver-0.5.2.tar.bz2"
+md5sums="2bc7f06403cc6582dd4a8029ec9d038d xarchiver-0.5.2.tar.bz2
+74cdf6a77e91ac7b02270002c582cea1 xarchiver-0.5.2-stack-smash.patch"
diff --git a/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch b/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch
new file mode 100644
index 0000000000..66104822ea
--- /dev/null
+++ b/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch
@@ -0,0 +1,20 @@
+--- xarchiver-0.5.2-old/src/window.c 2008-11-11 09:31:45.000000000 +0100
++++ xarchiver-0.5.2/src/window.c 2009-01-25 16:26:07.000000000 +0100
+@@ -1447,7 +1447,7 @@
+ GtkTreeIter iter;
+ gint n_elem = 0,pos = 0,dirs = 0;
+ unsigned long int total_size = 0;
+- unsigned long int size = 0;
++ guint64 size = 0;
+ XEntry *entry = NULL;
+
+ path = gtk_tree_path_new_first();
+@@ -1517,7 +1517,7 @@
+ GtkTreeModel *model;
+ gint selected = 0,pos = 0,dirs = 0;
+ unsigned long int total_size = 0;
+- unsigned long int size = 0;
++ guint64 size = 0;
+ XEntry *entry;
+
+ switch (archive->type)