From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 104706 invoked by alias); 25 May 2019 12:14:14 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 104664 invoked by uid 9795); 25 May 2019 12:14:13 -0000 Date: Sat, 25 May 2019 12:14:00 -0000 Message-ID: <20190525121413.104652.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-11-g7d05e0f X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 911eeccf54754e433fd1c4e4cc45d203bd31d50a X-Git-Newrev: 7d05e0f72b9bdb6e6706d801e30e3f9b4d2b90cb X-SW-Source: 2019-q2/txt/msg00004.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=7d05e0f72b9bdb6e6706d801e30e3f9b4d2b90cb commit 7d05e0f72b9bdb6e6706d801e30e3f9b4d2b90cb Author: Jon Turney Date: Sat May 25 13:08:04 2019 +0100 Add navigation frame to package summary page Add navigation frame to package summary page Set execute permission required for SSI Diff: --- calm/pkg2html.py | 3 +++ test/testdata/htdocs.expected/summary/arc.html | 2 ++ .../htdocs.expected/summary/base-cygwin.html | 2 ++ test/testdata/htdocs.expected/summary/corrupt.html | 2 ++ .../htdocs.expected/summary/cygwin-debuginfo.html | 2 ++ .../htdocs.expected/summary/cygwin-devel.html | 2 ++ test/testdata/htdocs.expected/summary/cygwin.html | 2 ++ .../testdata/htdocs.expected/summary/keychain.html | 2 ++ .../htdocs.expected/summary/libdns_sd-devel.html | 2 ++ .../htdocs.expected/summary/libdns_sd1.html | 2 ++ .../htdocs.expected/summary/mDNSResponder.html | 2 ++ test/testdata/htdocs.expected/summary/obs-a.html | 2 ++ test/testdata/htdocs.expected/summary/obs-b.html | 2 ++ test/testdata/htdocs.expected/summary/openssh.html | 2 ++ .../summary/per-version-replacement-hint-only.html | 2 ++ .../htdocs.expected/summary/per-version.html | 2 ++ .../htdocs.expected/summary/perl-Net-SMTP-SSL.html | 2 ++ test/testdata/htdocs.expected/summary/rpm-doc.html | 2 ++ .../htdocs.expected/summary/staleversion.html | 2 ++ test/testdata/htdocs.expected/summary/test-c.html | 2 ++ test/testdata/htdocs.expected/summary/test-d.html | 2 ++ test/testdata/htdocs.expected/summary/test-e.html | 2 ++ .../htdocs.expected/summary/testpackage.html | 2 ++ 23 files changed, 47 insertions(+), 0 deletions(-) diff --git a/calm/pkg2html.py b/calm/pkg2html.py index be64c6c..32a519f 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -143,6 +143,7 @@ def update_package_listings(args, packages): logging.debug('writing %s' % summary) if not args.dryrun: with open(summary, 'w') as f: + os.fchmod(f.fileno(), 0o755) arch_packages = None for arch in common_constants.ARCHES: @@ -165,7 +166,9 @@ def update_package_listings(args, packages): %s +
+

Package: %s

''' % (title, p)), file=f) print('sdesc: %s

' % sdesc(arch_packages, p, bv), file=f) diff --git a/test/testdata/htdocs.expected/summary/arc.html b/test/testdata/htdocs.expected/summary/arc.html index 6f13aef..6fa25b5 100644 --- a/test/testdata/htdocs.expected/summary/arc.html +++ b/test/testdata/htdocs.expected/summary/arc.html @@ -6,7 +6,9 @@ Cygwin Package Summary for arc +
+

Package: arc

sdesc: The ARC archive utility

ldesc: This program is based on the MSDOS ARC program, version 5.21, plus a diff --git a/test/testdata/htdocs.expected/summary/base-cygwin.html b/test/testdata/htdocs.expected/summary/base-cygwin.html index fc6b266..2262e23 100644 --- a/test/testdata/htdocs.expected/summary/base-cygwin.html +++ b/test/testdata/htdocs.expected/summary/base-cygwin.html @@ -6,7 +6,9 @@ Cygwin Package Summary for base-cygwin +
+

Package: base-cygwin

sdesc: Initial base installation helper script

ldesc: Initial base installation helper script.

diff --git a/test/testdata/htdocs.expected/summary/corrupt.html b/test/testdata/htdocs.expected/summary/corrupt.html index 80316d5..bfa7add 100644 --- a/test/testdata/htdocs.expected/summary/corrupt.html +++ b/test/testdata/htdocs.expected/summary/corrupt.html @@ -6,7 +6,9 @@ Cygwin Package Summary for corrupt +
+

Package: corrupt

sdesc: A corrupt package

ldesc: A package containing corrupt archives

diff --git a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html index f311971..1a365f1 100644 --- a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html +++ b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html @@ -6,7 +6,9 @@ Cygwin Package Summary for cygwin-debuginfo +
+

Package: cygwin-debuginfo

sdesc: Debug info for cygwin

ldesc: This package contains files necessary for debugging the diff --git a/test/testdata/htdocs.expected/summary/cygwin-devel.html b/test/testdata/htdocs.expected/summary/cygwin-devel.html index 1576218..f28aecb 100644 --- a/test/testdata/htdocs.expected/summary/cygwin-devel.html +++ b/test/testdata/htdocs.expected/summary/cygwin-devel.html @@ -6,7 +6,9 @@ Cygwin Package Summary for cygwin-devel +
+

Package: cygwin-devel

sdesc: Core development files

ldesc: Core development files required to build Cygwin packages

diff --git a/test/testdata/htdocs.expected/summary/cygwin.html b/test/testdata/htdocs.expected/summary/cygwin.html index 187b9da..735d9d5 100644 --- a/test/testdata/htdocs.expected/summary/cygwin.html +++ b/test/testdata/htdocs.expected/summary/cygwin.html @@ -6,7 +6,9 @@ Cygwin Package Summary for cygwin +
+

Package: cygwin

sdesc: The UNIX emulation engine

ldesc: The UNIX emulation engine

diff --git a/test/testdata/htdocs.expected/summary/keychain.html b/test/testdata/htdocs.expected/summary/keychain.html index c4e8ce7..4a6fd02 100644 --- a/test/testdata/htdocs.expected/summary/keychain.html +++ b/test/testdata/htdocs.expected/summary/keychain.html @@ -6,7 +6,9 @@ Cygwin Package Summary for keychain +
+

Package: keychain

sdesc: Key manager for OpenSSH

ldesc: Keychain is an OpenSSH key manager, typically run from diff --git a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html index 0678e5c..7cea685 100644 --- a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html +++ b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html @@ -6,7 +6,9 @@ Cygwin Package Summary for libdns_sd-devel +
+

Package: libdns_sd-devel

sdesc: Bonjour Zeroconf implementation

ldesc: Bonjour, also known as zero-configuration networking, enables diff --git a/test/testdata/htdocs.expected/summary/libdns_sd1.html b/test/testdata/htdocs.expected/summary/libdns_sd1.html index cfe6a56..492fb70 100644 --- a/test/testdata/htdocs.expected/summary/libdns_sd1.html +++ b/test/testdata/htdocs.expected/summary/libdns_sd1.html @@ -6,7 +6,9 @@ Cygwin Package Summary for libdns_sd1 +
+

Package: libdns_sd1

sdesc: Bonjour Zeroconf implementation

ldesc: Bonjour, also known as zero-configuration networking, enables diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder.html b/test/testdata/htdocs.expected/summary/mDNSResponder.html index 746101e..8f454b4 100644 --- a/test/testdata/htdocs.expected/summary/mDNSResponder.html +++ b/test/testdata/htdocs.expected/summary/mDNSResponder.html @@ -6,7 +6,9 @@ Cygwin Package Summary for mDNSResponder +
+

Package: mDNSResponder

sdesc: Bonjour Zeroconf implementation

ldesc: Bonjour, also known as zero-configuration networking, enables diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html index e2591e6..0d39aa6 100644 --- a/test/testdata/htdocs.expected/summary/obs-a.html +++ b/test/testdata/htdocs.expected/summary/obs-a.html @@ -6,7 +6,9 @@ Cygwin Package Summary for obs-a +
+

Package: obs-a

sdesc: obsolete package A

ldesc: obs-a

diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html index 8de2270..649a59d 100644 --- a/test/testdata/htdocs.expected/summary/obs-b.html +++ b/test/testdata/htdocs.expected/summary/obs-b.html @@ -6,7 +6,9 @@ Cygwin Package Summary for obs-b +
+

Package: obs-b

sdesc: obsolete package B

ldesc: obs-b

diff --git a/test/testdata/htdocs.expected/summary/openssh.html b/test/testdata/htdocs.expected/summary/openssh.html index 334d96c..73c64a1 100644 --- a/test/testdata/htdocs.expected/summary/openssh.html +++ b/test/testdata/htdocs.expected/summary/openssh.html @@ -6,7 +6,9 @@ Cygwin Package Summary for openssh +
+

Package: openssh

sdesc: The OpenSSH server and client programs

ldesc: OpenSSH is a program for logging into a remote machine and for diff --git a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html index 3bfc642..b0025b5 100644 --- a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html +++ b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html @@ -6,7 +6,9 @@ Cygwin Package Summary for per-version-replacement-hint-only +
+

Package: per-version-replacement-hint-only

sdesc: Per-version hint test package

ldesc: Per-version hint test package

diff --git a/test/testdata/htdocs.expected/summary/per-version.html b/test/testdata/htdocs.expected/summary/per-version.html index f179c85..155b5d1 100644 --- a/test/testdata/htdocs.expected/summary/per-version.html +++ b/test/testdata/htdocs.expected/summary/per-version.html @@ -6,7 +6,9 @@ Cygwin Package Summary for per-version +
+

Package: per-version

sdesc: Per-version hint test package

ldesc: Per-version hint test package

diff --git a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html index 03580b7..b9350d7 100644 --- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html +++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html @@ -6,7 +6,9 @@ Cygwin Package Summary for perl-Net-SMTP-SSL +
+

Package: perl-Net-SMTP-SSL

sdesc: Perl distribution Net-SMTP-SSL

ldesc: Implements the same API as Net::SMTP, but uses IO::Socket::SSL for diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html b/test/testdata/htdocs.expected/summary/rpm-doc.html index 190c8f3..acd408a 100644 --- a/test/testdata/htdocs.expected/summary/rpm-doc.html +++ b/test/testdata/htdocs.expected/summary/rpm-doc.html @@ -6,7 +6,9 @@ Cygwin Package Summary for rpm-doc +
+

Package: rpm-doc

sdesc: Obsolete package for RPM package management system manual pages (extra text to so repr is not one line)

ldesc: rpm-doc

diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html index 031ab45..2d08ca4 100644 --- a/test/testdata/htdocs.expected/summary/staleversion.html +++ b/test/testdata/htdocs.expected/summary/staleversion.html @@ -6,7 +6,9 @@ Cygwin Package Summary for staleversion +
+

Package: staleversion

sdesc: Test package for stale version removal

ldesc: Test package for stale version removal

diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html index cf3757c..7eb0d93 100644 --- a/test/testdata/htdocs.expected/summary/test-c.html +++ b/test/testdata/htdocs.expected/summary/test-c.html @@ -6,7 +6,9 @@ Cygwin Package Summary for test-c +
+

Package: test-c

sdesc: test package C

ldesc: test-c

diff --git a/test/testdata/htdocs.expected/summary/test-d.html b/test/testdata/htdocs.expected/summary/test-d.html index dd13f6e..c9e7bba 100644 --- a/test/testdata/htdocs.expected/summary/test-d.html +++ b/test/testdata/htdocs.expected/summary/test-d.html @@ -6,7 +6,9 @@ Cygwin Package Summary for test-d +
+

Package: test-d

sdesc: test package D

ldesc: test-d

diff --git a/test/testdata/htdocs.expected/summary/test-e.html b/test/testdata/htdocs.expected/summary/test-e.html index ec57c10..9fa5cf1 100644 --- a/test/testdata/htdocs.expected/summary/test-e.html +++ b/test/testdata/htdocs.expected/summary/test-e.html @@ -6,7 +6,9 @@ Cygwin Package Summary for test-e +
+

Package: test-e

sdesc: test package E

ldesc: test-e

diff --git a/test/testdata/htdocs.expected/summary/testpackage.html b/test/testdata/htdocs.expected/summary/testpackage.html index 6410b6e..dd1a902 100644 --- a/test/testdata/htdocs.expected/summary/testpackage.html +++ b/test/testdata/htdocs.expected/summary/testpackage.html @@ -6,7 +6,9 @@ Cygwin Package Summary for testpackage +
+

Package: testpackage

sdesc: A test package (stuff & other stuff)

ldesc: A test package (stuff & other stuff)