ports/119910: [maintainer update] net/freeradius - fix radsqlrelay, update MASTER_SITES

[David Wood]

>Number:         119910
>Category:       ports
>Synopsis:       [maintainer update] net/freeradius - fix radsqlrelay, update MASTER_SITES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 23 03:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     David Wood
>Release:        6.2-RELEASE i386
>Organization:
>Environment:
FreeBSD titanium.wood2.org.uk 6.2-RELEASE-p10 FreeBSD 6.2-RELEASE-p10 #0: Tue Jan 15 17:30:36 GMT 2008     david at titanium.wood2.org.uk:/usr/obj/usr/src/sys/TITANIUM  i386
>Description:
Backport two fixes from net/freeradius2 2.0.1 (not yet committed).


Update MASTER_SITES to allow MASTER_SITE_SUBDIR to work correctly. This should
stop problems with fetching between a new version of FreeRADIUS being released
and the port being updated (as the tarballs for old versions are moved to the
'old' folder on the download sites). This fix also updates MASTER_SITES to the
latest list of mirrors.

Patch radsqlrelay to work correctly with FreeBSD. [1]

[1] - http://preview.tinyurl.com/2ku5yp

>How-To-Repeat:

>Fix:
Files added: files/patch-radsqlrelay
Files deleted: <none>

Patch attached with submission follows:

Index: files/patch-radsqlrelay
===================================================================
--- files/patch-radsqlrelay	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 0)
+++ files/patch-radsqlrelay	(.../trunk/freeradius)	(revision 166)
@@ -0,0 +1,32 @@
+--- scripts/radsqlrelay	Sat Nov  4 12:58:14 2006
++++ scripts/radsqlrelay	Wed Jan 23 00:54:27 2008
+@@ -43,14 +43,13 @@
+ }
+ 
+ # /!\ OS-dependent structure
+-# Linux struct flock
+-#   short l_type;
+-#   short l_whence;
++# FreeBSD struct flock
+ #   off_t l_start;
+ #   off_t l_len;
+ #   pid_t l_pid;
+-# c2ph says: typedef='s2 l2 i', sizeof=16
+-my $FLOCK_STRUCT = 's2l2i';
++#   short l_type;
++#   short l_whence;
++my $FLOCK_STRUCT = 'q2is2';
+ 
+ sub setlock($;$$)
+ {
+@@ -58,8 +57,8 @@
+     $start = 0 unless defined $start;
+     $len = 0 unless defined $len;
+ 
+-                                    #type     whence    start   till  pid
+-    my $packed = pack($FLOCK_STRUCT, F_WRLCK, SEEK_SET, $start, $len, 0);
++                                    #start   till  pid type    whence
++    my $packed = pack($FLOCK_STRUCT, $start, $len, 0, F_WRLCK, SEEK_SET);
+     if (fcntl($fh, F_SETLKW, $packed)) { return 1 }
+     else { return 0 }
+ }
Index: Makefile
===================================================================
--- Makefile	(.../branches/FreeBSD-ports-tree/freeradius)	(revision 166)
+++ Makefile	(.../trunk/freeradius)	(revision 166)
@@ -7,14 +7,14 @@
 
 PORTNAME=	freeradius
 PORTVERSION?=	1.1.7
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
-		ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
-		ftp://ftp.uk.freeradius.org/pub/radius/ \
-		ftp://ftp.us.freeradius.org/pub/radius/ \
-		http://freeradius.portal-to-web.de/
-MASTER_SITE_SUBDIR=	. old
+MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
+		ftp://ftp.uk.freeradius.org/pub/radius/%SUBDIR%/ \
+		http://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/%SUBDIR%/ \
+		http://freeradius.portal-to-web.de/%SUBDIR%/
+MASTER_SITE_SUBDIR= . old
 
 MAINTAINER?=	david at wood2.org.uk
 COMMENT?=	A free RADIUS server implementation


>Release-Note:
>Audit-Trail:
>Unformatted: