Import of pkgsrc-2015Q1

net/freeradius2/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/02/12 23:18:20 tron Exp $
+# $NetBSD: Makefile,v 1.38 2015/03/30 09:21:24 jperkin Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
-PKGREVISION=	7
+PKGREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/
 EXTRACT_SUFX=	.tar.bz2
@@ -25,7 +25,7 @@ BUILD_DEFS+=		VARBASE
 FILES_SUBST+=		RADIUS_USER=${RADIUS_USER}
 FILES_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP}
 PLIST_SUBST+=		RADVER=${RADVER}
-MESSAGE_SRC+=		${WRKDIR}/.MESSAGE_SRC
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE
 MESSAGE_SUBST+=		CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} VARBASE=${VARBASE}
 MESSAGE_SUBST+=		RADIUS_USER=${RADIUS_USER} XARGS=${XARGS:Q}
 MESSAGE_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP} FIND=${FIND:Q}
@@ -129,17 +129,10 @@ CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
 
 .for d in ${EGDIRS}
 INSTALLATION_DIRS+=	${EGDIR}/${d}
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/${d} ${RADIUS_USER} \
+			${RADIUS_GROUP} 750
 .endfor
 
-OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/certs ${RADIUS_USER} \
-			${RADIUS_GROUP} 750
-OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/certs/demoCA ${RADIUS_USER} \
-			${RADIUS_GROUP} 750
-OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/modules ${RADIUS_USER} \
-			${RADIUS_GROUP} 750
-OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/sites-enabled ${RADIUS_USER} \
-			${RADIUS_GROUP} 750
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
@@ -157,12 +150,6 @@ SUBST_SED.make+=	-e 's|@ldap_ldflags@|@ldap_ldflags@ \
 			${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g'
 .endif
 
-post-build:
-	${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC
-.if !empty(PKG_OPTIONS:Mpam)
-	${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam
-.endif
-
 post-install:
 .for f in ${EGFILES}
 	${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${DESTDIR}${EGDIR}/${f}

net/freeradius2/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/04/12 13:45:47 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/04/27 12:10:55 he Exp $
 
 SHA1 (freeradius-server-2.2.0.tar.bz2) = 8710b21972072241219f006d26f609cb58875cda
 RMD160 (freeradius-server-2.2.0.tar.bz2) = 243569a7ad93b292439e6938be8102dba12b843d
@@ -12,3 +12,4 @@ SHA1 (patch-aj) = 865882e6e6e935276529b98616c9059c555272b9
 SHA1 (patch-ak) = 751aba6a3f9716279f3a87871cf7008b7a921f9a
 SHA1 (patch-al) = 6d68e3e2d7dd50675f142be974b277da0f664c8b
 SHA1 (patch-man_man5_dictionary.5) = cc662beeb2351501c9761e4ce6fc8402c7907b30
+SHA1 (patch-src_modules_rlm__pap_rlm__pap.c) = 595c5dafb22d71fbcb00974e4fc56a1fd1e7c7c3

net/freeradius2/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/05/23 17:28:44 tron Exp $
+# $NetBSD: options.mk,v 1.5 2014/11/02 05:55:43 obache Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.freeradius
 PKG_SUPPORTED_OPTIONS=		freeradius-simul-use kerberos ldap mysql
@@ -140,7 +140,7 @@ CONFIGURE_ENV+=		ac_cv_path_SNMPWALK=""
 ###
 .if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=	--with-rlm_pam
-MESSAGE_SRC+=		${WRKDIR}/.MESSAGE_SRC.pam
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE.pam
 PLIST.pam=		yes
 .else
 CONFIGURE_ARGS+=	--without-rlm_pam

net/freeradius2/patches/patch-src_modules_rlm__pap_rlm__pap.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-src_modules_rlm__pap_rlm__pap.c,v 1.1 2014/04/27 12:10:55 he Exp $
+
+Increase buffer size, and use output buffer size as limit for hex2bin.
+Should fix CVE-2014-2015, patch from
+https://github.com/FreeRADIUS/freeradius-server/commit/0d606cfc29a
+
+--- src/modules/rlm_pap/rlm_pap.c.orig	2012-09-10 11:51:34.000000000 +0000
++++ src/modules/rlm_pap/rlm_pap.c
+@@ -245,7 +245,7 @@ static int base64_decode (const char *sr
+ static void normify(REQUEST *request, VALUE_PAIR *vp, size_t min_length)
+ {
+ 	size_t decoded;
+-	uint8_t buffer[64];
++	uint8_t buffer[256];
+ 
+ 	if (min_length >= sizeof(buffer)) return; /* paranoia */
+ 
+@@ -253,7 +253,7 @@ static void normify(REQUEST *request, VA
+ 	 *	Hex encoding.
+ 	 */
+ 	if (vp->length >= (2 * min_length)) {
+-		decoded = fr_hex2bin(vp->vp_strvalue, buffer, vp->length >> 1);
++		decoded = fr_hex2bin(vp->vp_strvalue, buffer, sizeof(buffer));
+ 		if (decoded == (vp->length >> 1)) {
+ 			RDEBUG2("Normalizing %s from hex encoding", vp->name);
+ 			memcpy(vp->vp_octets, buffer, decoded);