From 2cc8865cd55fc3d8897c81458dbc2af91abaa041 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 7 Dec 2006 23:31:48 +0000
Subject: Due to a misunderstanding of mine, preventing to upload restricted
 binary packages has not worked in the last few months. Now I fixed the rsync
 command line to use --files-from instead of --include-from, which does the
 right thing.

Tested in a directory of about 20 binary packages, including one that is
restricted. Everything worked as expected.

Fixes PR 35199.
---
 mk/bulk/upload | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'mk/bulk')

diff --git a/mk/bulk/upload b/mk/bulk/upload
index 9b588b5527a..5018ed977ae 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.34 2006/08/10 17:58:10 rillig Exp $
+# $NetBSD: upload,v 1.35 2006/12/07 23:31:48 rillig Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -187,6 +187,7 @@ vulnerable_packages="$TMP/vulnerable_packages"
 restricted_packages="$TMP/restricted_packages"
 old_packages="$TMP/old_packages"
 good_packages="$TMP/regular_packages"
+all_good_packages="$TMP/all_regular_packages"
 
 upload_general="$TMP"/upload_general
 upload_vulnerable="$TMP"/upload_vulnerable
@@ -235,6 +236,12 @@ cd $packages
 echo "upload> Checking for restricted and vulnerable packages"
 (cd All && env PKG_INFO="${pkg_info}" OUTDIR="${TMP}" PKGVULNDIR="${distdir}" sh "${pkgsrcdir}/mk/bulk/sort-packages")
 
+# Add the name of the package file, including all its symlinks to the
+# list of files to be uploaded.
+while read package; do
+	ls -1 */"$package"
+done < "$good_packages" > "$all_good_packages"
+
 if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then
 
 	echo "upload> Calculating checksum files..."
@@ -295,7 +302,7 @@ cat <<EOF > "$upload_general"
 #! /bin/sh
 set -e
 cd "$packages"
-rsync $RSFLAGS --include-from="${good_packages}" --exclude-from="${old_packages}" . "$RSYNC_DST/"
+rsync $RSFLAGS --files-from="${all_good_packages}" --exclude-from="${old_packages}" . "$RSYNC_DST/"
 EOF
 chmod +x "$upload_general"
 
-- 
cgit v1.2.3