GraphicsMagick: Add support for PGP-signed snapshots.
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.38258.1639513663.1346.graphicsmagick-commit@lists.sourceforge.net> |
changeset 1ca97eae5e46 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=1ca97eae5e46 summary: Add support for PGP-signed snapshots. diffstat: ChangeLog | 2 + Makefile.am | 25 ++++++++++++++-- Makefile.in | 43 ++++++++++++++++++++--------- scripts/graphicsmagick_snapshot_copy-local | 12 ++++---- scripts/graphicsmagick_snapshot_copy-ssh | 12 ++++---- 5 files changed, 65 insertions(+), 29 deletions(-) diffs (197 lines): diff -r 9d2a9a161cb2 -r 1ca97eae5e46 ChangeLog --- a/ChangeLog Tue Dec 14 12:18:43 2021 -0600 +++ b/ChangeLog Tue Dec 14 14:27:30 2021 -0600 @@ -1,5 +1,7 @@ 2021-12-14 Bob Friesenhahn <[email protected]> + * Makefile.am (snapshot): Add support for PGP-signed snapshots. + * www/download.rst: Add documentation for how to validate downloaded files. diff -r 9d2a9a161cb2 -r 1ca97eae5e46 Makefile.am --- a/Makefile.am Tue Dec 14 12:18:43 2021 -0600 +++ b/Makefile.am Tue Dec 14 14:27:30 2021 -0600 @@ -386,8 +386,17 @@ # somewhere using some mechanism only known to itself. # # The arguments to the script are the original path names of the files to distribute. +SNAPSHOT_DIST_ARCHIVES=$(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) snapshot: distcheck - $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html + $(MAKE) $(DIST_ARCHIVE_SRPM) + $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) + for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ + rm -f $${file}.sig ; \ + gpg2 --output $${file}.sig --detach-sig $${file} ; \ + done + $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \ + `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.sig " $$f ; done` \ + $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html else @@ -396,9 +405,15 @@ snapshot: distcheck $(MAKE) $(DIST_ARCHIVE_SRPM) $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) + for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ + gpg2 --output $${file}.sig --detach-sig $${file} ; \ + done $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*.tar.* - $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z - mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(SNAPSHOT_DIRECTORY)/ + $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z* + mv $(SNAPSHOT_DIST_ARCHIVES) $(SNAPSHOT_DIRECTORY)/ + for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ + mv $${file}.sig $(SNAPSHOT_DIRECTORY)/ ; \ + done cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt cp $(top_srcdir)/www/Changelog.html $(SNAPSHOT_DIRECTORY)/ChangeLog.html @@ -445,6 +460,8 @@ # Convenient target to build release archive files and sign them. release: distcheck - for file in $(DIST_ARCHIVES) ; do \ + $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) + for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \ + rm -f $${file}.sig ; \ gpg2 --output $${file}.sig --detach-sig $${file} ; \ done diff -r 9d2a9a161cb2 -r 1ca97eae5e46 Makefile.in --- a/Makefile.in Tue Dec 14 12:18:43 2021 -0600 +++ b/Makefile.in Tue Dec 14 14:27:30 2021 -0600 @@ -4856,6 +4856,16 @@ $(distdir).tar.xz $(distdir).tar.zst +# +# Build a validated snapshot release and move to the snapshots directory. +# + +# Use a graphicsmagick_snapshot_copy script to copy snapshot files +# somewhere using some mechanism only known to itself. +# +# The arguments to the script are the original path names of the files to distribute. +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@SNAPSHOT_DIST_ARCHIVES = $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) + # Use a hard-coded mechanism and destination path to copy snapshot files @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@SNAPSHOT_DIRECTORY = /ftp/pub/GraphicsMagick/snapshots COVERITY_EMAIL = [email protected] @@ -11297,23 +11307,28 @@ dist-zstd: distdir tardir=$(distdir) && $(am__tar) | ZSTD_CLEVEL=$${ZSTD_CLEVEL-22} zstd --ultra -c >$(distdir).tar.zst $(am__post_remove_distdir) - -# -# Build a validated snapshot release and move to the snapshots directory. -# - -# Use a graphicsmagick_snapshot_copy script to copy snapshot files -# somewhere using some mechanism only known to itself. -# -# The arguments to the script are the original path names of the files to distribute. @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@snapshot: distcheck -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_ARCHIVE_SRPM) +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ rm -f $${file}.sig ; \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ gpg2 --output $${file}.sig --detach-sig $${file} ; \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ done +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.sig " $$f ; done` \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@snapshot: distcheck @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_ARCHIVE_SRPM) @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ gpg2 --output $${file}.sig --detach-sig $${file} ; \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ done @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*.tar.* -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) $(SNAPSHOT_DIRECTORY)/ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z* +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $(SNAPSHOT_DIST_ARCHIVES) $(SNAPSHOT_DIRECTORY)/ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $${file}.sig $(SNAPSHOT_DIRECTORY)/ ; \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ done @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ cp $(top_srcdir)/www/Changelog.html $(SNAPSHOT_DIRECTORY)/ChangeLog.html # New URL is https://brb.synopsys.com/?project=GraphicsMagick @@ -11337,7 +11352,9 @@ # Convenient target to build release archive files and sign them. release: distcheck - for file in $(DIST_ARCHIVES) ; do \ + $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) + for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \ + rm -f $${file}.sig ; \ gpg2 --output $${file}.sig --detach-sig $${file} ; \ done diff -r 9d2a9a161cb2 -r 1ca97eae5e46 scripts/graphicsmagick_snapshot_copy-local --- a/scripts/graphicsmagick_snapshot_copy-local Tue Dec 14 12:18:43 2021 -0600 +++ b/scripts/graphicsmagick_snapshot_copy-local Tue Dec 14 14:27:30 2021 -0600 @@ -27,22 +27,22 @@ Changelog.html) destf="ChangeLog.html" ;; - *.rpm) + *.rpm*) continue ;; - *.tar.bz2) + *.tar.bz2*) continue ;; - *.tar.gz) + *.tar.gz*) continue ;; - *.tar.lz) + *.tar.lz*) continue ;; - *.tar.zst) + *.tar.zst*) continue ;; - *-windows.7z) + *-windows.7z*) continue ;; *) diff -r 9d2a9a161cb2 -r 1ca97eae5e46 scripts/graphicsmagick_snapshot_copy-ssh --- a/scripts/graphicsmagick_snapshot_copy-ssh Tue Dec 14 12:18:43 2021 -0600 +++ b/scripts/graphicsmagick_snapshot_copy-ssh Tue Dec 14 14:27:30 2021 -0600 @@ -29,22 +29,22 @@ Changelog.html) destf="ChangeLog.html" ;; - *.rpm) + *.rpm*) continue ;; - *.tar.bz2) + *.tar.bz2*) continue ;; - *.tar.gz) + *.tar.gz*) continue ;; - *.tar.lz) + *.tar.lz*) continue ;; - *.tar.zst) + *.tar.zst*) continue ;; - *-windows.7z) + *-windows.7z*) continue ;; *)