summaryrefslogtreecommitdiff
path: root/community/miredo
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
commit36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch)
tree397141926cac78871a3e9d53cd8fb824bc1b9cd3 /community/miredo
parent0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff)
parent5827948456201df72a1bd73e87977c569129fb27 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/percona-server/PKGBUILD community/xmlrpc-c/PKGBUILD core/util-linux/PKGBUILD extra/colord/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/gcr/PKGBUILD extra/gdm/PKGBUILD extra/gnome-color-manager/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-dictionary/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-search-tool/PKGBUILD extra/gnome-system-log/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo/PKGBUILD extra/gtkmm3/PKGBUILD extra/gvfs/PKGBUILD extra/json-glib/PKGBUILD extra/libgnome-keyring/PKGBUILD extra/nautilus-open-terminal/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/seahorse/PKGBUILD extra/totem/PKGBUILD extra/xorg-xinit/PKGBUILD extra/yelp/PKGBUILD
Diffstat (limited to 'community/miredo')
-rw-r--r--community/miredo/PKGBUILD6
-rw-r--r--community/miredo/miredo.service1
2 files changed, 3 insertions, 4 deletions
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 1ff3f4d5b..f346ed2ac 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72790 2012-06-22 12:50:59Z dreisner $
+# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=miredo
pkgver=1.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="Teredo client and server."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.remlab.net/miredo/"
@@ -23,7 +23,7 @@ md5sums=('5114debbf9fcab5d292176e4548f8cd1'
'd1b655d7a851cdb46c91c3418ed1962f'
'c5a9be5c3175fecec387f1710bfd2788'
'319aba1ae06349b76cb25fda0dba60a9'
- '3216d47d5aa979706b17b72d8b6e19b0')
+ 'abd7d8831cab7f3ea6d0d4e51b8f8f6a')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service
index 299a887de..d28803efd 100644
--- a/community/miredo/miredo.service
+++ b/community/miredo/miredo.service
@@ -3,7 +3,6 @@ Description=Teredo IPv6 Tunneling Daemon
After=network.target
[Service]
-ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf
ExecStart=/usr/sbin/miredo -f
ExecReload=/bin/kill -HUP $MAINPID