pkg/42334: print/cups distfile has changed at MASTER-SITE

[kre%munnari.OZ.AU@localhost]

>Number:         42334
>Category:       pkg
>Synopsis:       print/cups distfile has changed at MASTER-SITE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 16 16:55:00 +0000 2009
>Originator:     Robert Elz
>Release:        NetBSD 4.0 / i368  (irrelevant)
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD epsilon.noi.kre.to 5.0.1 NetBSD 5.0.1 (EPSILON-1.2-20090731) #8: 
Sat Aug 1 02:22:55 ICT 2009 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/5/kernels/EPSILON i386
Architecture: i386
Machine: i386
>Description:
        Iain Hibbert pointed out on tech-pkg in
                http://mail-index.netbsd.org/tech-pkg/2009/11/16/msg004253.html
        that the distfile for cups has changed on the master site.

        pkgsrc currently copes, as it eventually falls back to the
        distfile mirror at ftp.netbsd.org that has the distfile that
        pkgsrc wants.

>How-To-Repeat:
        mv ..../distfiles/cups-1.3.11-source.tar.bz2 /somewhere/safe
        cd ..../pkgsrc/print/cups
        make checksum

        and observe pkgsrc fetch the distfile from one mirror after
        another until it eventually tries ftp.netbsd.org

        The distfile was (apparently) changed on October 10 at the
        master site (from its mtime there) in the following way ...

diff -ur cups-1.3.11-WAS/packaging/cups.spec cups-1.3.11/packaging/cups.spec
--- cups-1.3.11-WAS/packaging/cups.spec 2009-07-03 05:11:23.000000000 +0700
+++ cups-1.3.11/packaging/cups.spec     2009-07-03 05:11:22.000000000 +0700
@@ -39,7 +39,7 @@
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/1.3.11/cups-1.3.11-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/1.3.11/cups-1.3.11-source.tar.gz
 Url: http://www.cups.org
 Packager: Anonymous <anonymous%foo.com@localhost>
 Vendor: Apple Inc.

        That's a seemingly innocent change, so pkgsrc should probably
        update to the latest version of the distfile

>Fix:
        Apply the patch below.  The revbump is probably optional, as
        I doubt anyone (of pkgsrc users) really cares about this change ... 
        I included it to err on the side of safety - feel free to undo that.

        Alternatievly, change MASTER_SITES so only f.n.o is used.

Index: Makefile
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/print/cups/Makefile,v
retrieving revision 1.142
diff -u -r1.142 Makefile
--- Makefile    26 Aug 2009 19:56:52 -0000      1.142
+++ Makefile    16 Nov 2009 14:37:42 -0000
@@ -8,8 +8,9 @@
 PKGNAME=       cups-${VERS}
 BASE_VERS=     1.3.11
 DIST_VERS=     ${BASE_VERS}
+DIST_SUBDIR=   cups-20091010
 VERS=          ${DIST_VERS:S/-/./g}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
                ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/print/cups/distinfo,v
retrieving revision 1.64
diff -u -r1.64 distinfo
--- distinfo    11 Oct 2009 16:30:43 -0000      1.64
+++ distinfo    16 Nov 2009 14:37:07 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.64 2009/10/11 16:30:43 tnn Exp $
 
-SHA1 (cups-1.3.11-source.tar.bz2) = c8304ee8d631bb370fc10fc1fffbe8ebae413df2
-RMD160 (cups-1.3.11-source.tar.bz2) = aa263fe29350cee307bbd72ef2f5cb061c2476e0
-Size (cups-1.3.11-source.tar.bz2) = 3799424 bytes
+SHA1 (cups-20091010/cups-1.3.11-source.tar.bz2) = 
df5cfb64fb608fc128acadde670dc30af49bdb18
+RMD160 (cups-20091010/cups-1.3.11-source.tar.bz2) = 
a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78
+Size (cups-1.3.11-source.tar.bz2) = 3799393 bytes
 SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
 SHA1 (patch-ab) = 0b8c6662b836775c693da7ebc613ca7a5594840a
 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04