From nobody@FreeBSD.org  Sun Apr 12 23:29:08 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE2211065670
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Apr 2009 23:29:08 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id DBD148FC1D
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Apr 2009 23:29:08 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n3CNT8aU037902
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Apr 2009 23:29:08 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n3CNT83o037901;
	Sun, 12 Apr 2009 23:29:08 GMT
	(envelope-from nobody)
Message-Id: <200904122329.n3CNT83o037901@www.freebsd.org>
Date: Sun, 12 Apr 2009 23:29:08 GMT
From: David Wood <david@wood2.org.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] net/freeradius2 - pkg-install.in bug fix and improvements
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         133674
>Category:       ports
>Synopsis:       [maintainer update] net/freeradius2 - pkg-install.in bug fix and improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 12 23:30:00 UTC 2009
>Closed-Date:    Wed Apr 22 20:56:47 UTC 2009
>Last-Modified:  Wed Apr 22 20:56:47 UTC 2009
>Originator:     David Wood
>Release:        7.1-RELEASE amd64
>Organization:
>Environment:
FreeBSD manganese.wood2.org.uk 7.1-RELEASE-p4 FreeBSD 7.1-RELEASE-p4 #0: Tue Mar 24 19:09:50 GMT 2009 david@manganese.wood2.org.uk:/scratch/usr/obj/usr/src/sys/MANGANESE amd64
>Description:
Delete trailing whitespace that causes an ' : not found' error.

Add error checking to the deletion of radiusd.conf.update-libdir-original.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: files/pkg-install.in
===================================================================
--- files/pkg-install.in	(.../branches/FreeBSD-ports-tree/freeradius2)	(revision 255)
+++ files/pkg-install.in	(.../trunk/freeradius2)	(revision 255)
@@ -152,13 +152,21 @@
 	        echo -n 's:^(libdir[[:space:]=]+)(.*[[:space:]:]+)?' ; \
 	        echo -n $( echo ${radius_libdir} | \
 	            sed -Ee 's:^(.*)-[[:digit:].]+$:\1:' ) ; \
-	        echo -n '(-[[:digit:].]+)?([[:space:]:]+.*)?$' ; \ 
+	        echo -n '(-[[:digit:].]+)?([[:space:]:]+.*)?$' ; \
 		echo -n ':\1\2'${radius_libdir}'\4:' \
 	    ) ${radius_raddb}/radiusd.conf; then
 	    echo "Failed to update libdir in ${radius_raddb}/radius.conf"
 	    exit 1
 	fi
-	rm ${radius_raddb}/radiusd.conf.update-libdir-original
+
+	if [ -f ${radius_raddb}/radiusd.conf.update-libdir-original ]; then
+	    if ! rm ${radius_raddb}/radiusd.conf.update-libdir-original; then
+		echo -n 'Failed to delete backup file '
+		echo "${radius_raddb}/radiusd.conf.update-libdir-original."
+		exit 1
+	    fi
+	fi
+
         ;;
 esac
 



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Mon Apr 13 13:07:27 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133674 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/133674: commit references a PR
Date: Wed, 22 Apr 2009 16:28:31 +0000 (UTC)

 wxs         2009-04-22 16:28:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/freeradius2/files pkg-install.in 
   Log:
   - Remove trailing whitespace and add some error checking to pkg-install
   
   PR:             ports/133674
   Submitted by:   David Wood <david@wood2.org.uk> (maintainer)
   
   Revision  Changes    Path
   1.4       +11 -3     ports/net/freeradius2/files/pkg-install.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Wed Apr 22 20:56:46 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133674 
>Unformatted:
