[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210408-24-ga9db642

Jon TURNEY jturney@sourceware.org
Mon Jun 21 20:02:12 GMT 2021




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=a9db642904aa406f08dddb06798b576ec14949b8

commit a9db642904aa406f08dddb06798b576ec14949b8
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jun 15 13:57:09 2021 +0100

    Configure 'receive.advertisePushOptions = true' for all gitolite repos

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=058caed842733bb45f23b8f0dcd016626bc6e680

commit 058caed842733bb45f23b8f0dcd016626bc6e680
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue May 11 15:34:18 2021 +0100

    Disallow requires: and obsoletes: in src.hint files
    
    Disallow requires: and obsoletes: in src.hint files, as noted in bb467a09
    
    These are being ignored, and are only present in src.hint files created
    from .hint files for old packages.
    
    Update test data appropriately for dropped hints, and for the hint
    fixing backup files created during upload.


Diff:
---
 calm/hint.py                                                         | 4 ++--
 calm/mkgitoliteconf.py                                               | 1 +
 test/testdata/conflict/homedir.expected                              | 1 +
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.expected  | 1 -
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.expected  | 1 -
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.expected  | 1 -
 test/testdata/hints/noarch/release/test-c/test-c-1.0-1-src.expected  | 2 +-
 test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected   | 5 +----
 test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected   | 5 +----
 test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected | 1 -
 .../hints/x86/release/keychain/keychain-2.6.8-1-src.expected         | 3 +--
 .../hints/x86/release/keychain/keychain-2.7.1-1-src.expected         | 3 +--
 .../hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected       | 1 -
 .../x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected  | 1 -
 .../per-version-replacement-hint-only-1.0-1-src.expected             | 3 +--
 .../hints/x86/release/per-version/per-version-4.0-1-src.expected     | 3 +--
 .../hints/x86/release/per-version/per-version-4.8-1-src.expected     | 3 +--
 .../hints/x86/release/staleversion/staleversion-240-1-src.expected   | 3 +--
 .../hints/x86/release/staleversion/staleversion-242-0-src.expected   | 3 +--
 .../hints/x86/release/staleversion/staleversion-243-0-src.expected   | 3 +--
 .../hints/x86/release/staleversion/staleversion-250-0-src.expected   | 3 +--
 .../hints/x86/release/staleversion/staleversion-251-0-src.expected   | 1 -
 .../hints/x86/release/staleversion/staleversion-260-0-src.expected   | 1 -
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.hint      | 1 -
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.hint      | 1 -
 .../release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.hint      | 1 -
 test/testdata/relarea/noarch/release/test-c/test-c-1.0-1-src.hint    | 1 -
 test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint     | 1 -
 test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint     | 1 -
 test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint   | 1 -
 test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint | 1 -
 test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint | 1 -
 .../relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint         | 1 -
 .../x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint      | 1 -
 .../per-version-replacement-hint-only-1.0-1-src.hint                 | 1 -
 .../relarea/x86/release/per-version/per-version-4.0-1-src.hint       | 1 -
 .../relarea/x86/release/per-version/per-version-4.8-1-src.hint       | 1 -
 .../relarea/x86/release/staleversion/staleversion-240-1-src.hint     | 1 -
 .../relarea/x86/release/staleversion/staleversion-242-0-src.hint     | 1 -
 .../relarea/x86/release/staleversion/staleversion-243-0-src.hint     | 1 -
 .../relarea/x86/release/staleversion/staleversion-250-0-src.hint     | 1 -
 .../relarea/x86/release/staleversion/staleversion-251-0-src.hint     | 1 -
 .../relarea/x86/release/staleversion/staleversion-260-0-src.hint     | 1 -
 test/testdata/uploads/pkglist.expected                               | 4 +---
 44 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/calm/hint.py b/calm/hint.py
index 9deb2f0..dc5efe8 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -45,8 +45,6 @@ commonkeys = {
     'ldesc': 'multilineval',
     'category': 'val',
     'sdesc': 'val',
-    'requires': 'optval',
-    'obsoletes': 'optval',
     'test': 'noval',   # mark the package as a test version
     'version': 'val',  # version override
     'disable-check': 'val',
@@ -57,6 +55,8 @@ hintkeys[pvr] = commonkeys.copy()
 hintkeys[pvr].update({
     'message': 'multilineval',
     'external-source': 'val',
+    'requires': 'optval',
+    'obsoletes': 'optval',
     'depends': 'optval',
     'provides': 'val',
     'conflicts': 'val',
diff --git a/calm/mkgitoliteconf.py b/calm/mkgitoliteconf.py
index 38c042d..1655134 100755
--- a/calm/mkgitoliteconf.py
+++ b/calm/mkgitoliteconf.py
@@ -80,6 +80,7 @@ def do_main(args):
     print('    R  = gitweb daemon')
     print('    config core.sharedrepository = all')
     print('    config uploadpack.allowReachableSHA1InWant = true')
+    print('    config receive.advertisePushOptions = true')
     print('    - VREF/MAX_NEWBIN_SIZE/1024 = @all')
     print('# this rejects binary files over the size limit, text files of any size are still permiited')
     print('    - VREF/HIGHLANDER/cygport = @all')
diff --git a/test/testdata/conflict/homedir.expected b/test/testdata/conflict/homedir.expected
index a1264c1..0cb25e1 100644
--- a/test/testdata/conflict/homedir.expected
+++ b/test/testdata/conflict/homedir.expected
@@ -3,6 +3,7 @@
  'Blooey McFooey/x86': [],
  'Blooey McFooey/x86/release': [],
  'Blooey McFooey/x86/release/staleversion': ['staleversion-230-1-src.hint',
+                                             'staleversion-230-1-src.hint.bak',
                                              'staleversion-230-1-src.tar.xz',
                                              'staleversion-230-1.hint',
                                              'staleversion-230-1.tar.xz']}
diff --git a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.expected b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.expected
index 9516e05..f8450a3 100644
--- a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.expected
+++ b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.expected
@@ -1,5 +1,4 @@
 {'category': 'Perl',
- 'requires': '',
  'sdesc': '"Perl distribution Net-SMTP-SSL"',
  'ldesc': '"Implements the same API as Net::SMTP, but uses IO::Socket::SSL for\n'
           'its network operations in order to support encrypted connections."'}
diff --git a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.expected b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.expected
index 9516e05..f8450a3 100644
--- a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.expected
+++ b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.expected
@@ -1,5 +1,4 @@
 {'category': 'Perl',
- 'requires': '',
  'sdesc': '"Perl distribution Net-SMTP-SSL"',
  'ldesc': '"Implements the same API as Net::SMTP, but uses IO::Socket::SSL for\n'
           'its network operations in order to support encrypted connections."'}
diff --git a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.expected b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.expected
index 9516e05..f8450a3 100644
--- a/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.expected
+++ b/test/testdata/hints/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.expected
@@ -1,5 +1,4 @@
 {'category': 'Perl',
- 'requires': '',
  'sdesc': '"Perl distribution Net-SMTP-SSL"',
  'ldesc': '"Implements the same API as Net::SMTP, but uses IO::Socket::SSL for\n'
           'its network operations in order to support encrypted connections."'}
diff --git a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1-src.expected b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1-src.expected
index 0a76a74..d6d0216 100644
--- a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1-src.expected
+++ b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1-src.expected
@@ -1 +1 @@
-OrderedDict([('category', 'Devel'), ('sdesc', '"test package C"'), ('obsoletes', 'obs-a, obs-b')])
+OrderedDict([('category', 'Devel'), ('sdesc', '"test package C"')])
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected b/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected
index 24a09e5..9cf692b 100644
--- a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-2.2.0-1-src.expected
@@ -1,4 +1 @@
-{'sdesc': '"The UNIX emulation engine"',
- 'ldesc': '"The UNIX emulation engine"',
- 'category': 'Base',
- 'requires': 'base-cygwin'}
+OrderedDict([('sdesc', '"The UNIX emulation engine"'), ('ldesc', '"The UNIX emulation engine"'), ('category', 'Base')])
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected b/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected
index 24a09e5..9cf692b 100644
--- a/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-2.2.1-1-src.expected
@@ -1,4 +1 @@
-{'sdesc': '"The UNIX emulation engine"',
- 'ldesc': '"The UNIX emulation engine"',
- 'category': 'Base',
- 'requires': 'base-cygwin'}
+OrderedDict([('sdesc', '"The UNIX emulation engine"'), ('ldesc', '"The UNIX emulation engine"'), ('category', 'Base')])
diff --git a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected b/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected
index a508218..22d5eaa 100644
--- a/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected
+++ b/test/testdata/hints/x86/release/cygwin/cygwin-2.3.0-0.3-src.expected
@@ -1,5 +1,4 @@
 {'sdesc': '"The UNIX emulation engine"',
  'ldesc': '"The UNIX emulation engine"',
  'category': 'Base',
- 'requires': 'base-cygwin',
  'test': ''}
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected b/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected
index 4113a2d..5af233c 100644
--- a/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected
+++ b/test/testdata/hints/x86/release/keychain/keychain-2.6.8-1-src.expected
@@ -8,5 +8,4 @@
           'verifies that the key files specified on the command-line are known to\n'
           'ssh-agent, otherwise it loads them, prompting you for a password if\n'
           'necessary"',
- 'category': 'Utils',
- 'requires': 'openssh'}
+ 'category': 'Utils'}
diff --git a/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected b/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected
index 4113a2d..5af233c 100644
--- a/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected
+++ b/test/testdata/hints/x86/release/keychain/keychain-2.7.1-1-src.expected
@@ -8,5 +8,4 @@
           'verifies that the key files specified on the command-line are known to\n'
           'ssh-agent, otherwise it loads them, prompting you for a password if\n'
           'necessary"',
- 'category': 'Utils',
- 'requires': 'openssh'}
+ 'category': 'Utils'}
diff --git a/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected b/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected
index 498e7e5..4a76a30 100644
--- a/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected
+++ b/test/testdata/hints/x86/release/libtextcat/libtextcat-2.2-2-src.expected
@@ -7,5 +7,4 @@
           'BSD License.\n'
           'http://software.wise-guys.nl/libtextcat/"',
  'category': 'Text',
- 'requires': 'libtextcat0',
  'parse-errors': ['embedded quote at line 7']}
diff --git a/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected b/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
index c7832e5..1da320a 100644
--- a/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
+++ b/test/testdata/hints/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.expected
@@ -1,5 +1,4 @@
 {'category': 'Net',
- 'requires': 'libdns_sd1',
  'sdesc': '"Bonjour Zeroconf implementation"',
  'ldesc': '"Bonjour, also known as zero-configuration networking, enables\n'
           'automatic discovery of computers, devices, and services on IP networks using\n'
diff --git a/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected b/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
index d6a1e1f..9772ce3 100644
--- a/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
+++ b/test/testdata/hints/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Per-version hint test package"',
  'ldesc': '"Per-version hint test package"',
- 'category': 'Base',
- 'requires': 'cygwin'}
+ 'category': 'Base'}
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected b/test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected
index d6a1e1f..9772ce3 100644
--- a/test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected
+++ b/test/testdata/hints/x86/release/per-version/per-version-4.0-1-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Per-version hint test package"',
  'ldesc': '"Per-version hint test package"',
- 'category': 'Base',
- 'requires': 'cygwin'}
+ 'category': 'Base'}
diff --git a/test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected b/test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected
index 40a138b..9772ce3 100644
--- a/test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected
+++ b/test/testdata/hints/x86/release/per-version/per-version-4.8-1-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Per-version hint test package"',
  'ldesc': '"Per-version hint test package"',
- 'category': 'Base',
- 'requires': 'base-cygwin'}
+ 'category': 'Base'}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected
index f7cc4fd..7819372 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-240-1-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
- 'category': 'Shells Base',
- 'requires': ''}
+ 'category': 'Shells Base'}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected
index f7cc4fd..7819372 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-242-0-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
- 'category': 'Shells Base',
- 'requires': ''}
+ 'category': 'Shells Base'}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected
index f7cc4fd..7819372 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-243-0-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
- 'category': 'Shells Base',
- 'requires': ''}
+ 'category': 'Shells Base'}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected
index f7cc4fd..7819372 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-250-0-src.expected
@@ -1,4 +1,3 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
- 'category': 'Shells Base',
- 'requires': ''}
+ 'category': 'Shells Base'}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected
index a876af9..7717a9c 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-251-0-src.expected
@@ -1,5 +1,4 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
  'category': 'Shells Base',
- 'requires': '',
  'test': ''}
diff --git a/test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected b/test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected
index a876af9..7717a9c 100644
--- a/test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected
+++ b/test/testdata/hints/x86/release/staleversion/staleversion-260-0-src.expected
@@ -1,5 +1,4 @@
 {'sdesc': '"Test package for stale version removal"',
  'ldesc': '"Test package for stale version removal"',
  'category': 'Shells Base',
- 'requires': '',
  'test': ''}
diff --git a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.hint b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.hint
index f91a0e1..6b37711 100644
--- a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.hint
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.01-1-src.hint
@@ -1,5 +1,4 @@
 category: Perl
-requires:
 sdesc: "Perl distribution Net-SMTP-SSL"
 ldesc: "Implements the same API as Net::SMTP, but uses IO::Socket::SSL for
 its network operations in order to support encrypted connections."
diff --git a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.hint b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.hint
index f91a0e1..6b37711 100644
--- a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.hint
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.02-1-src.hint
@@ -1,5 +1,4 @@
 category: Perl
-requires:
 sdesc: "Perl distribution Net-SMTP-SSL"
 ldesc: "Implements the same API as Net::SMTP, but uses IO::Socket::SSL for
 its network operations in order to support encrypted connections."
diff --git a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.hint b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.hint
index f91a0e1..6b37711 100644
--- a/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.hint
+++ b/test/testdata/relarea/noarch/release/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL-1.03-1-src.hint
@@ -1,5 +1,4 @@
 category: Perl
-requires:
 sdesc: "Perl distribution Net-SMTP-SSL"
 ldesc: "Implements the same API as Net::SMTP, but uses IO::Socket::SSL for
 its network operations in order to support encrypted connections."
diff --git a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1-src.hint b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1-src.hint
index bedf581..4dd654e 100755
--- a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1-src.hint
+++ b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1-src.hint
@@ -1,3 +1,2 @@
 category: Devel
 sdesc: "test package C"
-obsoletes: obs-a obs-b
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint
index be59e34..d924e38 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.0-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "The UNIX emulation engine"
 ldesc: "The UNIX emulation engine"
 category: Base
-requires: base-cygwin
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint
index be59e34..d924e38 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.2.1-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "The UNIX emulation engine"
 ldesc: "The UNIX emulation engine"
 category: Base
-requires: base-cygwin
diff --git a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint
index dd0ba4b..08d8786 100644
--- a/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint
+++ b/test/testdata/relarea/x86/release/cygwin/cygwin-2.3.0-0.3-src.hint
@@ -1,5 +1,4 @@
 sdesc: "The UNIX emulation engine"
 ldesc: "The UNIX emulation engine"
 category: Base
-requires: base-cygwin
 test:
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint
index 7870969..72fec8a 100644
--- a/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.6.8-1-src.hint
@@ -9,4 +9,3 @@ verifies that the key files specified on the command-line are known to
 ssh-agent, otherwise it loads them, prompting you for a password if
 necessary"
 category: Utils
-requires: openssh
diff --git a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint
index 7870969..72fec8a 100644
--- a/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint
+++ b/test/testdata/relarea/x86/release/keychain/keychain-2.7.1-1-src.hint
@@ -9,4 +9,3 @@ verifies that the key files specified on the command-line are known to
 ssh-agent, otherwise it loads them, prompting you for a password if
 necessary"
 category: Utils
-requires: openssh
diff --git a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint
index 5145c2d..77da01a 100644
--- a/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint
+++ b/test/testdata/relarea/x86/release/libtextcat/libtextcat-2.2-2-src.hint
@@ -7,4 +7,3 @@ accuracy.
 BSD License.
 http://software.wise-guys.nl/libtextcat/"
 category: Text
-requires: libtextcat0
diff --git a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
index 7cc145b..45e790b 100644
--- a/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
+++ b/test/testdata/relarea/x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.hint
@@ -1,5 +1,4 @@
 category: Net
-requires: libdns_sd1 
 sdesc: "Bonjour Zeroconf implementation"
 ldesc: "Bonjour, also known as zero-configuration networking, enables
 automatic discovery of computers, devices, and services on IP networks using
diff --git a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
index 726738d..3083652 100644
--- a/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
+++ b/test/testdata/relarea/x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Per-version hint test package"
 ldesc: "Per-version hint test package"
 category: Base
-requires: cygwin
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint
index 726738d..3083652 100644
--- a/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint
+++ b/test/testdata/relarea/x86/release/per-version/per-version-4.0-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Per-version hint test package"
 ldesc: "Per-version hint test package"
 category: Base
-requires: cygwin
diff --git a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint
index 1f86c0b..3083652 100644
--- a/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint
+++ b/test/testdata/relarea/x86/release/per-version/per-version-4.8-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Per-version hint test package"
 ldesc: "Per-version hint test package"
 category: Base
-requires: base-cygwin
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint
index 7f7f48a..8610b83 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-240-1-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint
index 7f7f48a..8610b83 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-242-0-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint
index 7f7f48a..8610b83 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-243-0-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint
index 7f7f48a..8610b83 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-250-0-src.hint
@@ -1,4 +1,3 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint
index 5d7b35e..837cb61 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-251-0-src.hint
@@ -1,5 +1,4 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
 test:
diff --git a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint b/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint
index 5d7b35e..837cb61 100644
--- a/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint
+++ b/test/testdata/relarea/x86/release/staleversion/staleversion-260-0-src.hint
@@ -1,5 +1,4 @@
 sdesc: "Test package for stale version removal"
 ldesc: "Test package for stale version removal"
 category: Shells Base
-requires:
 test:
diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected
index 8312127..837e898 100644
--- a/test/testdata/uploads/pkglist.expected
+++ b/test/testdata/uploads/pkglist.expected
@@ -12,9 +12,7 @@
                     'Like it’s you’re Markup Language™ Nokogiri’s tool―that '
                     'Bézier."',
            'category': 'Devel',
-           'requires': 'cygwin',
-           'homepage': 'http://homepage.url',
-           'depends': 'cygwin'}}, {}, False),
+           'homepage': 'http://homepage.url'}}, {}, False),
  'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test subpackage"',
            'ldesc': '"A test subpackage"',
            'category': 'Devel',



More information about the Cygwin-apps-cvs mailing list