aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/freeradius/APKBUILD20
-rw-r--r--main/freeradius/freeradius.pre-install4
2 files changed, 12 insertions, 12 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 5a149a6c4b..f05479674f 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=freeradius
pkgver=2.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
@@ -11,8 +11,8 @@ depends="freeradius-radclient"
makedepends="openssl-dev mysql-dev postgresql-dev gdbm-dev readline-dev
bash libtool autoconf automake perl-dev python-dev openldap-dev
unixodbc-dev linux-pam-dev"
-pkggroups="radiusd"
-pkgusers="radiusd"
+pkggroups="radius"
+pkgusers="radius"
install="freeradius.pre-install"
subpackages="$pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-lib
$pkgname-mssql $pkgname-mysql $pkgname-oracle $pkgname-perl
@@ -81,15 +81,15 @@ build() {
package() {
cd "$_builddir"
- install -d -m0750 -o root -g radiusd "$pkgdir"/etc/raddb
- install -d -m0770 -o root -g radiusd "$pkgdir"/var/run/radius
- install -d -m0750 -o root -g radiusd "$pkgdir"/var/log/radius
- install -d -m0750 -o root -g radiusd "$pkgdir"/var/log/radius/radacct
+ install -d -m0750 -o root -g radius "$pkgdir"/etc/raddb
+ install -d -m0750 -o radius -g radius "$pkgdir"/var/run/radius
+ install -d -m0750 -o radius -g radius "$pkgdir"/var/log/radius
+ install -d -m0750 -o radius -g radius "$pkgdir"/var/log/radius/radacct
make -j1 R="$pkgdir" LIBTOOL="$PWD/libtool" install
- sed -i -e 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
- "$pkgdir"/etc/raddb/radiusd.conf
- chown -R root:radiusd "$pkgdir"/etc/raddb/*
+ #sed -i -e 's:^#user *= *radius:user = radiusd:;s:^#group *= *radius:group = radiusd:' \
+ # "$pkgdir"/etc/raddb/radiusd.conf || exit 1
+ chown -R root:radius "$pkgdir"/etc/raddb/*
rm -f "$pkgdir/usr/sbin/rc.radiusd"
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/radiusd
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/radiusd
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 67791f9e84..30ff04814e 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup radiusd 2>/dev/null
-adduser -S -G radiusd -h /var/log/radius -s /sbin/nologin -D radiusd 2>/dev/null
+addgroup radius 2>/dev/null
+adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
exit 0