diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
| commit | 6d90f2496f41209ab84d8b61d20b4d79d632ec7d (patch) | |
| tree | 91a141bc21b17ccd6187b5c6a8b9f53367d9c93e /community/freeradius | |
| parent | 26841be26f283b971f431eb735f748cef7a5250d (diff) | |
| parent | 2c4629f613c001fd29740d0f4c0e497c771a2182 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/frogatto/PKGBUILD
community/python-psycopg2/PKGBUILD
core/libtirpc/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnugo/PKGBUILD
extra/gperf/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdegames/PKGBUILD
extra/kismet/PKGBUILD
extra/lzo/PKGBUILD
extra/mutt/PKGBUILD
extra/obconf/PKGBUILD
extra/opensp/PKGBUILD
extra/qt3/PKGBUILD
extra/re2c/PKGBUILD
extra/samba/PKGBUILD
extra/sharutils/PKGBUILD
extra/wireshark/PKGBUILD
Diffstat (limited to 'community/freeradius')
| -rw-r--r-- | community/freeradius/PKGBUILD | 19 | ||||
| -rw-r--r-- | community/freeradius/krb5-build-fix.patch | 21 |
2 files changed, 33 insertions, 7 deletions
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index f436f8eef..ebcdb045d 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 44168 2011-04-04 11:24:12Z spupykin $ +# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.10 -pkgrel=5 +pkgrel=6 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" license=("GPL") -depends=('openssl' 'heimdal' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' 'emptydirs' '!makeflags') install=$pkgname.install source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \ - radiusd) + radiusd + krb5-build-fix.patch) md5sums=('8ea2bd39460a06212decf2c14fdf3fb8' - 'f1a6530b1b69d2fa793aa45b2de379bb') + 'f1a6530b1b69d2fa793aa45b2de379bb' + 'c6a61de7576933f59154a53bfc12a2d2') build() { cd $srcdir/freeradius-server-$pkgver export CFLAGS="$CFLAGS -fno-strict-aliasing" - # Fix compilation with heimdal >= 1.3.1 - # Don't mess around with KRB5_DEPRECATED which is used internally :o sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in + patch -p1 <$srcdir/krb5-build-fix.patch ./configure --with-system-libtool --with-system-libltdl \ --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ --libdir=/usr/lib/freeradius make +} + +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/* diff --git a/community/freeradius/krb5-build-fix.patch b/community/freeradius/krb5-build-fix.patch new file mode 100644 index 000000000..11dae7090 --- /dev/null +++ b/community/freeradius/krb5-build-fix.patch @@ -0,0 +1,21 @@ +diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c +--- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 ++++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 +@@ -375,7 +375,7 @@ + * Heimdal krb5 verification + */ + radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val*/, + userP->realm); + + krb5_cc_default(context, &id); +@@ -390,7 +390,7 @@ + + radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", + error_message(ret), +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val */, + userP->realm); + + return RLM_MODULE_REJECT; |