[pkgsrc/trunk]: pkgsrc/net/freeradius Fix builds on Solaris using the SunPRO ...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4c912ca31a7
branches:  trunk
changeset: 535655:f4c912ca31a7
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Nov 24 17:40:36 2007 +0000

description:
Fix builds on Solaris using the SunPRO compiler.  This should fix PR# 36186.
Also do some pkglintification while we are here.

diffstat:

 net/freeradius/Makefile         |   6 +-
 net/freeradius/distinfo         |   3 +-
 net/freeradius/patches/patch-al |  74 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 4 deletions(-)

diffs (116 lines):

diff -r df147bd18dcc -r f4c912ca31a7 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Sat Nov 24 17:16:54 2007 +0000
+++ b/net/freeradius/Makefile   Sat Nov 24 17:40:36 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/09/18 22:15:07 adrianp Exp $
+# $NetBSD: Makefile,v 1.62 2007/11/24 17:40:36 adrianp Exp $
 
 DISTNAME=      freeradius-${RADVER}
 CATEGORIES=    net
@@ -115,12 +115,12 @@
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
 .include "../../devel/pthread-sem/buildlink3.mk"
 SUBST_SED.make+=       -e 's|@ldap_ldflags@|@ldap_ldflags@ \
-                       ${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q} -lsemaphore|g'
+                       ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q} -lsemaphore|g'
 .endif
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
 SUBST_SED.make+=       -e 's|@ldap_ldflags@|@ldap_ldflags@ \
-                       ${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
+                       ${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g'
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
diff -r df147bd18dcc -r f4c912ca31a7 net/freeradius/distinfo
--- a/net/freeradius/distinfo   Sat Nov 24 17:16:54 2007 +0000
+++ b/net/freeradius/distinfo   Sat Nov 24 17:40:36 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2007/09/18 22:15:07 adrianp Exp $
+$NetBSD: distinfo,v 1.28 2007/11/24 17:40:36 adrianp Exp $
 
 SHA1 (freeradius-1.1.7.tar.gz) = 4e8515f82260478ef881ed7b87b7ca258e19ccba
 RMD160 (freeradius-1.1.7.tar.gz) = 9d33a4b01fc791557153b375a41e3d905fc8efe5
@@ -8,3 +8,4 @@
 SHA1 (patch-ai) = 8e74a07cde8134881cfd2e5fe661e42cfa3e9fbf
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
 SHA1 (patch-ak) = 7be986e3949a6f8368f7e01ba93521fac48eff7d
+SHA1 (patch-al) = d334e29e475202ab1dc66bd2c77db459c7ea73f4
diff -r df147bd18dcc -r f4c912ca31a7 net/freeradius/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/patches/patch-al   Sat Nov 24 17:40:36 2007 +0000
@@ -0,0 +1,74 @@
+$NetBSD: patch-al,v 1.1 2007/11/24 17:40:36 adrianp Exp $
+
+--- src/modules/rlm_preprocess/rlm_preprocess.c.orig   2007-04-07 23:42:51.000000000 +0100
++++ src/modules/rlm_preprocess/rlm_preprocess.c
+@@ -126,7 +126,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v
+               /*
+                *  No weird packing.  Ignore it.
+                */
+-              ptr = strchr(vp->strvalue, '='); /* find an '=' */
++              ptr = strchr((char *)vp->strvalue, '='); /* find an '=' */
+               if (!ptr) continue;
+ 
+               /*
+@@ -144,7 +144,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v
+                       char *p;
+                       DICT_ATTR       *dattr;
+ 
+-                      p = vp->strvalue;
++                      p = (char *)vp->strvalue;
+                       gettoken(&p, newattr, sizeof(newattr));
+ 
+                       if (((dattr = dict_attrbyname(newattr)) != NULL) &&
+@@ -223,10 +223,10 @@ static void rad_mangle(rlm_preprocess_t 
+                *
+                *      FIXME: should we handle this as a REALM ?
+                */
+-              if ((ptr = strchr(namepair->strvalue, '\\')) != NULL) {
++              if ((ptr = strchr((char *)namepair->strvalue, '\\')) != NULL) {
+                       strNcpy(newname, ptr + 1, sizeof(newname));
+                       /* Same size */
+-                      strcpy(namepair->strvalue, newname);
++                      strcpy((char *)namepair->strvalue, newname);
+                       namepair->length = strlen(newname);
+               }
+       }
+@@ -395,9 +395,9 @@ static int huntgroup_access(REQUEST *req
+                                       break;
+                               }
+ 
+-                              strNcpy(vp->strvalue, i->name,
++                              strNcpy((char *)vp->strvalue, i->name,
+                                       sizeof(vp->strvalue));
+-                              vp->length = strlen(vp->strvalue);
++                              vp->length = strlen((char *)vp->strvalue);
+ 
+                               pairadd(&request_pairs, vp);
+                       }
+@@ -425,7 +425,7 @@ static int add_nas_attr(REQUEST *request
+                       return -1;
+               }
+               nas->lvalue = request->packet->src_ipaddr;
+-              ip_hostname(nas->strvalue, sizeof(nas->strvalue), nas->lvalue);
++              ip_hostname((char *)nas->strvalue, sizeof(nas->strvalue), nas->lvalue);
+               pairadd(&request->packet->vps, nas);
+       }
+ 
+@@ -446,7 +446,7 @@ static int add_nas_attr(REQUEST *request
+         return -1;
+       }
+       nas->lvalue = request->packet->src_ipaddr;
+-      ip_hostname(nas->strvalue, sizeof(nas->strvalue), nas->lvalue);
++      ip_hostname((char *)nas->strvalue, sizeof(nas->strvalue), nas->lvalue);
+       pairadd(&request->packet->vps, nas);
+       return 0;
+ }
+@@ -580,7 +580,7 @@ static int preprocess_authorize(void *in
+       if ((r = huntgroup_access(request, data->huntgroups,
+                            request->packet->vps)) != RLM_MODULE_OK) {
+               radlog(L_AUTH, "No huntgroup access: [%s] (%s)",
+-                     request->username ? request->username->strvalue : "<No User-Name>",
++                     request->username ? (char *)request->username->strvalue : "<No User-Name>",
+                      auth_name(buf, sizeof(buf), request, 1));
+               return r;
+       }