From 9c502dcd730eff7ffaeb851a5cfe4f04c51bb5aa Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 29 May 2013 03:00:14 -0300 Subject: jitsi: fixing terms --- pcr/jitsi/PKGBUILD | 59 ++++++++++++++++++++----- pcr/jitsi/drop-open-term-on-index-jn-html.patch | 6 +++ 2 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 pcr/jitsi/drop-open-term-on-index-jn-html.patch diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 86169125a..87913af64 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,12 +1,13 @@ # Maintainer: Xavier Devlamynck # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne # Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgname=jitsi pkgver=2.2.4603.9615 pkgrel=2 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://jitsi.org" license=('LGPL') depends=('jre7-openjdk') @@ -14,30 +15,64 @@ makedepends=('apache-ant' 'jdk7-openjdk') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop - jitsi.sh) + jitsi.sh + drop-open-term-on-index-jn-html.patch) sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' - '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5') + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' + 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') -build() -{ - cd "${srcdir}/${pkgname}-src-${pkgver}" +prepare() { + cd $srcdir/$pkgname-src-$pkgver # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java # remove Open Source term - sed -i 's|Open Source / Free Software|Free Software|' www/index-jn.html - sed -i 's|opensource.org|gnu.org/philosophy/free-sw.html|' $(grep -rl 'opensource.org') - sed -i 's|Open Source|Free Software|' $(grep -rl 'Open Source') - sed -i 's|opensource|freesoftware|' $(grep -rl 'opensource') + patch -Np0 -i ../drop-open-term-on-index-jn-html.patch + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-src-$pkgver . /etc/profile.d/apache-ant.sh ant rebuild } package() { - cd "${srcdir}/${pkgname}-src-${pkgver}" + cd $srcdir/$pkgname-src-$pkgver find lib/ lib/bundle/ -maxdepth 1 -type f \ -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; find lib/os-specific/linux/ -maxdepth 1 -type f \ diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch new file mode 100644 index 000000000..8d4012a05 --- /dev/null +++ b/pcr/jitsi/drop-open-term-on-index-jn-html.patch @@ -0,0 +1,6 @@ +--- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 ++++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 +@@ -1,2 +1,2 @@ + +-

sip-communicator.org
SIP Communicator
Open Source VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Open Source / Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
++

sip-communicator.org
SIP Communicator
Free Software VoIP & IM


SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.

SIP Communicator is completely Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
-- cgit v1.2.3 From 6a1f607ac721d5db41034ee7c9e9f9eeb6ca1450 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 May 2013 12:24:05 -0300 Subject: bbswitch-libre-0.7-1: updating version --- libre/bbswitch-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index fe5469dd0..2dc83cb5e 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -5,9 +5,9 @@ _pkgname=bbswitch pkgname=bbswitch-libre -pkgver=0.6 +pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=8 +pkgrel=1 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -19,7 +19,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=bbswitch.install source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") -md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') +md5sums=('b9df5ea40109ef9766448a0577c798e6') build() { cd ${srcdir}/${_pkgname}-${pkgver} -- cgit v1.2.3 From 93a039eadabb96e28b2b8668bff26437a95bbb45 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 29 May 2013 14:56:12 -0300 Subject: openhpi: fixing pkg --- pcr/openhpi/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD index 6389ff39c..56cb8f2b7 100644 --- a/pcr/openhpi/PKGBUILD +++ b/pcr/openhpi/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=openhpi pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' arch=( i686 @@ -20,6 +20,8 @@ sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0ae prepare() { cd $srcdir/$pkgname-$pkgver + + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh) sed -i 's|usr/sbin|usr/bin|; @@ -32,10 +34,42 @@ prepare() { ' $(grep -rl var/lock) sed -i 's|var/run|run|; ' $(grep -rl var/run) - sed -i '/Like Linux/ s|Linux|GNU/Linux|; - /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|; + + # remove Open Source term + #sed -i 's|Open Source / ||; + # s|open source / ||; + # s|Open Source|Free Software|; + # s|open source|free software|; + # ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; /Linux distribution/ s|Linux|GNU/Linux|; - /Linux software/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; ' $(grep -rl Linux) } -- cgit v1.2.3 From 7e8f201da4892266950cc36db0c939df8d44eb6e Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 29 May 2013 15:24:42 -0300 Subject: openhpi: fixing pkg --- pcr/openhpi/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD index 56cb8f2b7..7da1cc055 100644 --- a/pcr/openhpi/PKGBUILD +++ b/pcr/openhpi/PKGBUILD @@ -2,7 +2,7 @@ pkgname=openhpi pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' arch=( i686 @@ -15,6 +15,7 @@ depends=( libxml2 net-snmp ) +options=(!libtool) source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab @@ -76,6 +77,7 @@ prepare() { build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ --enable-clients\ --enable-dynamic_simulator\ --enable-ilo2_ribcl\ -- cgit v1.2.3 From 0a22aa90822479bd61277d0b62f89e10d30d6955 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 29 May 2013 15:25:14 -0300 Subject: openipmi: fixing pkg --- pcr/openipmi/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD index 1dcb359ee..9c3c73ed8 100644 --- a/pcr/openipmi/PKGBUILD +++ b/pcr/openipmi/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:4} _pkgname=${_pkgname1^}${_pkgname2^^} pkgver=2.0.19 _pkgver=${pkgver::3} -pkgrel=1 +pkgrel=2 pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" arch=( i686 @@ -37,7 +37,43 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c prepare() { cd $srcdir/$_pkgname-$pkgver - sed -i '/on Linux/ s|Linux|GNU/Linux|' $(grep -rl Linux) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) } build() { -- cgit v1.2.3 From 4a875122e99a357ad6337ed290b71a36803e6244 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 29 May 2013 16:53:38 -0300 Subject: cluster-glue: fixing pkg --- pcr/cluster-glue/PKGBUILD | 63 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 89b0af8ee..f23f88ef3 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} _grpname=linux-ha pkgver=1.0.11 -pkgrel=8 +pkgrel=9 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' arch=( i686 @@ -30,7 +30,7 @@ depends=( libxml2 net-snmp openhpi - #openipmi + openipmi python util-linux #vacm @@ -48,7 +48,8 @@ makedepends=( valgrind w3m ) -provides=ha-$_pkgname2 +options=(!libtool) +provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install @@ -85,6 +86,8 @@ prepare() { ' configure.ac sed -i 's|INCLUDES|AM_CPPFLAGS|; ' $(grep -rl INCLUDES . | grep Makefile.am) + + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh .) sed -i 's|usr/sbin|usr/bin|; @@ -97,22 +100,47 @@ prepare() { ' $(grep -rl /var/lock .) sed -i 's|var/run|run|; ' $(grep -rl var/run) - sed -i 's|Open Source|Free Software|; - ' $(grep -rl 'Open Source' .) - sed -i 's|opensource|freesoftware|; - ' $(grep -rl 'opensource' .) - sed -i '/Solaris, FreeBSD and Linux/ s|Linux|GNU/Linux|; - /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; - /works only on Linux./ s|Linux|GNU/Linux|; - /UNIX, Linux/ s|Linux|GNU/Linux|; - /Logging Daemon for High-Availability Linux/ s|Linux|GNU/Linux|; - /This is what the Linux/ s|Linux|GNU/Linux|; - /Compiling for Linux platform/ s|Linux|GNU/Linux|; + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; /Like Linux/ s|Linux|GNU/Linux|; + /like Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; /(e.g. Linux)/ s|Linux|GNU/Linux|; - /Linux, Solaris/ s|Linux|GNU/Linux|; - /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|; - ' $(grep -rl Linux .) + /High-Availability Linux/ s|Linux|GNU/Linux|; + /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; + /This is what the Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) } build() { @@ -121,6 +149,7 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --disable-ansi\ --disable-fatal-warnings\ + --disable-static\ --enable-doc\ --enable-libnet\ --enable-upstart\ -- cgit v1.2.3 From e26f7749abf4e3a21b4087e64ac49a55f71bf596 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 May 2013 14:36:40 -0300 Subject: gummiboot-31-1: updating version --- libre/gummiboot/PKGBUILD | 22 ++++++++++++---------- libre/gummiboot/gummiboot.install | 4 +++- libre/gummiboot/parabola.conf | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 8ce0f23cf..1195912e8 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,29 +1,30 @@ -# $Id$ +# $Id: PKGBUILD 186011 2013-05-20 13:11:55Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Mantas Mikulėnas +# Maintainer (Parabola): André Silva pkgname="gummiboot" -pkgver="29" -pkgrel="1.1" -pkgdesc="Simple text-mode UEFI Boot Manager, Parabola rebranded" +pkgver="31" +pkgrel="1" +pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" arch=('x86_64' 'i686' 'mips64el') license=('LGPL2.1') -makedepends=('gnu-efi-libs' 'docbook-xsl') +makedepends=('gnu-efi-libs' 'docbook-xsl' 'git') depends=('util-linux') conflicts=('gummiboot-efi') provides=('gummiboot-efi') replaces=('gummiboot-efi') options=('!strip') -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source=("git://anongit.freedesktop.org/${pkgname}#tag=${pkgver}" 'loader.conf' 'parabola.conf') install="gummiboot.install" build() { - cd "${srcdir}/${pkgname}-${pkgver}/" + cd ${srcdir}/${pkgname} ./autogen.sh ./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib @@ -36,9 +37,10 @@ package() { install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf" - cd "${srcdir}/${pkgname}-${pkgver}/" + cd ${srcdir}/${pkgname} + make DESTDIR="${pkgdir}" install } -md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' +md5sums=('SKIP' '3d700d13aec5ab1b78a921eaf22e5bfa' - '9f770584795496c0e3409679eaf7be3b') + '36ee74767ac8734dede1cbd0f4f275d7') diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot/gummiboot.install index 770087361..20861d4c8 100644 --- a/libre/gummiboot/gummiboot.install +++ b/libre/gummiboot/gummiboot.install @@ -1,5 +1,7 @@ post_install() { - echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot" + mkdir -p /boot/EFI/gummiboot + /usr/bin/gummiboot update + echo ":: Run '/usr/bin/gummiboot install' to make gummiboot your default bootloader" } post_upgrade() { diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot/parabola.conf index bbb6dddfa..111072ea2 100644 --- a/libre/gummiboot/parabola.conf +++ b/libre/gummiboot/parabola.conf @@ -1,4 +1,4 @@ -## This is just an exmaple config file. +## This is just an example config file. ## Please edit the paths and kernel parameters according to your system. title Parabola GNU/Linux-libre -- cgit v1.2.3 From 5f6206c30467c345c9415f4363e405714f77a5de Mon Sep 17 00:00:00 2001 From: Shackra Sislock Date: Fri, 31 May 2013 00:38:53 -0600 Subject: adding sword --- pcr/sword-svn/PKGBUILD | 39 +++++++++++++++++++++++++++++++++ pcr/sword-svn/automake.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 pcr/sword-svn/PKGBUILD create mode 100644 pcr/sword-svn/automake.patch diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD new file mode 100644 index 000000000..8e29cdab8 --- /dev/null +++ b/pcr/sword-svn/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Stefan Husmann +pkgname=sword-svn +pkgver=2793 +pkgrel=1 +pkgdesc="Libraries for Bible programs - svn -version" +arch=('i686' 'x86_64') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('subversion') +provides=('sword') +conflicts=('sword') +source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch') +md5sums=('SKIP' '24a4821088da78725b9374807d0d3508') +options=('!makeflags') +_svnmod=sword + +pkgver() { + cd $SRCDEST/${_svnmod} + svnversion +} + +prepare() { + cd "$srcdir/$_svnmod" + patch -p1 < $srcdir/automake.patch +} + +build() { + cd "$srcdir/$_svnmod" + ./autogen.sh + CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$_svnmod" + make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install_config +} diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch new file mode 100644 index 000000000..3cfd5eb44 --- /dev/null +++ b/pcr/sword-svn/automake.patch @@ -0,0 +1,52 @@ +diff -Naur sword.orig/configure.ac sword.new/configure.ac +--- sword.orig/configure.ac 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/configure.ac 2013-01-13 12:47:34.000000000 +0100 +@@ -13,7 +13,7 @@ + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADERS(include/config.h) + + AC_CONFIG_MACRO_DIR([m4]) + +diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am +--- sword.orig/examples/cmdline/Makefile.am 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/examples/cmdline/Makefile.am 2013-01-13 12:53:55.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = 1.6 +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + +diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am +--- sword.orig/tests/Makefile.am 2013-01-13 12:46:14.000000000 +0100 ++++ sword.new/tests/Makefile.am 2013-01-13 12:54:33.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = 1.6 +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + +diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am +--- sword.orig/utilities/Makefile.am 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/utilities/Makefile.am 2013-01-13 12:56:12.000000000 +0100 +@@ -1,8 +1,8 @@ + AUTOMAKE_OPTIONS = 1.6 + SUBDIRS = diatheke +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + noinst_PROGRAMS = cipherraw lexdump \ -- cgit v1.2.3 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/ha-heartbeat/PKGBUILD | 84 ------------------------------- pcr/ha-heartbeat/ha-heartbeat.service | 10 ---- pcr/ha-pacemaker/PKGBUILD | 83 ------------------------------ pcr/ha-resourceagent/PKGBUILD | 68 ------------------------- pcr/ha-resourceagent/ha-ldirector.service | 10 ---- pcr/heartbeat/PKGBUILD | 84 +++++++++++++++++++++++++++++++ pcr/pacemaker/PKGBUILD | 83 ++++++++++++++++++++++++++++++ pcr/resource-agent/PKGBUILD | 68 +++++++++++++++++++++++++ 8 files changed, 235 insertions(+), 255 deletions(-) delete mode 100644 pcr/ha-heartbeat/PKGBUILD delete mode 100644 pcr/ha-heartbeat/ha-heartbeat.service delete mode 100644 pcr/ha-pacemaker/PKGBUILD delete mode 100644 pcr/ha-resourceagent/PKGBUILD delete mode 100644 pcr/ha-resourceagent/ha-ldirector.service create mode 100644 pcr/heartbeat/PKGBUILD create mode 100644 pcr/pacemaker/PKGBUILD create mode 100644 pcr/resource-agent/PKGBUILD diff --git a/pcr/ha-heartbeat/PKGBUILD b/pcr/ha-heartbeat/PKGBUILD deleted file mode 100644 index f913344a0..000000000 --- a/pcr/ha-heartbeat/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=ha-heartbeat -_pkgname=${pkgname:3} -pkgver=3.0.5 -_pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=6 -pkgdesc='Daemon that provides cluster infrastructure services to its clients' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/${_pkgname^} -license=( - GPL2 - lGPL2.1 -) -depends=( - gnutls - ha-glue -) -optdepends=( - lynx - net-tools - openssh - swig - valgrind - w3m -) -makedepends=( - docbook-xsl - libxslt - lynx - net-tools - openssh - swig - valgrind - w3m -) -options=!libtool -source=( - http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 - $pkgname.service -) -sha512sums=( - e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d - d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20 -) - -prepare() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - mv configure.{in,ac} - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; - s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; - ' configure.ac - sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; - " configure.ac - sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am -} - -build() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - setarch $CARCH ./bootstrap - setarch $CARCH ./configure --prefix=/usr\ - --disable-fatal-warnings\ - --enable-static=no\ - --enable-valgrind\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc - setarch $CARCH make -} - -package() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-heartbeat/ha-heartbeat.service b/pcr/ha-heartbeat/ha-heartbeat.service deleted file mode 100644 index aacde3dbb..000000000 --- a/pcr/ha-heartbeat/ha-heartbeat.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Startup script high-availability services. -Requires=network.target remote-fs.target timers.target - -[Service] -Type=forking -ExecStart=/usr/lib/heartbeat/heartbeat - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ha-pacemaker/PKGBUILD b/pcr/ha-pacemaker/PKGBUILD deleted file mode 100644 index 2cd0be84c..000000000 --- a/pcr/ha-pacemaker/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# 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} -} diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD deleted file mode 100644 index 15438769a..000000000 --- a/pcr/ha-resourceagent/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=ha-resourceagent -_pkgname=${pkgname:3} -_xname=${_pkgname::8} -_yname=${_pkgname:8} -_Name=${_xname^}_${_yname^} -_name=${_xname}-${_yname}s -pkgver=3.9.5 -pkgrel=3 -pkgdesc='Standardized interface for a cluster resource' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/$_Name -license=GPL -depends=ha-glue -optdepends=( - net-tools - openssh -) -makedepends=( - #libxslt - libvirt - net-tools - openssh -) -source=( - https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz - ha-ldirector.service -) -sha512sums=( - 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e - 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 -) - -prepare() { - cd $srcdir/$_name-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; - ' configure.ac - sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {heartbeat,tools}/Makefile.am -} - -build() { - cd $srcdir/$_name-$pkgver - setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings\ - --enable-libnet\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sysconfdir=/etc\ - --with-ocf-root=/usr/lib/ocf - setarch $CARCH make -} - -package() { - cd $srcdir/$_name-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-resourceagent/ha-ldirector.service b/pcr/ha-resourceagent/ha-ldirector.service deleted file mode 100644 index c5809a216..000000000 --- a/pcr/ha-resourceagent/ha-ldirector.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Non-heartbeat systems service, that manages the Linux Virtual Server component for TCP/UDP load-balancing. -Requires=network.target remote-fs.target - -[Service] -Type=forking -ExecStart=/usr/sbin/ldirectord - -[Install] -WantedBy=multi-user.target diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD new file mode 100644 index 000000000..f913344a0 --- /dev/null +++ b/pcr/heartbeat/PKGBUILD @@ -0,0 +1,84 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=ha-heartbeat +_pkgname=${pkgname:3} +pkgver=3.0.5 +_pkgver=${pkgver::1}_${pkgver:2:1} +pkgrel=6 +pkgdesc='Daemon that provides cluster infrastructure services to its clients' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/${_pkgname^} +license=( + GPL2 + lGPL2.1 +) +depends=( + gnutls + ha-glue +) +optdepends=( + lynx + net-tools + openssh + swig + valgrind + w3m +) +makedepends=( + docbook-xsl + libxslt + lynx + net-tools + openssh + swig + valgrind + w3m +) +options=!libtool +source=( + http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 + $pkgname.service +) +sha512sums=( + e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d + d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20 +) + +prepare() { + cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + mv configure.{in,ac} + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; + " configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,tools}/Makefile.am +} + +build() { + cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH ./bootstrap + setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --enable-static=no\ + --enable-valgrind\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/usr/lib/systemd/system + install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system +} + +# vim:set ts=2 sw=2 et: 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} +} diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD new file mode 100644 index 000000000..15438769a --- /dev/null +++ b/pcr/resource-agent/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=ha-resourceagent +_pkgname=${pkgname:3} +_xname=${_pkgname::8} +_yname=${_pkgname:8} +_Name=${_xname^}_${_yname^} +_name=${_xname}-${_yname}s +pkgver=3.9.5 +pkgrel=3 +pkgdesc='Standardized interface for a cluster resource' +arch=( + i686 + x86_64 + mips64el +) +url=http://linux-ha.org/wiki/$_Name +license=GPL +depends=ha-glue +optdepends=( + net-tools + openssh +) +makedepends=( + #libxslt + libvirt + net-tools + openssh +) +source=( + https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz + ha-ldirector.service +) +sha512sums=( + 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e + 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 +) + +prepare() { + cd $srcdir/$_name-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' {heartbeat,tools}/Makefile.am +} + +build() { + cd $srcdir/$_name-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings\ + --enable-libnet\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/$_name-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + install -d $pkgdir/usr/lib/systemd/system + install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 6cbf38bafdac26b9ca7d497d312a626389156299 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 May 2013 12:29:38 -0300 Subject: iceweasel-l10n-21.0.1-2: rebuild against lastest revision of iceweasel-libre due problems on about:home --- libre/iceweasel-l10n/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 3c3d957a4..298d740cc 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') -- cgit v1.2.3 From 2d065a8d237bbc04912ac803a886f566406ce273 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 16:40:45 -0300 Subject: cluster-glue, openhpi, openipmi, resource-agent: fixing pkg --- pcr/cluster-glue/PKGBUILD | 133 +++++++++++++++++++++---------- pcr/openhpi/PKGBUILD | 113 +++++++++++++++++++++------ pcr/openipmi/PKGBUILD | 125 +++++++++++++++++++++++++----- pcr/resource-agent/PKGBUILD | 185 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 449 insertions(+), 107 deletions(-) diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index f23f88ef3..bcc98b6e6 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -1,24 +1,23 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=cluster-glue _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} -_grpname=linux-ha pkgver=1.0.11 -pkgrel=9 -pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack' +pkgrel=10 +pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 x86_64 mips64el ) -url=http://$_grpname.org/wiki/$_pkgname +group=linux-ha +url=http://$group.org/wiki/$_pkgname license=( GPL2 LGPL2.1 ) -group=$_grpname depends=( curl dbus-glib @@ -33,7 +32,7 @@ depends=( openipmi python util-linux - #vacm + #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! ) optdepends=( net-tools @@ -53,7 +52,7 @@ provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install -source=http://hg.$_grpname.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 +source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 prepare() { @@ -85,19 +84,23 @@ 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 -rl INCLUDES | grep Makefile.am) # fixing path sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rl bin/sh .) - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/bin .) + ' $(grep -rl bin/sh) sed -i 's| /bin| /usr/bin|; - ' $(grep -rl ' /bin' .) + ' $(grep -rl ' /bin') sed -i 's| /sbin| /usr/bin|; - ' $(grep -rl ' /sbin' .) - sed -i 's|/var/lock|/run/lock|; - ' $(grep -rl /var/lock .) + ' $(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) @@ -106,40 +109,92 @@ prepare() { 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 '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; - /(e.g. Linux)/ s|Linux|GNU/Linux|; - /High-Availability Linux/ s|Linux|GNU/Linux|; - /sysDescr.0 = STRING: Linux/ s|Linux|GNU/Linux|; - /This is what the Linux/ s|Linux|GNU/Linux|; + 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) } diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD index 7da1cc055..bffcc74ba 100644 --- a/pcr/openhpi/PKGBUILD +++ b/pcr/openhpi/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=openhpi pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' arch=( i686 @@ -22,15 +22,26 @@ sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0ae prepare() { cd $srcdir/$pkgname-$pkgver + _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + sed -i "/am__api_version=/ s|1.12|${_automake::4}|; + " $(grep -rl am__api_version=) + + #sed -i 's|INCLUDES|AM_CPPFLAGS|; + # ' $(grep -rl INCLUDES | grep Makefile.am) + # fixing path sed -i 's|bin/sh|usr/bin/bash|; ' $(grep -rl bin/sh) - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rl usr/bin) 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|; @@ -41,36 +52,92 @@ prepare() { # 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 '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; + 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) } diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD index 9c3c73ed8..cced11d05 100644 --- a/pcr/openipmi/PKGBUILD +++ b/pcr/openipmi/PKGBUILD @@ -6,7 +6,7 @@ _pkgname2=${pkgname:4} _pkgname=${_pkgname1^}${_pkgname2^^} pkgver=2.0.19 _pkgver=${pkgver::3} -pkgrel=2 +pkgrel=3 pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" arch=( i686 @@ -38,41 +38,126 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c prepare() { cd $srcdir/$_pkgname-$pkgver + #mv configure.{in,ac} + + #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + #sed -i "/am__api_version=/ s|1.11|${_automake::4}|; + # " $(grep -rl am__api_version=) + + #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|; + # " configure.ac + #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|; + # ' configure.ac + + # 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 '/, Linux/ s|Linux|GNU/Linux|; - /And Linux/ s|Linux|GNU/Linux|; - /and Linux/ s|Linux|GNU/Linux|; - /For Linux/ s|Linux|GNU/Linux|; - /for Linux/ s|Linux|GNU/Linux|; - /Like Linux/ s|Linux|GNU/Linux|; - /like Linux/ s|Linux|GNU/Linux|; - /Linux,/ s|Linux|GNU/Linux|; - /Linux and/ s|Linux|GNU/Linux|; - /Linux distribution/ s|Linux|GNU/Linux|; - /Linux machine/ s|Linux|GNU/Linux|; - /Linux operating/ s|Linux|GNU/Linux|; - /Linux OS/ s|Linux|GNU/Linux|; - /Linux specific/ s|Linux|GNU/Linux|; - /Linux system/ s|Linux|GNU/Linux|; - /Under Linux/ s|Linux|GNU/Linux|; - /under Linux/ s|Linux|GNU/Linux|; - /On Linux/ s|Linux|GNU/Linux|; - /on Linux/ s|Linux|GNU/Linux|; + 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) } diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 15438769a..39eb6cb7a 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -1,51 +1,174 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva -pkgname=ha-resourceagent -_pkgname=${pkgname:3} -_xname=${_pkgname::8} -_yname=${_pkgname:8} -_Name=${_xname^}_${_yname^} -_name=${_xname}-${_yname}s +pkgname=resource-agent +_pkgname1=${pkgname::8} +_pkgname2=${pkgname:8} +_pkgnamex=${_pkgname1^}_${_pkgname2^} +_pkgnamey=${pkgname}s +_pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=3 -pkgdesc='Standardized interface for a cluster resource' +pkgrel=4 +pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 x86_64 mips64el ) -url=http://linux-ha.org/wiki/$_Name +group=linux-ha +url=http://$group.org/wiki/$_pkgnamex license=GPL -depends=ha-glue +depends=( + #clulog? + cluster-glue + perl-socket6 + perl-lwp-protocol-https + perl-io-socket-inet6 + perl-mailtools + ipvsadm +) optdepends=( net-tools openssh ) makedepends=( - #libxslt + libxslt libvirt net-tools openssh ) -source=( - https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz - ha-ldirector.service -) -sha512sums=( - 668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e - 9e257b31305657a5164eebf6893d84496ef5dc5e80058dda5cd250c847c8247e10410cca99f0a481fa461487198fa59640e09d1e81fc3199a54f3ec85c56d9a3 -) +options=(!libtool) +provides=($_pkgnamez) +conflicts=$_pkgnamez +replaces=$_pkgnamez +source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz +sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e prepare() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {heartbeat,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|; + 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) } build() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH ./autogen.sh setarch $CARCH ./configure --prefix=/usr\ --enable-fatal-warnings\ @@ -58,11 +181,23 @@ build() { } package() { - cd $srcdir/$_name-$pkgver + cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH make DESTDIR=$pkgdir install + touch $pkgdir/etc/ha.d/ldirectord.cf + rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d + install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'ExecStart=/usr/bin/ldirectord' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service } # vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 42d8b8e3f2bd8ddce78f06f2f97dfae5be8b4960 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 17:10:30 -0300 Subject: pcr/heartbeat --- pcr/heartbeat/PKGBUILD | 172 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 146 insertions(+), 26 deletions(-) diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD index f913344a0..cf2269d70 100644 --- a/pcr/heartbeat/PKGBUILD +++ b/pcr/heartbeat/PKGBUILD @@ -1,32 +1,28 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva -pkgname=ha-heartbeat -_pkgname=${pkgname:3} +pkgname=heartbeat pkgver=3.0.5 _pkgver=${pkgver::1}_${pkgver:2:1} -pkgrel=6 -pkgdesc='Daemon that provides cluster infrastructure services to its clients' +pkgrel=9 +pkgdesc='Daemon that provides cluster infrastructure services to its clients (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 lGPL2.1 ) depends=( gnutls - ha-glue + cluster-glue ) optdepends=( - lynx net-tools openssh - swig - valgrind - w3m ) makedepends=( docbook-xsl @@ -38,34 +34,147 @@ makedepends=( valgrind w3m ) -options=!libtool -source=( - http://hg.linux-ha.org/$_pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 - $pkgname.service -) -sha512sums=( - e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d - d14013b4ee133ed07e17fa6e09cae1f9f7bdbabaadfda9b9bb8ed25d4d5ff2f3d419f344195c6d5211da33293d5fe5ad64dbc8be6e1a02f7fa21563f54907a20 -) +options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname +source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 +sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d prepare() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + mv configure.{in,ac} + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; ' configure.ac sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; " configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; - ' {contrib/{drbd-outdate-peer,ipfail,mlock},cts,heartbeat,lib/{apphb,hbclient,plugins/{HB{auth,comm,compress},quorum{,d},tiebreaker}},membership/{ccm,quorumd},replace,telecom/apphbd,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|; + /Linux: "mail" offers "-s"./ 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|; + s|ConfigureLinux|ConfigureGNULinux|; + ' $(grep -rl Linux) } build() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver setarch $CARCH ./bootstrap setarch $CARCH ./configure --prefix=/usr\ --disable-fatal-warnings\ - --enable-static=no\ + --disable-static\ --enable-valgrind\ --libdir=/usr/lib\ --localstatedir=/var\ @@ -74,11 +183,22 @@ build() { } package() { - cd $srcdir/${_pkgname^}-3-0-STABLE-$pkgver + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver setarch $CARCH make DESTDIR=$pkgdir install + rm $pkgdir/etc/rc.d/$pkgname && rmdir $pkgdir/etc/rc.d + install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Description=Startup script high-availability services' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'ExecStart=/usr/lib/heartbeat/heartbeat' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service } # vim:set ts=2 sw=2 et: -- cgit v1.2.3 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(-) 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 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(+) 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 From 1658d22bc2a223a94b2c1f54545c6b0094aee1ab Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 May 2013 18:18:08 -0300 Subject: cgminer-libre-3.2.0-1: updating version --- libre/cgminer-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 575ea2d55..2db7dbbc5 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ +# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -18,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("https://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v$pkgver.tar.gz" +source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2" "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -34,7 +34,7 @@ build() { # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - ./autogen.sh + #./autogen.sh ./configure --prefix=/usr --enable-scrypt --disable-adl make @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' +sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') -- cgit v1.2.3 From 72c0b345321c9b11612b30bd093614fb9c9d6938 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 19:40:38 -0300 Subject: cluster-glue: fixing pkg --- pcr/cluster-glue/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index bcc98b6e6..684efe7c2 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=10 +pkgrel=11 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -30,14 +30,12 @@ depends=( net-snmp openhpi openipmi + openssh python util-linux #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! ) -optdepends=( - net-tools - openssh -) +optdepends=net-tools makedepends=( help2man libxslt -- cgit v1.2.3 From 0963cba6fa785c4400bf54d34dea6fc040f6355d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 May 2013 20:34:22 -0300 Subject: mkisolinux-2013.05-1: updating version --- libre/mkisolinux/PKGBUILD | 13 +++++++------ libre/mkisolinux/mkisolinux | 1 - libre/mkisolinux/mkisolinux.conf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index 1c02bb01b..7c9ab6cc4 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer : Tobias Powalowski pkgname=mkisolinux -pkgver=2013.03 -pkgrel=2 +pkgver=2013.05 +pkgrel=1 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=(any) license=('GPL') @@ -12,10 +12,7 @@ depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') replaces=('mkbootcd') backup=(etc/mkisolinux.conf) source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') -md5sums=('945d5f5d74f37718c8c9d518bfd5698d' - 'e28b82502ae44087852ea6bfac398d5c' - '456eba83dfba319f8132c89e7ba42ce5' - 'ae0007d6679b5a575b2a9e5ac3664baf') + package() { @@ -25,3 +22,7 @@ package() install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" } +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + '384aac3786506ff96ec3d1147bcacfe5' + '3cc23d74d7e4378d1be431d68a71a173' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux index 0cb53e81e..ce1187d2a 100755 --- a/libre/mkisolinux/mkisolinux +++ b/libre/mkisolinux/mkisolinux @@ -65,7 +65,6 @@ install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux. for i in /usr/lib/syslinux/*.c32; do install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) done -install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids # create syslinux.cfg echo ":: Creating syslinux.cfg ..." diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf index 83d36219d..4af6f098c 100644 --- a/libre/mkisolinux/mkisolinux.conf +++ b/libre/mkisolinux/mkisolinux.conf @@ -2,7 +2,7 @@ # Rebranded for Parabola by André Silva # config file of mkisolinux -# DEFAULT kernel boot options like root=/dev/hda3 etc. +# DEFAULT kernel boot options like root=/dev/sda3 etc. # add your root= option, if you boot from a disk device # and don't want to add it by hand on each boot KERNEL_BOOT_OPTIONS="" -- cgit v1.2.3 From 44ff0d00216712a835e9fb6f2624661cb919676a Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 May 2013 20:58:14 -0300 Subject: resource-agent: fixing pkg --- pcr/resource-agent/PKGBUILD | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD index 39eb6cb7a..46c95ede1 100644 --- a/pcr/resource-agent/PKGBUILD +++ b/pcr/resource-agent/PKGBUILD @@ -2,12 +2,12 @@ pkgname=resource-agent _pkgname1=${pkgname::8} -_pkgname2=${pkgname:8} +_pkgname2=${pkgname:9} _pkgnamex=${_pkgname1^}_${_pkgname2^} _pkgnamey=${pkgname}s _pkgnamez=ha-${_pkgname1}${_pkgname2} pkgver=3.9.5 -pkgrel=4 +pkgrel=5 pkgdesc='Standardized interface for a cluster resource (Linux-HA)' arch=( i686 @@ -18,18 +18,15 @@ group=linux-ha url=http://$group.org/wiki/$_pkgnamex license=GPL depends=( - #clulog? cluster-glue + ipvsadm perl-socket6 perl-lwp-protocol-https perl-io-socket-inet6 perl-mailtools - ipvsadm -) -optdepends=( - net-tools - openssh + #rgmanager (clulog) !!redhat-cluster!! ) +optdepends=net-tools makedepends=( libxslt libvirt @@ -175,6 +172,7 @@ build() { --enable-libnet\ --libdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-ocf-root=/usr/lib/ocf setarch $CARCH make @@ -184,6 +182,7 @@ package() { cd $srcdir/$_pkgnamey-$pkgver setarch $CARCH make DESTDIR=$pkgdir install + mv $pkgdir/{var/,}run touch $pkgdir/etc/ha.d/ldirectord.cf rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d -- cgit v1.2.3 From 82d845ccae6b7ac696fb54e7b79bb07f0403d813 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 1 Jun 2013 03:00:41 -0300 Subject: mksyslinux: add new package to libre repo for rebranding --- libre/mksyslinux/PKGBUILD | 26 +++++++ libre/mksyslinux/boot.msg | 15 ++++ libre/mksyslinux/mksyslinux | 143 +++++++++++++++++++++++++++++++++++++++ libre/mksyslinux/mksyslinux.conf | 34 ++++++++++ libre/mksyslinux/options.msg | 6 ++ 5 files changed, 224 insertions(+) create mode 100644 libre/mksyslinux/PKGBUILD create mode 100644 libre/mksyslinux/boot.msg create mode 100755 libre/mksyslinux/mksyslinux create mode 100644 libre/mksyslinux/mksyslinux.conf create mode 100644 libre/mksyslinux/options.msg diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD new file mode 100644 index 000000000..d963d19d3 --- /dev/null +++ b/libre/mksyslinux/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# Maintainer : Tobias Powalowski + +pkgname=mksyslinux +pkgver=2013.05 +pkgrel=1 +pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'syslinux' 'pciutils') +backup=(etc/mksyslinux.conf) +source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg') + +package() +{ + cd "$srcdir/" + install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux" + install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" +} +md5sums=('6a269fc5b58c7bcc6688efeaa2075606' + 'fa5443022923fa0e2ebbbe127be621d6' + '67e7c685e8ed30e723187b28a5e21b96' + 'b211c5f7e30d2ee36cde20f71aa3f2b8') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg new file mode 100644 index 000000000..15476f2bd --- /dev/null +++ b/libre/mksyslinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +SYSLINUX BOOT +created with 'mksyslinux' by Tobias Powalowski +rebranded for Parabola by André Silva + +Press ENTER or type 'parabola' to boot image. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img ' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux new file mode 100755 index 000000000..4db771f83 --- /dev/null +++ b/libre/mksyslinux/mksyslinux @@ -0,0 +1,143 @@ +#! /bin/sh +# Created by Tobias Powalowski +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mksyslinux.conf" +export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX) +TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX) +BOOTDIRNAME=boot/syslinux + +usage () +{ + echo "${APPNAME}: usage" + echo "WRITING TO DEVICE:" + echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!" + echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!" + echo "" + echo "CREATING AN IMAGE FILE:" + echo "- For creating an image file use the -i=IMAGEFILE switch" + echo "- use 'dd if= of=' to write to your device afterwards." + echo "" + echo "PARAMETERS:" + echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install" + echo " -i=IMAGENAME Your IMAGENAME" + echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage && exit 1 + + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;; + -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +if [ "${IMAGENAME}" = "" ]; then + if [ "${DEVICE}" = "" ]; then + echo "ERROR: No DEVICE name specified, please use the -d option" + exit 1 + fi +fi + +if ! [ $UID -eq 0 ]; then + echo "ERROR: only works when run as root!" + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')" + +export RUNPROGRAM="${APPNAME}" +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +export USEKERNEL=${VERSION} +# begin script +[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} +mkdir -p ${TEMPDIR}/$BOOTDIRNAME +echo ":: Mounting ${DEVICE} ..." +if ! [ "${IMAGENAME}" = "" ]; then + modprobe loop +else + mount ${DEVICE} ${TEMPDIR} || exit 1 +fi +# prepare syslinux bootloader +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids + +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." +if [ "${SYSLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +fi +[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +if ! [ "${IMAGENAME}" = "" ]; then + # ext2 overhead's upper bound is 6% + # empirically tested up to 1GB + rootsize=$(du -bs ${TEMPDIR}|cut -f1) + IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors + # create the filesystem image file + dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}" + # create a filesystem on the image + mkfs.vfat "${IMAGENAME}" + mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1 + cp -r "${TEMPDIR}"/* "$TMPDIR" + umount ${TMPDIR} +else + echo ":: Unmounting ${DEVICE} ..." + umount ${TEMPDIR} || exit 1 +fi +if ! [ "${IMAGENAME}" = "" ]; then + echo ":: Installing SYSLINUX on ${IMAGENAME} ..." + syslinux ${IMAGENAME} && echo "Installation completed." +else + echo ":: Installing MBR on ${MBRDEVICE} ..." + cat ${MBR} > ${MBRDEVICE} + echo ":: Installing SYSLINUX on ${DEVICE} ..." + syslinux -o offset ${DEVICE} && echo "Installation completed." +fi +# clean /tmp +rm -r ${TEMPDIR} +! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf new file mode 100644 index 000000000..ab2d4978a --- /dev/null +++ b/libre/mksyslinux/mksyslinux.conf @@ -0,0 +1,34 @@ +# Created by Tobias Powalowski +# Rebranded for Parabola by André Silva +# config file of mksyslinux + +# DEFAULT kernel boot options like root=/dev/sda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" + +syslinux.cfg file to use +SYSLINUXCFG="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# default MBR +MBR="/usr/lib/syslinux/mbr.bin" diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mksyslinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ -- cgit v1.2.3 From 3859b8bf65ecc310a6a2ea14496be3c3a913333b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 1 Jun 2013 03:19:52 -0300 Subject: mksyslinux: update md5sum --- libre/mksyslinux/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD index d963d19d3..16d595f12 100644 --- a/libre/mksyslinux/PKGBUILD +++ b/libre/mksyslinux/PKGBUILD @@ -20,7 +20,7 @@ package() install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" } -md5sums=('6a269fc5b58c7bcc6688efeaa2075606' - 'fa5443022923fa0e2ebbbe127be621d6' - '67e7c685e8ed30e723187b28a5e21b96' - 'b211c5f7e30d2ee36cde20f71aa3f2b8') +md5sums=('287aad9693ca8061495e248c41ba43a7' + 'd958575945e4ce8a9002bd056e2f14be' + '1f1e2d80e28b087e4103282bc5c44071' + 'ae0007d6679b5a575b2a9e5ac3664baf') -- cgit v1.2.3 From edbe246fe93f11adcd98408e3d7cf7dce36de3a1 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 1 Jun 2013 11:57:57 +0200 Subject: Fix claws-mail-libre build on mips64el. valgrind is not available. setarch $CARCH won't work. The only purpose that I know for it should be handled differently, in makepkg frontends, not PKGBUILDs. --- libre/claws-mail-libre/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index e37ffe283..2a0ce65ce 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -13,10 +13,11 @@ license=('GPL3') url="http://www.$_pkgname.org" depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' +makedepends=('compface' 'spamassassin' 'bogofilter' # dependencies for plugins 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') optdepends=('python2: needed for some tools and python plugin' 'perl: needed for some tools and perl plugin' 'spamassassin: adds support for spamfiltering' @@ -50,7 +51,7 @@ build() { sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py sed -i 's:python -c:python2 -c:g' configure - setarch $CARCH ./configure --prefix=/usr --disable-static \ + ./configure --prefix=/usr --disable-static \ --enable-enchant \ --enable-gnutls \ --enable-ldap \ @@ -60,16 +61,16 @@ build() { --enable-bogofilter-plugin \ --enable-jpilot \ #--help - setarch $CARCH make + make } package() { cd $srcdir/$_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install # build and install extra tools cd tools - setarch $CARCH make + make # all executables and .conf files ; only top directory find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i -- cgit v1.2.3 From e43b9a6217e5978e846aa4dbeafcd0a749db987f Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Sat, 1 Jun 2013 16:08:41 -0300 Subject: heartbeat: updating pkg --- pcr/heartbeat/PKGBUILD | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD index cf2269d70..f9ee9254b 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=9 +pkgrel=10 pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' arch=( i686 @@ -20,10 +20,7 @@ depends=( gnutls cluster-glue ) -optdepends=( - net-tools - openssh -) +optdepends=net-tools makedepends=( docbook-xsl libxslt @@ -186,7 +183,8 @@ package() { cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - rm $pkgdir/etc/rc.d/$pkgname && rmdir $pkgdir/etc/rc.d + mv $pkgdir/{var/,}run + rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d install -d $pkgdir/usr/lib/systemd/system echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service -- cgit v1.2.3 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(-) 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 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(-) 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 From 6370ae5c715a94a0390b77d10adb6e8ee3b39ef9 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 3 Jun 2013 11:37:50 -0300 Subject: filesystem upgrade for /usr/bin merge --- libre/filesystem/PKGBUILD | 51 +++++++++++++++++++++++++++-------------------- libre/filesystem/profile | 2 +- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index eac7300d4..60fa5924b 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer (Parabola): André Silva pkgname=filesystem -pkgver=2013.03 +pkgver=2013.05 pkgrel=2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') @@ -21,26 +21,6 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' 'locale.sh') -md5sums=('7b8e40f8f793e60f471511641bb1c9f2' - '6be47d893fd49b2e4a8c0e811b350861' - '9e4533df61f0c82d6b2e2371f7376282' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '1cfd310dff0804a7d21958487c32a3b1' - '2ef2429c2c98d0883906aa6f5363be80' - '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'f45389e116ab0b9e9968287617d27c7d' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130' - 'd5732ffdb3488e1383d4ea199343e767' - '3807d07215d9116331fe1cf8feeaa0f8') build() { cd ${srcdir} @@ -90,7 +70,7 @@ package() { # # setup /usr hierarchy # - for d in bin include lib sbin share/misc src; do + for d in bin include lib share/misc src; do install -d -m755 usr/${d} done for d in $(seq 8); do @@ -111,6 +91,13 @@ package() { ln -s lib ${pkgdir}/usr/lib32 ) + # + # add bin symlinks + # + ln -s usr/bin ${pkgdir}/bin + ln -s usr/bin ${pkgdir}/sbin + ln -s bin ${pkgdir}/usr/sbin + # # install parabola(7) manpage # @@ -124,3 +111,23 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('7b8e40f8f793e60f471511641bb1c9f2' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '1cfd310dff0804a7d21958487c32a3b1' + '2ef2429c2c98d0883906aa6f5363be80' + '693c97f2c9a519bb97a17008e92c2b74' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'f45389e116ab0b9e9968287617d27c7d' + '0b6f835598c7640184e476057b3c7722' + 'a8a962370cd0128465d514e6a1f74130' + 'd5732ffdb3488e1383d4ea199343e767' + '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/profile b/libre/filesystem/profile index 3bc22db9f..59d0abc83 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile @@ -4,7 +4,7 @@ umask 022 # Set our default path -PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" +PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" export PATH # Load profiles from /etc/profile.d -- cgit v1.2.3 From cabe51ea8f7a342df3f3b8c98d1c7e6bbd264e87 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 3 Jun 2013 12:12:19 -0300 Subject: Rebuild for /usr/bin merge --- libre/grub-legacy/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index 6c2afd3a8..dd7940c2c 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=24 +pkgrel=25 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') @@ -80,10 +80,10 @@ build() { patch -Np1 -i ../040_all_grub-0.96-nxstack.patch # patch from frugalware to make it boot when more than 2GB ram installed patch -Np1 -i ../05-grub-0.97-initrdaddr.diff - CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info else - CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info fi } @@ -94,6 +94,6 @@ package() { CFLAGS= make make DESTDIR=${pkgdir} install install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst - install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub + install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub } -- cgit v1.2.3 From 3de2ae3dbc1389aa8ec71843924349bfb9a66a5c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 3 Jun 2013 12:34:10 -0300 Subject: Patch for /usr/bin merge --- pcr/mosquitto/PKGBUILD | 15 ++++++++++----- pcr/mosquitto/binmerge.patch | 21 +++++++++++++++++++++ pcr/mosquitto/mosquitto.service | 6 +++--- 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 pcr/mosquitto/binmerge.patch diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index 652e75691..2f765ad13 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -4,22 +4,27 @@ pkgname=mosquitto pkgver=1.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source MQTT v3.1 Broker" arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el') url="http://mosquitto.org/" makedepends=('python') optdepends=('python: python support') license=('BSD') -source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" ) +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" + "binmerge.patch") md5sums=('fd0cae17221d778b0a002c31e6c3de9e' 'SKIP' - 'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f') + '58af79ed48be928f91e5435cda82bb8b' + '27e24b672d63b797f0e026ab85c64c4b') + +prepare() { + cd "$srcdir/$pkgname-$pkgver/src" + patch -N -i ${srcdir}/binmerge.patch +} build() { cd "$srcdir/$pkgname-$pkgver" - #Remove hardcoded prefix - find -name Makefile -exec sed '/prefix=/d' -i {} \; make prefix=/usr } diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch new file mode 100644 index 000000000..d6d79041d --- /dev/null +++ b/pcr/mosquitto/binmerge.patch @@ -0,0 +1,21 @@ +--- src/Makefile.orig 2013-06-03 12:23:15.288586121 -0300 ++++ src/Makefile 2013-06-03 12:23:29.455571403 -0300 +@@ -90,15 +90,15 @@ + ${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@ + + install : all +- $(INSTALL) -d ${DESTDIR}$(prefix)/sbin +- $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto ++ $(INSTALL) -d ${DESTDIR}$(prefix)/bin ++ $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto + $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h + ifeq ($(WITH_TLS),yes) + $(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd + endif + + uninstall : +- -rm -f ${DESTDIR}${prefix}/sbin/mosquitto ++ -rm -f ${DESTDIR}${prefix}/bin/mosquitto + -rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h + -rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd + diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service index 7e9ef7cc8..9626cbc45 100644 --- a/pcr/mosquitto/mosquitto.service +++ b/pcr/mosquitto/mosquitto.service @@ -12,9 +12,9 @@ Requires=network.target [Service] Type=forking -ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d -ExecStartPre=/bin/rm -f /var/run/mosquitto.pid -PIDFile=/var/run/mosquitto.pid +ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d +ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid +PIDFile=/run/mosquitto.pid Restart=on-abort [Install] -- cgit v1.2.3 From 2464712fe15dbc04f29c848c91c06bda456117f4 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 10:06:39 -0300 Subject: openswan for /usr/bin merge --- pcr/openswan/PKGBUILD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index 97cea98e6..ab7bd69f5 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,26 +1,31 @@ # Contributor: xjpvictor Huang pkgname=openswan pkgver=2.6.38 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source implementation of IPsec for the Linux operating system" url="http://www.openswan.org" license=('GPL' 'custom') arch=('i686' 'x86_64') depends=('iproute2>=2.6.8' 'gmp' 'perl') makedepends=('flex' 'bison') -conflicts=('ipsec-tools' 'openswan') -provides=('openswan') +conflicts=('ipsec-tools') backup=(etc/ipsec.conf \ etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz openswan openswan.service) +prepare() { + cd $srcdir/openswan-$pkgver + # Change install paths to Arch defaults + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc +} + build() { cd $srcdir/openswan-$pkgver # Change install paths to Arch defaults - sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc make USE_XAUTH=true USE_OBJDIR=true programs } -- cgit v1.2.3 From 18dda890570fa3e80643f91e2fc394ffd0bae5ac Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 10:25:28 -0300 Subject: miniupnpd rebuild for /usr/bin --- pcr/miniupnpd/PKGBUILD | 13 +++++++++---- pcr/miniupnpd/miniupnpd.systemd | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD index 543002e04..1ab99d0ed 100644 --- a/pcr/miniupnpd/PKGBUILD +++ b/pcr/miniupnpd/PKGBUILD @@ -1,14 +1,14 @@ # $Id$ -# Maintainer: None +# Maintainer: fauno pkgname=miniupnpd pkgver=1.8.20130503 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') backup=(etc/miniupnpd/miniupnpd.conf) -depends=('libnfnetlink' 'iptables>=1.4.3') +depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.systemd) @@ -34,8 +34,13 @@ package() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" - sed -i 's:/sbin/iptables:/usr/sbin/iptables: + sed -i 's:/s\?bin/iptables:/usr/bin/iptables: s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/ s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf" + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } +md5sums=('484dbda7c428b2d5f3768500a48d3375' + 'f862f79b673359adc80faf0be914394f') diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd index 4c5aa77cc..88973535c 100644 --- a/pcr/miniupnpd/miniupnpd.systemd +++ b/pcr/miniupnpd/miniupnpd.systemd @@ -3,9 +3,9 @@ Description=Lightweight UPnP IGD daemon [Service] ExecStartPre=/etc/miniupnpd/iptables_init.sh -ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d +ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d ExecStopPost=/etc/miniupnpd/iptables_removeall.sh -PIDFile=/var/run/miniupnpd.pid +PIDFile=/run/miniupnpd.pid StandardOutput=null [Install] -- cgit v1.2.3 From a69665d7b7cec4bf005b028223bf085752515a58 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 10:27:34 -0300 Subject: miniupnpd: fixed checksums --- pcr/miniupnpd/PKGBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD index 1ab99d0ed..57a04c290 100644 --- a/pcr/miniupnpd/PKGBUILD +++ b/pcr/miniupnpd/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: fauno pkgname=miniupnpd pkgver=1.8.20130503 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" @@ -13,8 +13,7 @@ makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.systemd) md5sums=('484dbda7c428b2d5f3768500a48d3375' - 'f862f79b673359adc80faf0be914394f' - '2cc73f661cacb2fa374eee3d1030f428') + '0c3f1777b6c043dd5029092d62896660') build() { cd "$srcdir/$pkgname-$pkgver" @@ -42,5 +41,3 @@ package() { cd "$pkgdir" mv usr/sbin usr/bin } -md5sums=('484dbda7c428b2d5f3768500a48d3375' - 'f862f79b673359adc80faf0be914394f') -- cgit v1.2.3 From 1a89e0d0d9718f23d640d0c8069eb6024d194b42 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 10:41:37 -0300 Subject: strongswan: rebuild for sbin merge --- pcr/strongswan/PKGBUILD | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD index 975e7a21f..c6ace77c4 100644 --- a/pcr/strongswan/PKGBUILD +++ b/pcr/strongswan/PKGBUILD @@ -8,7 +8,7 @@ pkgname=strongswan pkgver=5.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="open source IPsec implementation" url='http://www.strongswan.org' license=("GPL") @@ -25,6 +25,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-ipsecdir=/usr/lib/strongswan \ @@ -45,7 +46,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - install -d ${pkgdir}/etc/rc.d - ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec - install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan } -- cgit v1.2.3 From ca058a137606b97b1ca20c1ba44cbf2d60124e1b Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 11:12:01 -0300 Subject: netatalk: upgrade --- pcr/netatalk/PKGBUILD | 15 +++++++++++---- pcr/netatalk/netatalk.changelog | 12 ++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index f87ce7e2a..b16132dab 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Farhan Yousaf pkgname=netatalk -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=2 pkgdesc='A kernel-level implementation of AFP services' arch=('i686' 'x86_64' 'mips64el') @@ -19,17 +19,24 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4') +md5sums=('f455505884a6aea307640d46a6577fd1') -build() { +prepare() { cd $pkgname-$pkgver - sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 + sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} cp /usr/share/automake*/missing . + autoreconf -i +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --localstatedir=/var/state \ --sysconfdir=/etc \ --with-init-style=systemd \ diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog index 712a8e5c1..8e1937a6c 100644 --- a/pcr/netatalk/netatalk.changelog +++ b/pcr/netatalk/netatalk.changelog @@ -1,3 +1,15 @@ +2013-06-03 SJ_UnderWater + + * 3.0.4-2: + move sbindir + +2013-05-26 SJ_UnderWater + + * 3.0.4-1: + package update + minor fixes + dbus-glib dependency + 2013-03-27 SJ_UnderWater * 3.0.3-1: -- cgit v1.2.3 From d6995faecd53c94adc22ed81d2691ee11588752b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Tue, 4 Jun 2013 16:39:35 +0200 Subject: strongswan: remove an outdated and unused file. --- pcr/strongswan/strongswan.rc | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 pcr/strongswan/strongswan.rc diff --git a/pcr/strongswan/strongswan.rc b/pcr/strongswan/strongswan.rc deleted file mode 100644 index 58c99c092..000000000 --- a/pcr/strongswan/strongswan.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting strongSwan IPsec" - /usr/sbin/ipsec start - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon strongswan - fi - ;; - stop) - stat_busy "Stopping strongSwan IPsec" - /usr/sbin/ipsec stop - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon strongswan - fi - ;; - restart) - stat_busy "Restarting strongSwan IPsec" - /usr/sbin/ipsec restart - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon strongswan - fi - ;; - status) - /usr/sbin/ipsec status - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -- cgit v1.2.3 From 6891221b766af2e552e7ee041c9fbd1f4835d90c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 4 Jun 2013 12:40:46 -0300 Subject: cdrkit-libre: repackaged for bin merge --- libre/cdrkit-libre/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index af8125f1f..75cf2c1bd 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2.4 +pkgrel=3 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)" arch=('i686' 'x86_64' 'mips64el') url="http://cdrkit.org/" @@ -19,11 +19,16 @@ replaces=('cdrkit' 'cdrtools') source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) md5sums=('efe08e2f3ca478486037b053acd512e9') -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" + sed -i "s#sbin#bin#" netscsid/CMakeLists.txt # Remove nonfree apple_driver utility rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" make } -- cgit v1.2.3 From 8da103e14072dc4cc04231cbca851293f7185e74 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 5 Jun 2013 12:17:57 -0300 Subject: mksyslinux-2013.06-1: updating version --- libre/mksyslinux/PKGBUILD | 8 ++++---- libre/mksyslinux/mksyslinux | 7 ++++--- libre/mksyslinux/mksyslinux.conf | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD index 16d595f12..a64f141fd 100644 --- a/libre/mksyslinux/PKGBUILD +++ b/libre/mksyslinux/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $ # Maintainer : Tobias Powalowski pkgname=mksyslinux -pkgver=2013.05 +pkgver=2013.06 pkgrel=1 pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" arch=(any) @@ -21,6 +21,6 @@ package() install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" } md5sums=('287aad9693ca8061495e248c41ba43a7' - 'd958575945e4ce8a9002bd056e2f14be' - '1f1e2d80e28b087e4103282bc5c44071' + '0a9fd93356b5d98ab386f28bc849b808' + '15742e47e40a46491694b4b7680d4e38' 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux index 4db771f83..96ad45133 100755 --- a/libre/mksyslinux/mksyslinux +++ b/libre/mksyslinux/mksyslinux @@ -71,13 +71,14 @@ export RUNPROGRAM="${APPNAME}" export USEKERNEL=${VERSION} # begin script [ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} -mkdir -p ${TEMPDIR}/$BOOTDIRNAME +mkdir -p ${TEMPDIR} echo ":: Mounting ${DEVICE} ..." if ! [ "${IMAGENAME}" = "" ]; then modprobe loop else mount ${DEVICE} ${TEMPDIR} || exit 1 fi +mkdir -p ${TEMPDIR}/${BOOTDIRNAME} # prepare syslinux bootloader install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin for i in /usr/lib/syslinux/*.c32; do @@ -102,7 +103,7 @@ else sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg fi -[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 +[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." # generate initramdisk echo ":: Creating initramdisk ..." @@ -136,7 +137,7 @@ else echo ":: Installing MBR on ${MBRDEVICE} ..." cat ${MBR} > ${MBRDEVICE} echo ":: Installing SYSLINUX on ${DEVICE} ..." - syslinux -o offset ${DEVICE} && echo "Installation completed." + syslinux -t offset ${DEVICE} && echo "Installation completed." fi # clean /tmp rm -r ${TEMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf index ab2d4978a..cfbfc49d8 100644 --- a/libre/mksyslinux/mksyslinux.conf +++ b/libre/mksyslinux/mksyslinux.conf @@ -20,7 +20,7 @@ KERNEL="/boot/vmlinuz-linux-libre" BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" -syslinux.cfg file to use +# syslinux.cfg file to use SYSLINUXCFG="" # Prompt on boot, 1=yes 0=no -- cgit v1.2.3 From 54021ec4957bcf9a7b2537cd7bf2d73f31303ebe Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Wed, 5 Jun 2013 18:38:56 +0200 Subject: Add rfc5755-turn-server from AUR. --- pcr/rfc5766-turn-server/ChangeLog | 5 ++++ pcr/rfc5766-turn-server/PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 pcr/rfc5766-turn-server/ChangeLog create mode 100644 pcr/rfc5766-turn-server/PKGBUILD diff --git a/pcr/rfc5766-turn-server/ChangeLog b/pcr/rfc5766-turn-server/ChangeLog new file mode 100644 index 000000000..5accefa5b --- /dev/null +++ b/pcr/rfc5766-turn-server/ChangeLog @@ -0,0 +1,5 @@ +2013-06-05 Vladimir Tsanev + + * 1.8.6.0-1 : + Initial package created. + diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD new file mode 100644 index 000000000..81eb3d14d --- /dev/null +++ b/pcr/rfc5766-turn-server/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Vladimir Tsanev + +pkgname=rfc5766-turn-server +_portname=turnserver +pkgver=1.8.6.0 +pkgrel=1 +epoch= +pkgdesc="Free open source implementation of TURN and STUN Server" +arch=('i686' 'x86_64') +url="http://code.google.com/p/rfc5766-turn-server/" +license=('custom:BSDNew') +makedepends=('gcc>=3.4.4' 'make') +depends=('libevent') +#no redis headers in redi package +optdepends=('postgresql-client: to use postgresql' 'libmysqlclient') +backup=("etc/turnserver.conf" "etc/turnuserdb.conf") +changelog=ChangeLog +source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz) +sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2') + +build() { + cd "${srcdir}/$_portname-${pkgver}" + + PREFIX=/usr \ + MANPREFIX=/usr/share \ + EXAMPLESDIR="/usr/share/$pkgname/examples" \ + DOCSDIR="/usr/share/doc/$pkgname" \ + LIBDIR=/usr/lib \ + SCHEMADIR="/usr/share/$pkgname" \ + TURNINCLUDEDIR="/usr/include/turn" + ./configure + + make +} + +check() { + cd "${srcdir}/$_portname-${pkgver}" + make check +} + +package() { + cd "${srcdir}/$_portname-${pkgver}" + make \ + PREFIX="$pkgdir/usr" \ + MANPREFIX="$pkgdir/usr/share" \ + EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \ + DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \ + LIBDIR="$pkgdir/usr/lib" \ + SCHEMADIR="$pkgdir/usr/share/$pkgname" \ + TURNINCLUDEDIR="$pkgdir/usr/include/turn" \ + install + + + install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf" + install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf" + rm -r "$pkgdir/usr/etc" + + chmod 644 "$pkgdir/usr/lib/libturnclient.a" + + install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} -- cgit v1.2.3 From 3baa19e8b60debf3fb36581045e913c12c5c1469 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 5 Jun 2013 21:44:10 -0300 Subject: libre/{devtools,libretools}-legacy: add pkg to libre repo --- libre/devtools-legacy/PKGBUILD | 28 ++++++ libre/libretools-legacy/PKGBUILD | 100 ++++++++++++++++++++++ libre/libretools-legacy/libretools-legacy.install | 28 ++++++ 3 files changed, 156 insertions(+) create mode 100644 libre/devtools-legacy/PKGBUILD create mode 100644 libre/libretools-legacy/PKGBUILD create mode 100644 libre/libretools-legacy/libretools-legacy.install diff --git a/libre/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD new file mode 100644 index 000000000..2ff4cbc42 --- /dev/null +++ b/libre/devtools-legacy/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Márcio Silva +# Maintainer: Pierre Schmitz + +pkgname=devtools-legacy +_pkgname=devtools +pkgver=20130408 +pkgrel=1 +pkgdesc='Tools for Arch Linux package maintainers (legacy)' +arch=('any') +license=('GPL') +url='http://projects.archlinux.org/devtools.git/' +depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts') +conflicts=$_pkgname +source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig") +md5sums=('12b42b429744af6517ae789f728e9f63' + 'SKIP') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr DESTDIR=${pkgdir} install +} + diff --git a/libre/libretools-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD new file mode 100644 index 000000000..59e383449 --- /dev/null +++ b/libre/libretools-legacy/PKGBUILD @@ -0,0 +1,100 @@ +# Maintainer: Márcio Silva +# Maintainer: Joshua Haase + +pkgbase=libretools +pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el) +pkgver=20120924 +pkgrel=1 +pkgdesc="Programs for Parabola development (legacy)" +arch=('any') +url="http://parabolagnulinux.org" +license=('GPL3+') +depends=(openssh rsync git wget devtools-legacy) +install=libretools-legacy.install +source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar) +md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd) +conflicts=libretools + +package_libretools-legacy() { + backup=(etc/libretools.conf) + + cd $srcdir/$pkgbase-v$pkgver + + # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!! + # more info in: + # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d + # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 + #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|; + # s|mkarchroot -n|mkarchroot|; + # s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|; + # s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|; + # s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|; + # ' librebasebuilder librechroot libremakepkg + + install -d ${pkgdir}/etc/libretools.d + install -m644 libretools.conf ${pkgdir}/etc/ + + install -d ${pkgdir}/usr/bin + install -m755 abslibre-commit ${pkgdir}/usr/bin + install -m755 add-mips64el ${pkgdir}/usr/bin + install -m755 aur ${pkgdir}/usr/bin + install -m755 buildenv ${pkgdir}/usr/bin + install -m755 chcleanup ${pkgdir}/usr/bin + install -m755 createworkdir ${pkgdir}/usr/bin + install -m755 diff-unfree ${pkgdir}/usr/bin + install -m755 fullpkg ${pkgdir}/usr/bin + install -m755 fullpkg-build ${pkgdir}/usr/bin + install -m755 fullpkg-find ${pkgdir}/usr/bin + install -m755 is_built ${pkgdir}/usr/bin + install -m755 is_unfree ${pkgdir}/usr/bin + install -m755 lb ${pkgdir}/usr/bin + install -m755 libreaddiff ${pkgdir}/usr/bin + install -m755 librebasebuilder ${pkgdir}/usr/bin + install -m755 librechroot ${pkgdir}/usr/bin + install -m755 librecommit ${pkgdir}/usr/bin + install -m755 librediff ${pkgdir}/usr/bin + install -m755 libremakepkg ${pkgdir}/usr/bin + install -m755 libremessages ${pkgdir}/usr/bin + install -m755 libremkchroot ${pkgdir}/usr/bin + install -m755 librerelease ${pkgdir}/usr/bin + install -m755 librerepkg ${pkgdir}/usr/bin + install -m755 librestage ${pkgdir}/usr/bin + install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin + install -m755 toru ${pkgdir}/usr/bin + install -m755 toru-path ${pkgdir}/usr/bin + install -m755 toru-utils ${pkgdir}/usr/bin + install -m755 toru-where ${pkgdir}/usr/bin + install -m755 updateabslibre ${pkgdir}/usr/bin + install -m755 update-cleansystem ${pkgdir}/usr/bin + + install -d ${pkgdir}/usr/share/pacman + install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman +} + +package_libretools-legacy-pr() { + backup=('etc/libretools.d/prtools.conf') + + cd $srcdir/$pkgbase-v$pkgver + + install -d ${pkgdir}/etc/libretools.d + install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin + install -m755 prtools/prfullpkg ${pkgdir}/usr/bin + install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin + install -m755 prtools/prtoru ${pkgdir}/usr/bin +} + +package_libretools-legacy-mips64el() { + backup=('etc/libretools.d/mips64el.conf') + + cd $srcdir/$pkgbase-v$pkgver + + install -d ${pkgdir}/etc/libretools.d + install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin + install -m755 mips64el/mips-add ${pkgdir}/usr/bin + install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin +} diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install new file mode 100644 index 000000000..3ede1f904 --- /dev/null +++ b/libre/libretools-legacy/libretools-legacy.install @@ -0,0 +1,28 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + cat < Date: Wed, 5 Jun 2013 21:55:43 -0300 Subject: libretools: fixing conflicts --- libre/libretools/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 9f67689df..e1cfb14fa 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,10 +1,12 @@ # Maintainer: Joshua Haase # Contributor: fauno +# Contributor: Márcio Silva pkgbase=libretools pkgname=(libretools libretools-mips64el) pkgver=20130117 +pkgrel=2 pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/libretools.git/" license=('GPL3+' 'GPL2') @@ -13,7 +15,7 @@ pkgrel=3 arch=('any') groups=(base-devel) depends=(openssh rsync git wget tokyocabinet) -conflicts=(chroottools) +conflicts=(chroottools devtools libretools-legacy) source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar) build() { -- cgit v1.2.3 From fc7e49d04d3f1b8e84dbb6fb0cc76e417d362b4c Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 5 Jun 2013 21:59:34 -0300 Subject: libretools: oops --- libre/libretools/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index e1cfb14fa..815f28b96 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -6,12 +6,11 @@ pkgbase=libretools pkgname=(libretools libretools-mips64el) pkgver=20130117 -pkgrel=2 pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/libretools.git/" license=('GPL3+' 'GPL2') -pkgrel=3 +pkgrel=4 arch=('any') groups=(base-devel) depends=(openssh rsync git wget tokyocabinet) -- cgit v1.2.3