ports/61772: bsd.port.mk regression for mutltiple checksums

[dirk.meyer at dinoex.sub.org]

>Number:         61772
>Category:       ports
>Synopsis:       bsd.port.mk regression for mutltiple checksums
>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:   Fri Jan 23 02:20:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
privat
>Environment:

http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk.diff?r1=1.474&r2=1.475&f=h

>Description:

	Some ports have more then one valid checksum recorded in distfiles.
	This avoid the use to download a rerolled tarball with no
	significant changes for the package.

	The feature was removed when bsd.port.mk was updated to 1.475

>How-To-Repeat:

	unsucessfull refetch:

	net/licq
	mail/sma
	security/gnupg-idea

http://people.freebsd.org/~dinoex/errorlogs/dinoex@freebsd.org-date.html

amd64-5-latest	Jan 23 05:49:10 2004	sma-1.4.log	 	2k	mail/sma
alpha-4-latest	Jan 22 16:34:21 2004	sma-1.4.log	 	2k	mail/sma
i386-4-latest	Jan 22 15:00:31 2004	licq-base-1.2.7.log	3k	net/licq
i386-4-latest	Jan 22 04:44:48 2004	sma-1.4.log	 	2k	mail/sma

>Fix:

	apply this patch:

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.480
diff -u -r1.480 bsd.port.mk
--- bsd.port.mk	20 Jan 2004 22:27:01 -0000	1.480
+++ bsd.port.mk	23 Jan 2004 10:01:24 -0000
@@ -4116,7 +4116,7 @@
 				${ECHO_MSG} ">> Checksum for $$file is set to IGNORE in distinfo file even though"; \
 				${ECHO_MSG} "   the file is not in the "'$$'"{IGNOREFILES} list."; \
 				OK="false"; \
-			elif [ "$$CKSUM2" = "$$CKSUM" ]; then \
+			elif ${EXPR} "$$CKSUM2" : ".*$$CKSUM" > /dev/null; then \
 				${ECHO_MSG} ">> Checksum OK for $$file."; \
 			else \
 				${ECHO_MSG} ">> Checksum mismatch for $$file."; \
>Release-Note:
>Audit-Trail:
>Unformatted: