From cc57cb201ddb179d2bb481c13dd4f286ae643b12 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 4 Jun 2013 00:27:56 -0700
Subject: Tue Jun  4 00:27:56 PDT 2013

---
 core/libsasl/PKGBUILD  |  8 +++-----
 core/libsasl/saslauthd | 49 -------------------------------------------------
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 core/libsasl/saslauthd

(limited to 'core/libsasl')

diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index b99f0afd4..df0e24d52 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $
+# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=3
+pkgrel=4
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        saslauthd
         tmpfiles.conf)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
@@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20'
          '45bb0192d2f188066240b9a66ee6365f')
 
 build() {
@@ -74,6 +72,7 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+      --sbin=/usr/bin \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
       --disable-static \
@@ -131,7 +130,6 @@ package_cyrus-sasl() {
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
   make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
   install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf"
diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/core/libsasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
-- 
cgit v1.2.3-54-g00ecf