Date: Wed, 19 Nov 2003 00:16:45 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marcus@FreeBSD.org Subject: ports/59441: Fix bug in RADOMIZE_MASTER_SITES Message-ID: <200311182316.hAINGj3N015839@armada.alexdupre.com> Resent-Message-ID: <200311182320.hAINKGuF012073@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59441
>Category: ports
>Synopsis: Fix bug in RADOMIZE_MASTER_SITES
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 18 15:20:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Nov 13 00:04:58 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386
>Description:
The first OSVERSION check is overwrited by the second one, and so
RANDOMIZE_MASTER_SITES is set to '' even with FreeBSD 5.1 or later.
Fix it doing only one check.
>How-To-Repeat:
>Fix:
--- bsd.port.mk.diff begins here ---
--- bsd.port.mk.orig Wed Nov 19 00:05:43 2003
+++ bsd.port.mk Wed Nov 19 00:07:37 2003
@@ -1756,12 +1756,7 @@
.if exists(/usr/games/random)
RANDOM_CMD?= /usr/games/random
RANDOM_ARGS?= "-w -f -"
-.if ${OSVERSION} > 500100
-_RANDOMIZE_SITES= " |${RANDOM_CMD} ${RANDOM_ARGS}"
-.else
-_RANDOMIZE_SITES= ''
-.endif
-.if ${OSVERSION} > 480000 && ${OSVERSION} < 500000
+.if (${OSVERSION} > 480000 && ${OSVERSION} < 500000) || ${OSVERSION} > 500100
_RANDOMIZE_SITES= " |${RANDOM_CMD} ${RANDOM_ARGS}"
.else
_RANDOMIZE_SITES= ''
--- bsd.port.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311182316.hAINGj3N015839>