ports/79044: [maintainer update] sysutils/portsnap

Colin Percival cperciva at daemonology.net
Sun Mar 20 09:10:04 UTC 2005


>Number:         79044
>Category:       ports
>Synopsis:       [maintainer update] sysutils/portsnap
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 20 09:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Colin Percival
>Release:        FreeBSD 5.3-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD hexahedron.daemonology.net 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #5: Tue Feb 8 02:15:18 GMT 2005 cperciva at hexahedron.daemonology.net:/usr/home/cperciva/obj/usr/src/sys/GENERIC i386

>Description:

Update portsnap to version 0.9.  This brings the following changes:
 * SHA-256 has replaced SHA-1 as a hash function used for verifying the
integrity of the ports tree.
 * The RSA signature verification is now performed using OpenSSL rather
than "borrowing" code from FreeBSD Update.
 * In addition to distributing the ports tree, portsnap now also 
produces up-to-date INDEX, INDEX-4, and INDEX-5 files.
 * When fetching a series of patches, portsnap now prints a simple
progress indicator.

Note to users: Please read the UPDATING entry.

>How-To-Repeat:
>Fix:

Patch is below; suggested commit log message is above.  Since portsnap
now depends upon sysutils/freebsd-sha256, please commit pr ports/79043
before committing this pr.

--- portsnap.diff begins here ---
Index: ports/UPDATING
===================================================================
RCS file: /home/pcvs/ports/UPDATING,v
retrieving revision 1.165
diff -u -p -r1.165 UPDATING
--- ports/UPDATING	19 Mar 2005 06:41:31 -0000	1.165
+++ ports/UPDATING	20 Mar 2005 05:27:14 -0000
@@ -6,6 +6,24 @@ You should get into the habit of checkin
 time you update your ports collection, before attempting any port
 upgrades.
 
+20050320:
+  AFFECTS: users of sysutils/portsnap
+  AUTHOR: cperciva at FreeBSD.org
+
+  As a result of shifting from SHA-1 to SHA-256, the structure of
+  portsnap's configuration file and compressed snapshot have both
+  changed.  After upgrading to portsnap 0.9, you will have to
+  update your configuration file ($PREFIX/etc/portsnap.conf) and
+  delete your existing portsnap compressed snapshot:
+
+  	# cd /usr/local/etc && cp portsnap.conf.sample portsnap.conf
+  	# rm -r /usr/local/portsnap/*
+
+  In addition, be aware that the next runs of "portsnap fetch" and
+  "portsnap update" will take far longer than usual, since they
+  will need to download and extract a complete copy of the ports
+  tree.
+
 20050319:
   AFFECTS: users of databases/postgresql7[34]-server
   AUTHOR: girgen at FreeBSD.org
Index: ports/sysutils/portsnap/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/portsnap/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- ports/sysutils/portsnap/Makefile	9 Dec 2004 02:45:44 -0000	1.5
+++ ports/sysutils/portsnap/Makefile	20 Mar 2005 05:27:14 -0000
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	portsnap
-PORTVERSION=	0.3.1
+PORTVERSION=	0.9
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.daemonology.net/portsnap/
 
 MAINTAINER=	cperciva at daemonology.net
 COMMENT=	Provides secure snapshots of the ports directory
 
-RUN_DEPENDS=	bspatch:${PORTSDIR}/misc/bsdiff		\
-		freebsd-update-verify:${PORTSDIR}/security/freebsd-update
+RUN_DEPENDS=	bspatch:${PORTSDIR}/misc/bsdiff
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 491101 || ( ${OSVERSION} > 499999 && ${OSVERSION} < 502114 )
-RUN_DEPENDS+=	sha1:${PORTSDIR}/sysutils/freebsd-sha1
+.if ${OSVERSION} < 600021
+RUN_DEPENDS+=	sha256:${PORTSDIR}/sysutils/freebsd-sha256
 .endif
 
 MAN5=		portsnap.conf.5
 MAN8=		portsnap.8
 PLIST_FILES=	etc/portsnap.conf.sample sbin/portsnap		\
-		portsnap/.package.this.directory
+		libexec/make_index portsnap/.package.this.directory
 PLIST_DIRS=	portsnap
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -39,6 +38,7 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portsnap ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/make_index ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/portsnap.conf.5 ${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/portsnap.8 ${PREFIX}/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/portsnap.conf		\
Index: ports/sysutils/portsnap/distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/portsnap/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- ports/sysutils/portsnap/distinfo	9 Dec 2004 02:45:44 -0000	1.3
+++ ports/sysutils/portsnap/distinfo	20 Mar 2005 05:27:14 -0000
@@ -1,2 +1,2 @@
-MD5 (portsnap-0.3.1.tar.gz) = e5fe823c977d016e4891d882b0ddf0f0
-SIZE (portsnap-0.3.1.tar.gz) = 7626
+MD5 (portsnap-0.9.tar.gz) = dd7471355f4cb7027412f67e6575f5ca
+SIZE (portsnap-0.9.tar.gz) = 12214
Index: ports/sysutils/portsnap/pkg-message
===================================================================
RCS file: /home/pcvs/ports/sysutils/portsnap/pkg-message,v
retrieving revision 1.2
diff -u -p -r1.2 pkg-message
--- ports/sysutils/portsnap/pkg-message	6 Nov 2004 19:49:36 -0000	1.2
+++ ports/sysutils/portsnap/pkg-message	20 Mar 2005 05:27:14 -0000
@@ -1,7 +1,7 @@
 
 Before you can use portsnap, you will have to create an update configuration
-file specifying the server from which to fetch snapshots and the sha1 hash
-of the RSA public key which is trusted to sign the snapshots.
+file specifying the server from which to fetch snapshots and the sha256 hash
+of the openssl public key which is trusted to sign the snapshots.
 
 A sample configuration file has been installed in
 
@@ -13,3 +13,8 @@ use these updates, copy that file to
 	%%PREFIX%%/etc/portsnap.conf
 
 otherwise, create that file as appropriate.
+
+NOTE TO USERS UPGRADING FROM PORTSNAP 0.3.1 OR EARLIER:  The structure
+of the portsnap configuration file has changed; you will have to replace
+your existing portsnap.conf with a new version.
+ 
--- portsnap.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list