summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-05 12:18:39 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-05 12:18:39 -0300
commita25ce8770ffdece0fb5f72f3e9430b837dd2313a (patch)
tree7e1d38f96c9880beec849ae111261e31affbf759
parent8da103e14072dc4cc04231cbca851293f7185e74 (diff)
parent10011be8706083f4a1bdc5fb7af398a2bad0c56a (diff)
downloadabslibre-a25ce8770ffdece0fb5f72f3e9430b837dd2313a.tar.gz
abslibre-a25ce8770ffdece0fb5f72f3e9430b837dd2313a.tar.bz2
abslibre-a25ce8770ffdece0fb5f72f3e9430b837dd2313a.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/cdrkit-libre/PKGBUILD9
-rw-r--r--pcr/miniupnpd/PKGBUILD14
-rw-r--r--pcr/miniupnpd/miniupnpd.systemd4
-rw-r--r--pcr/netatalk/PKGBUILD15
-rw-r--r--pcr/netatalk/netatalk.changelog12
-rw-r--r--pcr/openswan/PKGBUILD13
-rw-r--r--pcr/strongswan/PKGBUILD6
-rw-r--r--pcr/strongswan/strongswan.rc43
8 files changed, 51 insertions, 65 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
}
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/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/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/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
-