From 977e12800373708110e31c40444701bf5d896ab6 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sun, 16 Jun 2013 20:13:13 -0300 Subject: {cluster-glue,pacemaker,heartbeat,resource-agent}: fixing grep and free --- pcr/cluster-glue/PKGBUILD | 36 ++++++++++++++++++------------------ pcr/heartbeat/PKGBUILD | 37 +++++++++++++++++++------------------ pcr/pacemaker/PKGBUILD | 32 ++++++++++++++++---------------- pcr/resource-agent/PKGBUILD | 36 ++++++++++++++++++------------------ 4 files changed, 71 insertions(+), 70 deletions(-) (limited to 'pcr') diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 684efe7c2..1a81e15d4 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -5,7 +5,7 @@ _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} pkgver=1.0.11 -pkgrel=11 +pkgrel=12 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -38,7 +38,7 @@ depends=( optdepends=net-tools makedepends=( help2man - libxslt + #libxslt lynx net-tools openssh @@ -82,42 +82,42 @@ prepare() { s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|; ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) #sed -i 's|/lib64|/lib|; - # ' $(grep -rl /lib64) + # ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; + s|OpenSource|Free|; + s|opensource|free|; s|freesoftware.org|opensource.org|; s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -193,7 +193,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD index f9ee9254b..a33250f84 100644 --- a/pcr/heartbeat/PKGBUILD +++ b/pcr/heartbeat/PKGBUILD @@ -3,7 +3,7 @@ pkgname=heartbeat pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=10 +pkgrel=11 pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' arch=( i686 @@ -50,42 +50,42 @@ prepare() { " configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) #sed -i 's|/lib64|/lib|; - # ' $(grep -rl /lib64) + # ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') #sed -i 's|OpenSource / ||; # s|opensource / ||; - # s|OpenSource|FreeSoftware|; - # s|opensource|freesoftware|; + # s|OpenSource|Free|; + # s|opensource|free|; # s|freesoftware.org|opensource.org|; # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - # ' $(grep -ril opensource) + # ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -163,7 +163,7 @@ prepare() { s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; s|ConfigureLinux|ConfigureGNULinux|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { @@ -175,7 +175,8 @@ build() { --enable-valgrind\ --libdir=/usr/lib\ --localstatedir=/var\ - --sysconfdir=/etc + --sysconfdir=/etc\ + --with-initdir=/etc/rc.d setarch $CARCH make } diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 7ee8209ad..3681f9111 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pacemaker pkgver=1.1.9 -pkgrel=5 +pkgrel=6 pkgdesc='Cluster resource manager (Linux-HA)' arch=( i686 @@ -44,33 +44,33 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) sed -i 's|/lib64|/lib|; - ' $(grep -rl /lib64) + ' $(grep -rlI /lib64) sed -i 's|usr/libexec|usr/lib|; - ' $(grep -rl usr/libexec) + ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; s|OpenSource|FreeSoftware|; @@ -79,7 +79,7 @@ prepare() { s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -155,7 +155,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) sed -i 's|Linux|GNU/Linux|; s|ArchGNU/Linux|ArchLinux|; s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; @@ -178,7 +178,7 @@ prepare() { s|MkGNU/Linux|MkLinux|; s|SEGNU/Linux|SELinux|; s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rl Linux | grep .po) + ' $(grep -rlI Linux | grep .po) } build() { diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 46c95ede1..66505fcbe 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -7,7 +7,7 @@ _pkgnamex=${_pkgname1^}_${_pkgname2^} _pkgnamey=${pkgname}s _pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=5 +pkgrel=6 pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 @@ -28,7 +28,7 @@ depends=( ) optdepends=net-tools makedepends=( - libxslt + #libxslt libvirt net-tools openssh @@ -47,42 +47,42 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' $(grep -rl INCLUDES | grep Makefile.am) + ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh) + ' $(grep -rlI bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin') + ' $(grep -rlI ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin') + ' $(grep -rlI ' /sbin') sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/sbin) + ' $(grep -rlI usr/sbin) sed -i 's|/lib64|/lib|; - ' $(grep -rl /lib64) + ' $(grep -rlI /lib64) #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rl usr/libexec) + # ' $(grep -rlI usr/libexec) sed -i 's|var/lock|run/lock|; - ' $(grep -rl var/lock) + ' $(grep -rlI var/lock) sed -i 's|var/run|run|; - ' $(grep -rl var/run) + ' $(grep -rlI var/run) # remove Open Source term sed -i 's|Open Source / ||; s|open source / ||; - s|Open Source|Free Software|; - s|open source|free software|; + s|Open Source|Free|; + s|open source|free|; s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -ril 'open source') + ' $(grep -rilI 'open source') sed -i 's|OpenSource / ||; s|opensource / ||; - s|OpenSource|FreeSoftware|; - s|opensource|freesoftware|; + s|OpenSource|Free|; + s|opensource|free|; s|freesoftware.org|opensource.org|; s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -ril opensource) + ' $(grep -rilI opensource) # remove Linux term sed -i 's|Linux,|GNU/Linux,|; @@ -161,7 +161,7 @@ prepare() { s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; / 2.6, the alignment should be / s|GNU/Linux|Linux|; s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; - ' $(grep -rl Linux) + ' $(grep -rlI Linux) } build() { -- cgit v1.2.3-54-g00ecf