===================================================================
RCS file: /cvs/openbsd/update_openbsd/upload_release,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- openbsd/update_openbsd/upload_release	2010/04/21 23:15:41	1.6
+++ openbsd/update_openbsd/upload_release	2015/10/12 00:35:14	1.11
@@ -3,7 +3,7 @@
 RSYNC=`which rsync`
 
 if [ $? != 0 ]; then
-        sudo pkg_add -i rsync
+        doas pkg_add -i rsync
         RSYNC=`which rsync`
         if [ $? != 0 ]; then
                 echo RSYNC not installed!
@@ -11,12 +11,22 @@
         fi
 fi
 
-RELEASEDIR=/usr/release
+. /etc/release.conf
+RELEASEDIR=$RELEASE
 
-ls $RELEASEDIR | grep -v ^site > $RELEASEDIR/index.txt
+ls $RELEASEDIR | grep -v '^site' > $RELEASEDIR/index.txt
 rsync -avP $RELEASEDIR/ \
-	us.holligan.net:/var/www/ftp/pub/OpenBSD/`uname -r`/`machine`/
+	--files-from ${RELEASEDIR}/index.txt \
+	us.holligan.net:/var/www/ftp/pub/OpenBSD-stable/`uname -r`/`machine`/
 
+rsync -avP /usr/ports/packages/`machine`/ftp/ \
+	us.holligan.net:/var/www/ftp/pub/OpenBSD-stable/`uname -r`/packages/`machine`/
+
 ls $RELEASEDIR > $RELEASEDIR/index.txt
 rsync -avP $RELEASEDIR/ \
-	rrlhcmp30100:/home/ftp/pub/OpenBSD/`uname -r`/`machine`/
+	--files-from ${RELEASEDIR}/index.txt \
+	rrlhcsta0100:/var/www/ftp/pub/OpenBSD/`uname -r`/`machine`/
+
+rsync -avP /usr/ports/packages/`machine`/all/ \
+	rrlhcsta0100:/var/www/ftp/pub/OpenBSD/`uname -r`/packages/`machine`/
+