diff options
Diffstat (limited to 'community/freeradius')
-rw-r--r-- | community/freeradius/PKGBUILD | 12 | ||||
-rw-r--r-- | community/freeradius/freeradius.service | 10 | ||||
-rw-r--r-- | community/freeradius/radiusd | 43 |
3 files changed, 10 insertions, 55 deletions
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index d4ac8dcc1..164d97d3b 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $ +# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=5 +pkgrel=8 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -15,15 +15,13 @@ optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' '!makeflags') install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} - radiusd freeradius.tmpfiles freeradius.service krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' - '5dd57af81ba075102581fec45316ba7b' - 'f1a6530b1b69d2fa793aa45b2de379bb' + 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' - '39eba6d34f8249781e9e917646465632' + 'e3f18e3a25df3b692e59f60605354708' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -35,6 +33,7 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libdir=/usr/lib/freeradius \ --with-udpfromto make @@ -43,7 +42,6 @@ build() { package() { cd $srcdir/freeradius-server-$pkgver make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service index 635b6d6f8..220d352af 100644 --- a/community/freeradius/freeradius.service +++ b/community/freeradius/freeradius.service @@ -4,11 +4,11 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd -ExecStartPre=/usr/sbin/radiusd -C -ExecStart=/usr/sbin/radiusd -d /etc/raddb -ExecReload=/usr/sbin/radiusd -C +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd +ExecStartPre=/usr/bin/radiusd -C +ExecStart=/usr/bin/radiusd -d /etc/raddb +ExecReload=/usr/bin/radiusd -C ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/freeradius/radiusd b/community/freeradius/radiusd deleted file mode 100644 index bf872b6f2..000000000 --- a/community/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 |