[Gpg4win-commits] r217 - in trunk: . packages

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-03-13 15:39:52 +0100 (Mon, 13 Mar 2006)
New Revision: 217

Modified:
   trunk/ChangeLog
   trunk/packages/Makefile.am
   trunk/packages/download.sh
   trunk/packages/packages.current
Log:
Changes location of packages file.
Added "upload" target for easier upload of that file.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-13 11:37:05 UTC (rev 216)
+++ trunk/ChangeLog	2006-03-13 14:39:52 UTC (rev 217)
@@ -1,3 +1,9 @@
+2006-03-13  Werner Koch  <wk at g10code.com>
+
+	* packages/Makefile.am (upload): New target for uploading the
+	packages file.
+	* packages/download.sh: Use http://www.gpg4win/org.
+
 2006-03-09  Werner Koch  <wk at g10code.com>
 
 	Released 0.8.0.

Modified: trunk/packages/Makefile.am
===================================================================
--- trunk/packages/Makefile.am	2006-03-13 11:37:05 UTC (rev 216)
+++ trunk/packages/Makefile.am	2006-03-13 14:39:52 UTC (rev 217)
@@ -19,3 +19,17 @@
 
 EXTRA_DIST = download.sh packages.keys
 
+
+upload: packages.current packages.current.sig
+	set -e; \
+	echo "Uploading package list to www.gpg4win.org ..."; \
+        user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
+	rsync -v -W packages.current{,.sig} \
+	  $${user}@wald.intevation.org:/gpg4win/htdocs/
+
+
+packages.current.sig : packages.current
+	@echo "packages.current.sig is expected to be a detached signature of packages.current"
+	@echo "Use \"gpg -sbu YOUR_KEYID packages.current\" to create it"
+	@false
+

Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh	2006-03-13 11:37:05 UTC (rev 216)
+++ trunk/packages/download.sh	2006-03-13 14:39:52 UTC (rev 217)
@@ -27,11 +27,11 @@
 # line will be appended to the current base URL (with a / as
 # delimiter).  Example:
 #
-#    # GnuPG stuff. 
+#    # GnuPG stuff.
 #    server ftp://ftp.gnupg.org/gcrypt
 #    
 #    file gnupg/gnupg-1.4.2.tar.gz
-#    file gnupg/gnupg-1.4.2.tar.gz.sig
+#    chk  1234567890123456789012345678901234567890
 #    
 
 force=no
@@ -47,7 +47,7 @@
 
 WGET=wget
 
-url="ftp://ftp.gpg4win.org/gpg4win/"
+url="http://www.gpg4win.org/"
 if [ "$keep_list" = "no" ]; then
   echo "downloading packages list from \`$url'."
   if ! ${WGET} -N -q $url/packages.current{,.sig} ; then

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2006-03-13 11:37:05 UTC (rev 216)
+++ trunk/packages/packages.current	2006-03-13 14:39:52 UTC (rev 217)
@@ -2,10 +2,12 @@
 #
 #
 # This list as well as its corresponding signature file are intended
-# to be downloaded by the download.sh script of gpg4win.  The download
-# script will then process the statements here to actually download
-# the packages.  The syntax is trivial:
+# to be downloaded by the download.sh script of gpg4win.  The
+# canonical URL of this file is http://www.gpg4win.org/packages.org .
 #
+# The download script will then process the statements here to
+# actually download the packages.  The syntax is trivial:
+#
 # If the first non whitespace character of a line is #, the line is
 # considered a comment.  If the first word of a line is "server", the
 # rest of the line will be taken as the base URL for following file
@@ -13,6 +15,9 @@
 # line will be appended to the current base URL (with a / as
 # delimiter).  The statement "chk" is followed by the SHA1 checksum of
 # the last file.
+#
+# Note: You may use "make upload" to copy this file to is canocnical place.
+#
 
 
 # GNU