/pub/NetBSD/packages/ on ftp.NetBSD.org is deprecated and not writable

5 files changed, 25 insertions, 29 deletions

diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 7a0d628710b..79d0b71b27f 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.61 2009/08/02 02:41:53 joerg Exp $ -->
+<!-- $NetBSD: build.xml,v 1.62 2011/07/31 08:48:22 spz Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -339,10 +339,10 @@ ${MASTER_SITE_XEMACS}
       <para>Some explanations for the less self-explaining ones:
       <varname>MASTER_SITE_BACKUP</varname> contains backup sites
       for packages that are maintained in <ulink
-      url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}"
+      url="ftp://ftp.NetBSD.org/pkgsrc/distfiles/${DIST_SUBDIR}"
       />.  <varname>MASTER_SITE_LOCAL</varname> contains local
       package source distributions that are maintained in <ulink
-      url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/"
+      url="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/"
       />.</para>
 
       <para>If you choose one of these predefined sites, you may
diff --git a/doc/guide/files/bulk.xml b/doc/guide/files/bulk.xml
index 0be15cfe639..a51386e3878 100644
--- a/doc/guide/files/bulk.xml
+++ b/doc/guide/files/bulk.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: bulk.xml,v 1.8 2010/03/18 10:56:18 wiz Exp $ -->
+<!-- $NetBSD: bulk.xml,v 1.9 2011/07/31 08:48:22 spz Exp $ -->
 
 <chapter id="bulk">
 <title>Creating binary packages for everything in pkgsrc (bulk
@@ -528,26 +528,21 @@ fi
       set properly in your <filename>mk/bulk/build.conf</filename>
       file, i.e. adjust it to something like one of the following:</para>
 
-      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload </screen>
+      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</screen>
 
-      <para>Please use appropriate values for "packages-20xxQy",
-      "NetBSD-a.b.c" and "arch" here. If your login on ftp.NetBSD.org
+      <para>Please use appropriate values for "20xxQy" (the branch),
+      "a.b.c" (the OS version) and "arch" here. If your login on ftp.NetBSD.org
       is different from your local login, write your login directly
       into the variable, e.g. my local account is "feyrer", but for my
       login "hubertf", I use:</para>
 
-      <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</screen>
+      <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</screen>
 
       <para>A separate <filename>upload</filename> directory is used
       here to allow "closing" the directory during upload. To do
       so, run the following command on ftp.NetBSD.org next:</para>
 
-      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</userinput></screen>
-
-      <para>Please note that <filename>/pub/NetBSD/packages</filename> is
-      only appropriate for packages for the NetBSD operating
-      system. Binary packages for other operating systems should go
-      into <filename>/pub/pkgsrc</filename>.</para>
+      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy/upload</userinput></screen>
 
       <para>Before uploading the binary pkgs, ssh authentication needs
       to be set up. This example shows how to set up temporary keys
@@ -557,13 +552,13 @@ fi
       <screen>
 &rprompt; <userinput>chroot /usr/sandbox</userinput>
 chroot-&rprompt; <userinput>rm $HOME/.ssh/id-dsa*</userinput>
-chroot-&rprompt; <userinput>ssh-keygen -t dsa</userinput>
-chroot-&rprompt; <userinput>cat $HOME/.ssh/id-dsa.pub</userinput>
+chroot-&rprompt; <userinput>ssh-keygen -t rsa</userinput>
+chroot-&rprompt; <userinput>cat $HOME/.ssh/id-rsa.pub</userinput>
       </screen>
 
-      <para>Now take the output of <filename>id-dsa.pub</filename> and
+      <para>Now take the output of <filename>id-rsa.pub</filename> and
       append it to your <filename>~/.ssh/authorized_keys</filename>
-      file on ftp.NetBSD.org. You can remove the key after the
+      file on ftp.NetBSD.org. You should remove the key after the
       upload is done!</para>
 
       <para>Next, test if your ssh connection really works:</para>
@@ -597,10 +592,11 @@ chroot-&rprompt; <userinput>exit</userinput>
       to everyone:</para>
 
       <screen>
-nbftp% <userinput>cd /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch</userinput>
+nbftp% <userinput>cd /pub/pkgsrc/packages/NetBSD/arch/a.b.c-20xxQy</userinput>
 nbftp% <userinput>mv upload/* .</userinput>
 nbftp% <userinput>rmdir upload</userinput>
-nbftp% <userinput>chmod 755 .</userinput>
+nbftp% <userinput>chgrp -R netbsd .</userinput>
+nbftp% <userinput>find . -type d | xargs chmod 775</userinput>
       </screen>
 
 <!-- end old -->
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index 20538e1f022..672a55b5fea 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.38 2011/04/09 08:03:49 wiz Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.39 2011/07/31 08:48:22 spz Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
@@ -68,7 +68,7 @@ works.</para>
 	    <filename>${MASTER_SITES}</filename> or
 	    <filename>${PATCH_SITES}</filename> respectively.
 	    The defaults are
-	    <filename>ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/</filename>
+	    <filename>ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/${DIST_SUBDIR}/</filename>
 	    and
 	    <filename>ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/</filename>.</para>
 	</listitem>
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index 5901222beea..691a0fcb44a 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.47 2010/12/23 23:54:17 abs Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.48 2011/07/31 08:48:22 spz Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -369,7 +369,7 @@ transfers.</para>
 <para>You would like to download all the distfiles in a single batch
 from work or university, where you can't run a <command>make
 fetch</command>.  There is an archive of distfiles on <ulink
-url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/">ftp.NetBSD.org</ulink>,
+url="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/">ftp.NetBSD.org</ulink>,
 but downloading the entire directory may not be appropriate.</para>
 
 <para>The answer here is to do a <command>make fetch-list</command> in
@@ -517,11 +517,11 @@ do this, refer to the following two tools (installed as part of the
   <listitem>
     <para><command>pkg_admin fetch-pkg-vulnerabilities</command>, an easy way to
     download a list of the security vulnerabilities information.  This list
-    is kept up to date by the NetBSD security officer and the NetBSD
-    packages team, and is distributed from the NetBSD ftp server:</para>
+    is kept up to date by the pkgsrc security team, and is distributed
+    from the NetBSD ftp server:</para>
 
     <para><ulink
-    url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/pkg-vulnerabilities"/></para>
+    url="ftp://ftp.NetBSD.org/pkgsrc/distfiles/pkg-vulnerabilities"/></para>
   </listitem>
 
   <listitem>
diff --git a/doc/guide/files/introduction.xml b/doc/guide/files/introduction.xml
index 750672a697b..018ae4cbb85 100644
--- a/doc/guide/files/introduction.xml
+++ b/doc/guide/files/introduction.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: introduction.xml,v 1.24 2011/04/09 19:09:45 wiz Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.25 2011/07/31 08:48:22 spz Exp $ -->
 
 <chapter id="introduction">
   <title>What is pkgsrc?</title>
@@ -291,7 +291,7 @@ minutes!</para>
 	    recompile. Packages are usually generated in
 	    <filename>/usr/pkgsrc/packages</filename>; there is also
 	    an archive on <ulink
-	    url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/">ftp.NetBSD.org</ulink>.</para>
+	    url="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/">ftp.NetBSD.org</ulink>.</para>
 
 	  <para>Sometimes, this is referred to by the term <quote>package</quote> too,
 	    especially in the context of precompiled packages.</para>