Upgrade iana-etc to version 20211115 (#1664)

This commit is contained in:
Thomas Crain 2021-11-22 12:30:20 -08:00 committed by GitHub
parent da8fdb34f6
commit e65b0aec49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 94 additions and 69 deletions

View File

@ -0,0 +1,7 @@
Copyright 2017 Jörg Thalheim
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -1,5 +1,6 @@
{
"Signatures": {
"iana-etc-2.30.tar.bz2": "b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d"
"iana-etc-20211115.tar.gz": "3ced78cf059744938ac6dfb59dfb28f973511b5390631a9fc1f71eac65af25af",
"iana-etc-LICENSE": "12a70cb991002fe457b82f14dad29df42a1c1812257da46fee9de64af6b9083a"
}
}
}

View File

@ -1,45 +1,62 @@
Summary: Data for network services and protocols
Name: iana-etc
Version: 2.30
Release: 5%{?dist}
License: OSL 3.0
URL: http://freshmeat.net/projects/iana-etc
Group: System Environment/Base
Vendor: Microsoft Corporation
Distribution: Mariner
BuildArch: noarch
Source0: http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration//iana-etc/%{name}-%{version}.tar.bz2
Summary: Data for network services and protocols
Name: iana-etc
Version: 20211115
Release: 1%{?dist}
# IANA base information is Public Domain
# Scripts used to translate original XML data into the necessary format are MIT
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Base
URL: https://github.com/Mic92/iana-etc
Source0: https://github.com/Mic92/iana-etc/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-LICENSE
BuildArch: noarch
%description
The Iana-Etc package provides data for network services and protocols.
The iana-etc package provides data for network services and protocols.
%prep
%setup -q
%autosetup
cp %{SOURCE1} ./LICENSE
%build
make %{?_smp_mflags}
# Empty- nothing to build
%install
make DESTDIR=%{buildroot} install
# Install data files into %%{_sysconfdir}
install -vdm 755 %{buildroot}%{_sysconfdir}
install -vm 644 protocols %{buildroot}%{_sysconfdir}/protocols
install -vm 644 services %{buildroot}%{_sysconfdir}/services
%check
make %{?_smp_mflags} test
# %%check
# No tests available- this is just a data package
%files
%defattr(-,root,root)
%license COPYING
%config %_sysconfdir/protocols
%config %_sysconfdir/services
%license LICENSE
%doc protocol-numbers.xml service-names-port-numbers.xml
%config %{_sysconfdir}/protocols
%config %{_sysconfdir}/services
%changelog
* Tue May 26 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 2.30-5
- Adding the "%%license" macro.
* Fri May 08 2020 Joe Schmitt <joschmit@microsoft.com> 2.30-4
- Remove sha1 macro.
- License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.30-3
- Initial CBL-Mariner import from Photon (license: Apache2).
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.30-2
- GA - Bump release of all rpms
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.30-1
- Initial build. First version
* Mon Nov 22 2021 Thomas Crain <thcrain@microsoft.com> - 20211115-1
- Switch to new upstream source used by LFS and upgrade to latest
- Use new release version corresponding to IANA source update dates
- Include original IANA XML sources in packaging
- License verified (now MIT, old upstream was OSL 3.0)
* Tue May 26 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 2.30-5
- Adding the "%%license" macro.
* Fri May 08 2020 Joe Schmitt <joschmit@microsoft.com> 2.30-4
- Remove sha1 macro.
- License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.30-3
- Initial CBL-Mariner import from Photon (license: Apache2).
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.30-2
- GA - Bump release of all rpms
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.30-1
- Initial build. First version

View File

@ -41,25 +41,25 @@
}
},
{
"component": {
"type": "other",
"other": {
"name": "ant",
"version": "1.10.9",
"downloadUrl": "https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.gz"
}
"component": {
"type": "other",
"other": {
"name": "ant",
"version": "1.10.9",
"downloadUrl": "https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.gz"
}
},
{
"component": {
"type": "other",
"other": {
"name": "ant-contrib",
"version": "1.0b3",
"downloadUrl": "https://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ant-contrib",
"version": "1.0b3",
"downloadUrl": "https://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2"
}
},
}
},
{
"component": {
"type": "other",
@ -2369,8 +2369,8 @@
"type": "other",
"other": {
"name": "iana-etc",
"version": "2.30",
"downloadUrl": "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration//iana-etc/iana-etc-2.30.tar.bz2"
"version": "20211115",
"downloadUrl": "https://github.com/Mic92/iana-etc/releases/download/20211115/iana-etc-20211115.tar.gz"
}
}
},
@ -2605,15 +2605,15 @@
}
},
{
"component": {
"type": "other",
"other": {
"name": "jna",
"version": "5.5.0",
"downloadUrl": "https://github.com/java-native-access/jna/archive/5.5.0/jna-5.5.0.tar.gz"
}
"component": {
"type": "other",
"other": {
"name": "jna",
"version": "5.5.0",
"downloadUrl": "https://github.com/java-native-access/jna/archive/5.5.0/jna-5.5.0.tar.gz"
}
},
}
},
{
"component": {
"type": "other",
@ -7428,15 +7428,15 @@
}
},
{
"component": {
"type": "other",
"other": {
"name": "R",
"version": "4.1.0",
"downloadUrl": "https://cran.r-project.org/src/base/R-4/R-4.1.0.tar.gz"
}
"component": {
"type": "other",
"other": {
"name": "R",
"version": "4.1.0",
"downloadUrl": "https://cran.r-project.org/src/base/R-4/R-4.1.0.tar.gz"
}
},
}
},
{
"component": {
"type": "other",