SEO

On Fri, Aug 25, 2006 at 02:50:44PM +0200, Joerg Sonnenberger wrote:
> On Thu, Aug 24, 2006 at 02:43:30PM -0400, Seth Hanford wrote:
> > Instead of spending time finding and implementing new hashes, the
> > infrastructure need only check all the hashes instead of just SHA1 (or
> > two of the three, even) & size. Looking through ports(7) and
> > bsd.port.mk(5), I didn't find such an option, but it may already exist.
>
> It does check all three.

No, it checks the first matching in distinfo. The following quick patch
changes that.

Best regards,

Matthias

Index: bsd.port.mk
================================================== =================
RCS file: /home/bauerm/cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.763
diff -u -r1.763 bsd.port.mk
--- bsd.port.mk 7 Aug 2006 08:57:18 -0000 1.763
+++ bsd.port.mk 25 Aug 2006 13:52:31 -0000
@@ -1602,27 +1602,27 @@
cd ${DISTDIR}; OK=true; list=''; \
for file in ${_CKSUMFILES}; do \
for cipher in ${PREFERRED_CIPHERS}; do \
- set -- `grep -i "^$$cipher ($$file)" $$checksum_file` && break || \
- ${ECHO_MSG} ">> No $$cipher checksum recorded for $$file."; \
- done; \
- case "$$4" in \
- "") \
- ${ECHO_MSG} ">> No checksum recorded for $$file."; \
- OK=false;; \
- "IGNORE") \
- echo ">> Error: checksum for $$file is set to IGNORE in distinfo"; \
- OK=false;; \
- *) \
- CKSUM=`$$cipher < $$file`; \
- case "$$CKSUM" in \
- "$$4") \
- ${ECHO_MSG} ">> Checksum OK for $$file. ($$cipher)";; \
- *) \
- echo ">> Checksum mismatch for $$file. ($$cipher)"; \
- list="$$list $$file $$cipher $$4"; \
+ set -- `grep -i "^$$cipher ($$file)" $$checksum_file` || \
+ ${ECHO_MSG} ">> No $$cipher checksum recorded for $$file." || continue; \
+ case "$$4" in \
+ "") \
+ ${ECHO_MSG} ">> No checksum recorded for $$file."; \
+ OK=false;; \
+ "IGNORE") \
+ echo ">> Error: checksum for $$file is set to IGNORE in distinfo"; \
OK=false;; \
- esac;; \
- esac; \
+ *) \
+ CKSUM=`$$cipher < $$file`; \
+ case "$$CKSUM" in \
+ "$$4") \
+ ${ECHO_MSG} ">> Checksum OK for $$file. ($$cipher)";; \
+ *) \
+ echo ">> Checksum mismatch for $$file. ($$cipher)"; \
+ list="$$list $$file $$cipher $$4"; \
+ OK=false;; \
+ esac;; \
+ esac; \
+ done; \
done; \
set --; \
if ! $$OK; then \