summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
Diffstat (limited to 'pcr')
-rw-r--r--pcr/cluster-glue/PKGBUILD158
-rw-r--r--pcr/ha-heartbeat/PKGBUILD84
-rw-r--r--pcr/ha-heartbeat/ha-heartbeat.service10
-rw-r--r--pcr/ha-pacemaker/PKGBUILD83
-rw-r--r--pcr/ha-resourceagent/PKGBUILD68
-rw-r--r--pcr/ha-resourceagent/ha-ldirector.service10
-rw-r--r--pcr/heartbeat/PKGBUILD202
-rw-r--r--pcr/jitsi/PKGBUILD59
-rw-r--r--pcr/jitsi/drop-open-term-on-index-jn-html.patch6
-rw-r--r--pcr/miniupnpd/PKGBUILD14
-rw-r--r--pcr/miniupnpd/miniupnpd.systemd4
-rw-r--r--pcr/mosquitto/PKGBUILD15
-rw-r--r--pcr/mosquitto/binmerge.patch21
-rw-r--r--pcr/mosquitto/mosquitto.service6
-rw-r--r--pcr/netatalk/PKGBUILD15
-rw-r--r--pcr/netatalk/netatalk.changelog12
-rw-r--r--pcr/openhpi/PKGBUILD117
-rw-r--r--pcr/openipmi/PKGBUILD125
-rw-r--r--pcr/openswan/PKGBUILD13
-rw-r--r--pcr/pacemaker/PKGBUILD222
-rw-r--r--pcr/resource-agent/PKGBUILD202
-rw-r--r--pcr/rfc5766-turn-server/ChangeLog5
-rw-r--r--pcr/rfc5766-turn-server/PKGBUILD61
-rw-r--r--pcr/strongswan/PKGBUILD6
-rw-r--r--pcr/strongswan/strongswan.rc43
-rw-r--r--pcr/sword-svn/PKGBUILD39
-rw-r--r--pcr/sword-svn/automake.patch52
27 files changed, 1267 insertions, 385 deletions
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
index 89b0af8ee..684efe7c2 100644
--- a/pcr/cluster-glue/PKGBUILD
+++ b/pcr/cluster-glue/PKGBUILD
@@ -1,24 +1,23 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=cluster-glue
_pkgname1=${pkgname::7}
_pkgname2=${pkgname:8}
_pkgname=${_pkgname1^}_${_pkgname2^}
-_grpname=linux-ha
pkgver=1.0.11
-pkgrel=8
-pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack'
+pkgrel=11
+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
@@ -30,15 +29,13 @@ depends=(
libxml2
net-snmp
openhpi
- #openipmi
+ openipmi
+ openssh
python
util-linux
- #vacm
-)
-optdepends=(
- net-tools
- openssh
+ #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!!
)
+optdepends=net-tools
makedepends=(
help2man
libxslt
@@ -48,11 +45,12 @@ makedepends=(
valgrind
w3m
)
-provides=ha-$_pkgname2
+options=(!libtool)
+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() {
@@ -84,35 +82,118 @@ 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)
- 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|;
- /Like 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 .)
+
+ # 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)
}
build() {
@@ -121,6 +202,7 @@ build() {
setarch $CARCH ./configure --prefix=/usr\
--disable-ansi\
--disable-fatal-warnings\
+ --disable-static\
--enable-doc\
--enable-libnet\
--enable-upstart\
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 <coadde@lavabit.com>
-
-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 <coadde@lavabit.com>
-
-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 <coadde@lavabit.com>
-
-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..f9ee9254b
--- /dev/null
+++ b/pcr/heartbeat/PKGBUILD
@@ -0,0 +1,202 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=heartbeat
+pkgver=3.0.5
+_pkgver=${pkgver::1}_${pkgver:2:1}
+pkgrel=10
+pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=(
+ GPL2
+ lGPL2.1
+)
+depends=(
+ gnutls
+ cluster-glue
+)
+optdepends=net-tools
+makedepends=(
+ docbook-xsl
+ libxslt
+ lynx
+ net-tools
+ openssh
+ swig
+ valgrind
+ w3m
+)
+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
+
+ 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|;
+ ' $(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
+ setarch $CARCH ./bootstrap
+ setarch $CARCH ./configure --prefix=/usr\
+ --disable-fatal-warnings\
+ --disable-static\
+ --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
+
+ 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
+ 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:
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 <magicrhesus@ouranos.be>
# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
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|<a href="http://www.opensource.org/">Open Source</a> / <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>|<a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>|' 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 @@
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Open Source VoIP &amp; IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> 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. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> / <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> 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 <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table>
++<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Free Software VoIP &amp; IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> 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. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> 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 <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table>
diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 543002e04..57a04c290 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,20 +1,19 @@
# $Id$
-# Maintainer: None
+# Maintainer: fauno <fauno@parabola.nu>
pkgname=miniupnpd
pkgver=1.8.20130503
-pkgrel=1
+pkgrel=3
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)
md5sums=('484dbda7c428b2d5f3768500a48d3375'
- 'f862f79b673359adc80faf0be914394f'
- '2cc73f661cacb2fa374eee3d1030f428')
+ '0c3f1777b6c043dd5029092d62896660')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -34,8 +33,11 @@ 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
}
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]
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]
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 <farhany at xaviya dot com>
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:
diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD
index 6389ff39c..bffcc74ba 100644
--- a/pcr/openhpi/PKGBUILD
+++ b/pcr/openhpi/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=openhpi
pkgver=3.2.0
-pkgrel=1
+pkgrel=4
pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers'
arch=(
i686
@@ -15,33 +15,136 @@ depends=(
libxml2
net-snmp
)
+options=(!libtool)
source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab
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|;
' $(grep -rl var/run)
- sed -i '/Like Linux/ s|Linux|GNU/Linux|;
- /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|;
- /Linux distribution/ s|Linux|GNU/Linux|;
- /Linux software/ 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|;
+ # 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)
}
build() {
cd $srcdir/$pkgname-$pkgver
setarch $CARCH ./configure --prefix=/usr\
+ --disable-static\
--enable-clients\
--enable-dynamic_simulator\
--enable-ilo2_ribcl\
diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD
index 1dcb359ee..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=1
+pkgrel=3
pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})"
arch=(
i686
@@ -37,7 +37,128 @@ sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44c
prepare() {
cd $srcdir/$_pkgname-$pkgver
- sed -i '/on Linux/ s|Linux|GNU/Linux|' $(grep -rl Linux)
+
+ #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 '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)
}
build() {
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 <ke [AT] xjpvictor [DOT] info>
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
}
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
new file mode 100644
index 000000000..7ee8209ad
--- /dev/null
+++ b/pcr/pacemaker/PKGBUILD
@@ -0,0 +1,222 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=pacemaker
+pkgver=1.1.9
+pkgrel=5
+pkgdesc='Cluster resource manager (Linux-HA)'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/${pkgname^}
+license=GPL2
+depends=(
+ corosync
+ heartbeat
+ libqb
+ libxslt
+ resource-agent
+ #saxon-he
+)
+makedepends=(
+ asciidoc
+ help2man
+ inkscape
+ lynx
+ openssh
+ valgrind
+ 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
+
+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|;
+ ' $(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
+ setarch $CARCH ./autogen.sh
+ setarch $CARCH ./configure --prefix=/usr\
+ --disable-static\
+ --enable-fatal-warnings\
+ --enable-systemd\
+ --enable-upstart\
+ --libdir=/usr/lib\
+ --libexecdir=/usr/lib\
+ --localstatedir=/var\
+ --sbindir=/usr/bin\
+ --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
+
+ rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,}
+ mv $pkgdir/{var/,}run
+ mv $pkgdir/usr/bin/cibsecret{,-$pkgname}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD
new file mode 100644
index 000000000..46c95ede1
--- /dev/null
+++ b/pcr/resource-agent/PKGBUILD
@@ -0,0 +1,202 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=resource-agent
+_pkgname1=${pkgname::8}
+_pkgname2=${pkgname:9}
+_pkgnamex=${_pkgname1^}_${_pkgname2^}
+_pkgnamey=${pkgname}s
+_pkgnamez=ha-${_pkgname1}${_pkgname2}
+pkgver=3.9.5
+pkgrel=5
+pkgdesc='Standardized interface for a cluster resource (Linux-HA)'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+group=linux-ha
+url=http://$group.org/wiki/$_pkgnamex
+license=GPL
+depends=(
+ cluster-glue
+ ipvsadm
+ perl-socket6
+ perl-lwp-protocol-https
+ perl-io-socket-inet6
+ perl-mailtools
+ #rgmanager (clulog) !!redhat-cluster!!
+)
+optdepends=net-tools
+makedepends=(
+ libxslt
+ libvirt
+ net-tools
+ openssh
+)
+options=(!libtool)
+provides=($_pkgnamez)
+conflicts=$_pkgnamez
+replaces=$_pkgnamez
+source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz
+sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
+
+prepare() {
+ cd $srcdir/$_pkgnamey-$pkgver
+
+ sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+ ' 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| /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/$_pkgnamey-$pkgver
+ setarch $CARCH ./autogen.sh
+ setarch $CARCH ./configure --prefix=/usr\
+ --enable-fatal-warnings\
+ --enable-libnet\
+ --libdir=/usr/lib\
+ --localstatedir=/var\
+ --sbindir=/usr/bin\
+ --sysconfdir=/etc\
+ --with-ocf-root=/usr/lib/ocf
+ setarch $CARCH make
+}
+
+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
+
+ install -d $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:
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 <tsachev@gamil.com>
+
+ * 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 <tsachev@gmail.com>
+
+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
+}
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
}
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
-
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 <stefan-husmann@t-online.de>
+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 \