From b72845626d062a99a4556e041b126e3eed94abb9 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 07:27:46 -0300 Subject: resource-agent, heartbeat, pacemaker: drop ha- prefix type and drop unused services --- pcr/pacemaker/PKGBUILD | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pcr/pacemaker/PKGBUILD (limited to 'pcr/pacemaker/PKGBUILD') diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD new file mode 100644 index 000000000..2cd0be84c --- /dev/null +++ b/pcr/pacemaker/PKGBUILD @@ -0,0 +1,83 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=ha-pacemaker +_pkgname=${pkgname:3} +pkgver=1.1.9 +pkgrel=3 +pkgdesc='Cluster resource manager' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/${_pkgname^} +license=GPL2 +depends=( + corosync + ha-heartbeat + ha-resourceagent + libqb +) +optdepens=( + inkscape + lynx + openssh + valgrind + w3m +) +makedepends=( + help2man + inkscape + libxslt + lynx + openssh + valgrind + w3m +) +options=(!libtool) +source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz +sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 + +prepare() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am +} + +build() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings=yes\ + --disable-static\ + --enable-systemd\ + --enable-upstart\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-acl\ + --with-ais\ + --with-cibsecrets\ + --with-cman\ + --with-corosync\ + --with-cs-quorum\ + --with-esmtp\ + --with-heartbeat\ + --with-lcrso-dir=/usr/lib/lcrso\ + --with-nagios\ + --with-profiling\ + --with-snmp\ + --without-gcov + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/usr/sbin/cibsecret{,-pacemaker} +} -- cgit v1.2.3-54-g00ecf From 158663ca448f1d2f8127ddb8b36d1e8fcae6e420 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 17:38:57 -0300 Subject: pacemaker: fixing pkg --- pcr/pacemaker/PKGBUILD | 179 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 157 insertions(+), 22 deletions(-) (limited to 'pcr/pacemaker/PKGBUILD') diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 2cd0be84c..a4ea4c525 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -1,30 +1,27 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva -pkgname=ha-pacemaker -_pkgname=${pkgname:3} +pkgname=pacemaker pkgver=1.1.9 -pkgrel=3 -pkgdesc='Cluster resource manager' +pkgrel=4 +pkgdesc='Cluster resource manager (Linux-HA)' arch=( i686 x86_64 mips64el ) -url=http://linux-ha.org/wiki/${_pkgname^} +group=linux-ha +url=http://$group.org/wiki/${pkgname^} license=GPL2 depends=( corosync - ha-heartbeat - ha-resourceagent + heartbeat + jre7-openjdk + resource-agent libqb + libxslt + #saxon.jar? ) -optdepens=( - inkscape - lynx - openssh - valgrind - w3m -) +optdepens=openssh makedepends=( help2man inkscape @@ -35,24 +32,160 @@ makedepends=( w3m ) options=(!libtool) -source=https://github.com/ClusterLabs/$_pkgname/archive/${_pkgname^}-$pkgver.tar.gz +source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 prepare() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + cd $srcdir/$pkgname-${pkgname^}-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {cib,crmd,cts,lib/{cib,cluster,common,fencing,lrmd,pengine,services,transition},mcp,pengine,replace,tools}/Makefile.am + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl 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|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + 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) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) + sed -i 's|Linux|GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux | grep .po) } build() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + cd $srcdir/$pkgname-${pkgname^}-$pkgver setarch $CARCH ./autogen.sh setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=yes\ --disable-static\ + --enable-fatal-warnings\ --enable-systemd\ --enable-upstart\ --libdir=/usr/lib\ @@ -76,8 +209,10 @@ build() { } package() { - cd $srcdir/$_pkgname-${_pkgname^}-$pkgver + cd $srcdir/$pkgname-${pkgname^}-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - mv $pkgdir/usr/sbin/cibsecret{,-pacemaker} + mv $pkgdir/usr/sbin/cibsecret{,-$pkgname} } + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 019485ae03fd122fc18fd097dd2ae796d550c0c4 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 17:40:54 -0300 Subject: pacemaker: fixing pkg --- pcr/pacemaker/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pcr/pacemaker/PKGBUILD') diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index a4ea4c525..10d32ad33 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -32,6 +32,9 @@ makedepends=( w3m ) options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 -- cgit v1.2.3-54-g00ecf From 51534c8074881a4413a5b5b001e9ee4444085b07 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sat, 1 Jun 2013 16:57:23 -0300 Subject: pacemaker: fixing pkg --- pcr/pacemaker/PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pcr/pacemaker/PKGBUILD') diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 10d32ad33..3a6b2f22b 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pacemaker pkgver=1.1.9 -pkgrel=4 +pkgrel=5 pkgdesc='Cluster resource manager (Linux-HA)' arch=( i686 @@ -15,17 +15,15 @@ license=GPL2 depends=( corosync heartbeat - jre7-openjdk - resource-agent libqb libxslt - #saxon.jar? + resource-agent + #saxon-he ) -optdepens=openssh makedepends=( + asciidoc help2man inkscape - libxslt lynx openssh valgrind @@ -194,6 +192,7 @@ build() { --libdir=/usr/lib\ --libexecdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-acl\ --with-ais\ @@ -215,7 +214,9 @@ package() { cd $srcdir/$pkgname-${pkgname^}-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - mv $pkgdir/usr/sbin/cibsecret{,-$pkgname} + rm /etc/rc.d/pacemaker{_remote,} && rmdir /etc{/rc.d,} + mv $pkgdir/{var/,}run + mv $pkgdir/usr/bin/cibsecret{,-$pkgname} } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 8bc9d00dfcde0f3b844917713b3d31749ce51b50 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sat, 1 Jun 2013 17:04:29 -0300 Subject: pacemaker: fixing path --- pcr/pacemaker/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pcr/pacemaker/PKGBUILD') diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD index 3a6b2f22b..7ee8209ad 100644 --- a/pcr/pacemaker/PKGBUILD +++ b/pcr/pacemaker/PKGBUILD @@ -214,7 +214,7 @@ package() { cd $srcdir/$pkgname-${pkgname^}-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - rm /etc/rc.d/pacemaker{_remote,} && rmdir /etc{/rc.d,} + rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,} mv $pkgdir/{var/,}run mv $pkgdir/usr/bin/cibsecret{,-$pkgname} } -- cgit v1.2.3-54-g00ecf 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/pacemaker/PKGBUILD') 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