diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-05 14:26:38 +0000 |
| commit | 415856bdd4f48ab4f2732996f0bae58595092bbe (patch) | |
| tree | ede2018b591f6dfb477fe9341ba17b9bc000fab9 /extra/ocfs2-tools | |
Tue Apr 5 14:26:38 UTC 2011
Diffstat (limited to 'extra/ocfs2-tools')
| -rw-r--r-- | extra/ocfs2-tools/PKGBUILD | 35 | ||||
| -rw-r--r-- | extra/ocfs2-tools/gcc45-ftbfs.patch | 21 |
2 files changed, 56 insertions, 0 deletions
diff --git a/extra/ocfs2-tools/PKGBUILD b/extra/ocfs2-tools/PKGBUILD new file mode 100644 index 000000000..9db43e1e9 --- /dev/null +++ b/extra/ocfs2-tools/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 90997 2010-09-20 13:54:14Z remy $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=ocfs2-tools +pkgver=1.4.3 +pkgrel=2 +pkgdesc="Oracle Cluster File System 2 utilities" +arch=(i686 x86_64) +url="http://oss.oracle.com/projects/ocfs2-tools/" +depends=('e2fsprogs' 'glib2' 'readline>=6.0.00') +license=('GPL2') +source=(http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.4/$pkgname-$pkgver.tar.gz +gcc45-ftbfs.patch) +options=(!makeflags) +optdepends=('python2: for using ocfs2console') +md5sums=('7d8895ea41999ce8f468e2bc7dc55ddc' + '5dba18ca5596b1de0f2eeb30f5ed1656') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's#/usr/bin/python#/usr/bin/python2#' ocfs2console/ocfs2console + # Fix build with gcc 4.5 + # http://svn.debian.org/viewsvn/collab-maint?view=rev&revision=15814 + patch -p1 -i ${srcdir}/gcc45-ftbfs.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make LDFLAGS=-L/usr/lib +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -m 755 -D $srcdir/$pkgname-$pkgver/vendor/common/ocfs2.init \ + $pkgdir/etc/rc.d/ocfs2 + install -m 755 -D $srcdir/$pkgname-$pkgver/vendor/common/o2cb.init \ + $pkgdir/etc/rc.d/o2cb +} diff --git a/extra/ocfs2-tools/gcc45-ftbfs.patch b/extra/ocfs2-tools/gcc45-ftbfs.patch new file mode 100644 index 000000000..0db24f49e --- /dev/null +++ b/extra/ocfs2-tools/gcc45-ftbfs.patch @@ -0,0 +1,21 @@ +diff -urN ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c +--- ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c 2009-04-14 00:10:40.000000000 +0200 ++++ ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c 2010-03-24 07:23:45.000000000 +0100 +@@ -261,7 +261,7 @@ + char *extra = NULL; + int dev_ro = 0; + char *hbstr = NULL; +- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = ""; ++ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1]; + ocfs2_filesys *fs = NULL; + struct o2cb_cluster_desc cluster; + struct o2cb_region_desc desc; +@@ -269,6 +269,8 @@ + int hb_started = 0; + struct stat statbuf; + ++ stackstr[0] = '\0'; ++ + initialize_ocfs_error_table(); + initialize_o2dl_error_table(); + initialize_o2cb_error_table(); |