Merge remote-tracking branch 'upstream/master'

See incommon/inc-meta#79.

README.md

@@ -18,9 +18,13 @@ The second main category excluded from the public repository is the historic reg
 
 Since 2016, we have separated the entity database and aggregate record from the main toolchain repository, but the nature of Git is to never discard anything. We will therefore continue to make this repository publicly available only in redacted form.
 
-## Licensing
+## Copyright and License
 
-Everything in the public repository is Copyright (C) 2004–2015, University of Edinburgh. Each file is made available to you under the following terms:
+The contents of this repository are Copyright (C) the named contributors or their
+employers, as appropriate.
+
+In particular, all content authored prior to the 1st of August 2016 is
+Copyright (C) 2011—2016, University of Edinburgh.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

attic/extract_entityids.xsl

@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	extract_entityids.xsl
-	
-	XSL stylesheet that takes a SAML 2.0 metadata file and extracts
-	a list of entity IDs.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
+    extract_entityids.xsl
+
+    XSL stylesheet that takes a SAML 2.0 metadata file and extracts
+    a list of entity IDs.
+
+    Author: Ian A. Young <ian@iay.org.uk>
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="md ds wayf">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    exclude-result-prefixes="md ds">
+
+    <!-- Output is plain text -->
+    <xsl:output method="text"/>
 
-	<!-- Output is plain text -->
-	<xsl:output method="text"/>
+    <xsl:template match="//md:EntityDescriptor">
+        <xsl:value-of select="@entityID"/>
+        <xsl:text>&#x0a;</xsl:text>
+    </xsl:template>
 
-	<xsl:template match="//md:EntityDescriptor">
-		<xsl:value-of select="@entityID"/>
-		<xsl:text>&#x0a;</xsl:text>
-	</xsl:template>
-
-	<xsl:template match="text()">
-		<!-- do nothing -->
-	</xsl:template>
+    <xsl:template match="text()">
+        <!-- do nothing -->
+    </xsl:template>
 </xsl:stylesheet>

attic/extract_member_dates.xsl

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	extract_member_dates.xsl
-	
-	XSL stylesheet that takes the UK federation members.xml file ane extracts
-	member names and joining dates in a format suitable for updating.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
+    extract_member_dates.xsl
+
+    XSL stylesheet that takes the UK federation members.xml file ane extracts
+    member names and joining dates in a format suitable for updating.
+
+    Author: Ian A. Young <ian@iay.org.uk>
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:ukfm="http://ukfederation.org.uk/2007/01/members">
-
-	<!-- Output is plain text -->
-	<xsl:output method="text"/>
-	
-	<xsl:template match="ukfm:Member">
-		<xsl:value-of select="ukfm:JoinDate"/>
-		<xsl:text>,"</xsl:text>
-		<xsl:value-of select="md:OrganizationName"/>
-		<xsl:text>"&#x0a;</xsl:text>
-	</xsl:template>
-
-	<!--
-		Junk any extraneous text nodes.
-	-->
-	<xsl:template match="text()">
-		<!-- do nothing -->
-	</xsl:template>
-	
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:ukfm="http://ukfederation.org.uk/2007/01/members">
+
+    <!-- Output is plain text -->
+    <xsl:output method="text"/>
+
+    <xsl:template match="ukfm:Member">
+        <xsl:value-of select="ukfm:JoinDate"/>
+        <xsl:text>,"</xsl:text>
+        <xsl:value-of select="md:OrganizationName"/>
+        <xsl:text>"&#x0a;</xsl:text>
+    </xsl:template>
+
+    <!--
+        Junk any extraneous text nodes.
+    -->
+    <xsl:template match="text()">
+        <!-- do nothing -->
+    </xsl:template>
+
 </xsl:stylesheet>

attic/extract_saml2sp.xsl

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	extract_saml2sp.xsl
-	
-	XSL stylesheet that takes a SAML 2.0 metadata aggregate and extracts
-	SAML 2.0 support information for each SP entity.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
+    extract_saml2sp.xsl
+
+    XSL stylesheet that takes a SAML 2.0 metadata aggregate and extracts
+    SAML 2.0 support information for each SP entity.
+
+    Author: Ian A. Young <ian@iay.org.uk>
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	exclude-result-prefixes="md ds">
-
-	<!-- Output is plain text -->
-	<xsl:output method="text"/>
-	
-	<xsl:template match="//md:EntityDescriptor[md:SPSSODescriptor]">
-		<xsl:value-of select="@ID"/>
-		<xsl:text> </xsl:text>
-		<xsl:choose>
-			<xsl:when test="contains(md:SPSSODescriptor/@protocolSupportEnumeration,
-				'urn:oasis:names:tc:SAML:2.0:protocol')">yes</xsl:when>
-			<xsl:otherwise>no</xsl:otherwise>
-		</xsl:choose>
-		<xsl:text>&#x0a;</xsl:text>
-	</xsl:template>
-	
-	<xsl:template match="text()">
-		<!-- do nothing -->
-	</xsl:template>
-	
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    exclude-result-prefixes="md ds">
+
+    <!-- Output is plain text -->
+    <xsl:output method="text"/>
+
+    <xsl:template match="//md:EntityDescriptor[md:SPSSODescriptor]">
+        <xsl:value-of select="@ID"/>
+        <xsl:text> </xsl:text>
+        <xsl:choose>
+            <xsl:when test="contains(md:SPSSODescriptor/@protocolSupportEnumeration,
+                'urn:oasis:names:tc:SAML:2.0:protocol')">yes</xsl:when>
+            <xsl:otherwise>no</xsl:otherwise>
+        </xsl:choose>
+        <xsl:text>&#x0a;</xsl:text>
+    </xsl:template>
+
+    <xsl:template match="text()">
+        <!-- do nothing -->
+    </xsl:template>
+
 </xsl:stylesheet>

attic/identity.xsl

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	identity.xsl
-	
-	Identity transform.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
+    identity.xsl
+
+    Identity transform.
+
+    Author: Ian A. Young <ian@iay.org.uk>
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-	<!--
-		Force UTF-8 encoding for the output.
-	-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
-		
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-	
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-	
+    <!--
+        Force UTF-8 encoding for the output.
+    -->
+    <xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
+
+    <!--By default, copy text blocks, comments and attributes unchanged.-->
+    <xsl:template match="text()|comment()|@*">
+        <xsl:copy/>
+    </xsl:template>
+
+    <!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
+    <xsl:template match="*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+
 </xsl:stylesheet>

attic/keynames.pl

@@ -1,10 +1,11 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/env perl
 
 #
 # keynames.pl
 #
 # Extracts statistics about KeyName elements from the published metadata.
 #
+use warnings;
 use lib "../build";
 use Xalan;
 use Months;

attic/keynames_inner.pl

@@ -1,4 +1,6 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/env perl
+
+use warnings;
 use POSIX qw(floor);
 use File::Temp qw(tempfile);
 use Date::Format;