Changeset 79601

Timestamp:

06/19/11 14:28:55 (4 years ago)

Author:

jmr@…

Message:

merge r79599, r79600 from trunk:

make sync and selfupdate via signed tarballs the default
mention signed sync/selfupdate in ChangeLog

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/ChangeLog (modified) (1 diff)
• base/doc/macports.conf.in (modified) (1 diff)
• base/doc/sources.conf (modified) (1 diff)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/macports1.0/macports.tcl (modified) (1 diff)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/ChangeLog

@@ -21 +21 @@
 
     - Downloaded archives are now checked for integrity using digital
-      signatures. New pubkeys.conf file allows configuring keys to trust.
-      (jmr in r68996)
+      signatures. Sync and selfupdate can also use a signed tarball. New
+      pubkeys.conf file allows configuring keys to trust.
+      (jmr in r68996, r79093)
 
     - Added 'actinact' pseudo-portname that expands to installed ports with an

branches/release_2_0/base/doc/macports.conf.in

@@ -86 +86 @@
 
 # Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
-#rsync_dir                      release/base/
+# If this points to a .tar file, a signed .rmd160 must exist next to it
+# on the server and will be used to verify its integrity.
+#rsync_dir                      release/tarballs/base.tar
 
 # Rsync options

branches/release_2_0/base/doc/sources.conf

@@ -25 +25 @@
 #      rsync://trd.no.rsync.macports.org/release/ports/
 #  A current list of mirrors is available at https://trac.macports.org/wiki/Mirrors
-rsync://rsync.macports.org/release/ports/ [default]
+
+# If an rsync URL points to a .tar file, a signed .rmd160 must exist next to
+# it on the server and will be used to verify its integrity.
+
+rsync://rsync.macports.org/release/tarballs/ports.tar [default]

branches/release_2_0/base/src/macports1.0/macports.tcl

@@ -717 +717 @@
     }
     if {![info exists rsync_dir]} {
-        set macports::rsync_dir release/base/
+        set macports::rsync_dir release/tarballs/base.tar
         global macports::rsync_dir
     }