summaryrefslogtreecommitdiff
path: root/community/oidentd
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-19 17:54:19 -0300
commit251b132bc8d5157b996afff54617d2483637aa4b (patch)
tree7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /community/oidentd
parent3ed19e74567434fe0bc82d835513b5b62f151838 (diff)
parent07455ea1de16867b168628e8a9f7f5bffc169a5f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/r8168-lts/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/r8168-lts/PKGBUILD community-testing/sage-mathematics/PKGBUILD community/ruby-gtk2/PKGBUILD core/dhcpcd/PKGBUILD core/glibc/PKGBUILD core/net-tools/PKGBUILD cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD extra/cups/PKGBUILD extra/maxima/PKGBUILD extra/scim-hangul/PKGBUILD extra/speech-dispatcher/PKGBUILD extra/subversion/PKGBUILD extra/telepathy-idle/PKGBUILD extra/x11vnc/PKGBUILD multilib-testing/binutils-multilib/PKGBUILD multilib-testing/gcc-multilib/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-krb5/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxrandr/PKGBUILD multilib/lib32-p11-kit/PKGBUILD testing/binutils/PKGBUILD testing/calligra/PKGBUILD testing/dhcp/PKGBUILD testing/gcc/PKGBUILD testing/glibc/PKGBUILD testing/inkscape/PKGBUILD testing/iproute2/PKGBUILD testing/libreoffice/PKGBUILD testing/libreoffice/PKGBUILD.36 testing/poppler/PKGBUILD
Diffstat (limited to 'community/oidentd')
-rw-r--r--community/oidentd/PKGBUILD6
-rw-r--r--community/oidentd/socket1
2 files changed, 3 insertions, 4 deletions
diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index 175c402ea..5c3872a0f 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72791 2012-06-22 12:51:10Z dreisner $
+# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: simo <simo@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,7 +6,7 @@
pkgname=oidentd
pkgver=2.0.8
-pkgrel=6
+pkgrel=7
pkgdesc='An RFC1413 compliant ident daemon'
arch=('i686' 'x86_64' 'mips64el')
url="http://dev.ojnk.net/"
@@ -18,7 +18,7 @@ md5sums=('c3d9a56255819ef8904b867284386911'
'93cbf742cdd0b053f67482273d715f25'
'603307525771724b0f55a2c34fbc3f3e'
'b215bee5764cdecb0939f44d5d2dccbe'
- '651c2ef45d1d345d95056ef0787e29e6')
+ '4442fb9fc10754914568e6ffc3d5fc42')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/oidentd/socket b/community/oidentd/socket
index 63df7036e..cf00b55b8 100644
--- a/community/oidentd/socket
+++ b/community/oidentd/socket
@@ -1,6 +1,5 @@
[Unit]
Description=Ident (RFC 1413) socket
-Conflicts=oidentd.service
[Socket]
ListenStream=113