Skip to content

Updating cert bundle paths. #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PawelWMS merged 3 commits into from
Oct 7, 2020
Merged

Updating cert bundle paths. #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cf17bc
Updating cert bundle paths.
PawelWMS Oct 7, 2020
a53b8d5
Updating cgmanifest.json.
PawelWMS Oct 7, 2020
346cae5
Updating e-mails.
PawelWMS Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions SPECS/curl/curl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: An URL retrieval utility and library
Name: curl
Version: 7.68.0
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
URL: http://curl.haxx.se
Group: System Environment/NetworkingLibraries
Expand Down Expand Up @@ -47,7 +47,7 @@ This package contains minimal set of shared curl libraries.
--with-ssl \
--with-gssapi \
--with-libssh2 \
--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
Comment thread
PawelWMS marked this conversation as resolved.
--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.trust.crt \
--with-ca-path=/etc/ssl/certs
make %{?_smp_mflags}

Expand Down Expand Up @@ -87,6 +87,8 @@ rm -rf %{buildroot}/*
%{_libdir}/libcurl.so.*

%changelog
* Wed Oct 07 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 7.68.0-2
- Updating certificate bundle path to include full set of trust information.
* Tue Aug 11 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 7.68.0-1
- Upgrading to 7.68.0 to enable verification against a partial cert chain.
* Thu May 14 2020 Nicolas Ontiveros <niontive@microsoft.com> 7.66.0-1
Expand Down
6 changes: 4 additions & 2 deletions SPECS/gnutls/gnutls.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: The GnuTLS Transport Layer Security Library
Name: gnutls
Version: 3.6.14
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+ and LGPLv2+
URL: https://www.gnutls.org
Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz
Expand Down Expand Up @@ -44,7 +44,7 @@ developing applications that use gnutls.
--disable-openssl-compatibility \
--with-included-unistring \
--with-system-priority-file=%{_sysconfdir}/gnutls/default-priorities \
--with-default-trust-store-file=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
--with-default-trust-store-file=%{_sysconfdir}/pki/tls/certs/ca-bundle.trust.crt \
--with-default-trust-store-dir=%{_sysconfdir}/ssl/certs
make %{?_smp_mflags}

Expand Down Expand Up @@ -88,6 +88,8 @@ make %{?_smp_mflags} check
%{_mandir}/man3/*

%changelog
* Wed Oct 07 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 3.6.14-2
- Updating certificate bundle path to include full set of trust information.
* Fri Aug 21 2020 Andrew Phelps <anphel@microsoft.com> 3.6.14-1
- Update to version 3.6.14 for CVE-2020-13777
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.6.8-3
Expand Down
6 changes: 4 additions & 2 deletions SPECS/wget/wget.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: A network utility to retrieve files from the Web
Name: wget
Version: 1.20.3
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
URL: https://www.gnu.org/software/wget/wget.html
Group: System Environment/NetworkingPrograms
Expand Down Expand Up @@ -40,7 +40,7 @@ make DESTDIR=%{buildroot} install
install -vdm 755 %{buildroot}/etc
cat >> %{buildroot}/etc/wgetrc <<-EOF
# default root certs location
ca_certificate=/etc/pki/tls/certs/ca-bundle.crt
ca_certificate=/etc/pki/tls/certs/ca-bundle.trust.crt
ca_directory = /etc/ssl/certs
EOF
rm -rf %{buildroot}/%{_infodir}
Expand All @@ -62,6 +62,8 @@ rm -rf %{buildroot}/*
%{_mandir}/man1/*

%changelog
* Wed Oct 07 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 1.20.3-2
- Updating certificate bundle path to include full set of trust information.
* Mon Jun 08 2020 Joe Schmitt <joschmit@microsoft.com> 1.20.3-1
- Update to version 1.20.3 to resolve CVE-2019-5953.
- Use https for URL.
Expand Down
8 changes: 4 additions & 4 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,8 @@
"type": "other",
"other": {
"name": "curl",
"version": "7.66.0",
"downloadUrl": "http://curl.haxx.se/download/curl-7.66.0.tar.gz"
"version": "7.68.0",
"downloadUrl": "http://curl.haxx.se/download/curl-7.68.0.tar.gz"
}
}
},
Expand Down Expand Up @@ -1266,8 +1266,8 @@
"type": "other",
"other": {
"name": "gnutls",
"version": "3.6.8",
"downloadUrl": "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/gnutls-3.6.8.tar.xz"
"version": "3.6.14",
"downloadUrl": "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ libsolv-0.7.7-4.cm1.aarch64.rpm
libsolv-devel-0.7.7-4.cm1.aarch64.rpm
libssh2-1.9.0-1.cm1.aarch64.rpm
libssh2-devel-1.9.0-1.cm1.aarch64.rpm
curl-7.68.0-1.cm1.aarch64.rpm
curl-devel-7.68.0-1.cm1.aarch64.rpm
curl-libs-7.68.0-1.cm1.aarch64.rpm
curl-7.68.0-2.cm1.aarch64.rpm
curl-devel-7.68.0-2.cm1.aarch64.rpm
curl-libs-7.68.0-2.cm1.aarch64.rpm
tdnf-2.1.0-4.cm1.aarch64.rpm
tdnf-cli-libs-2.1.0-4.cm1.aarch64.rpm
tdnf-devel-2.1.0-4.cm1.aarch64.rpm
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ libsolv-0.7.7-4.cm1.x86_64.rpm
libsolv-devel-0.7.7-4.cm1.x86_64.rpm
libssh2-1.9.0-1.cm1.x86_64.rpm
libssh2-devel-1.9.0-1.cm1.x86_64.rpm
curl-7.68.0-1.cm1.x86_64.rpm
curl-devel-7.68.0-1.cm1.x86_64.rpm
curl-libs-7.68.0-1.cm1.x86_64.rpm
curl-7.68.0-2.cm1.x86_64.rpm
curl-devel-7.68.0-2.cm1.x86_64.rpm
curl-libs-7.68.0-2.cm1.x86_64.rpm
tdnf-2.1.0-4.cm1.x86_64.rpm
tdnf-cli-libs-2.1.0-4.cm1.x86_64.rpm
tdnf-devel-2.1.0-4.cm1.x86_64.rpm
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.aarch64.rpm
cryptsetup-devel-2.3.3-2.cm1.aarch64.rpm
cryptsetup-libs-2.3.3-2.cm1.aarch64.rpm
cryptsetup-reencrypt-2.3.3-2.cm1.aarch64.rpm
curl-7.68.0-1.cm1.aarch64.rpm
curl-debuginfo-7.68.0-1.cm1.aarch64.rpm
curl-devel-7.68.0-1.cm1.aarch64.rpm
curl-libs-7.68.0-1.cm1.aarch64.rpm
curl-7.68.0-2.cm1.aarch64.rpm
curl-debuginfo-7.68.0-2.cm1.aarch64.rpm
curl-devel-7.68.0-2.cm1.aarch64.rpm
curl-libs-7.68.0-2.cm1.aarch64.rpm
device-mapper-2.03.05-5.cm1.aarch64.rpm
device-mapper-devel-2.03.05-5.cm1.aarch64.rpm
device-mapper-event-2.03.05-5.cm1.aarch64.rpm
Expand Down Expand Up @@ -378,8 +378,8 @@ util-linux-devel-2.32.1-3.cm1.aarch64.rpm
util-linux-lang-2.32.1-3.cm1.aarch64.rpm
util-linux-libs-2.32.1-3.cm1.aarch64.rpm
veritysetup-2.3.3-2.cm1.aarch64.rpm
wget-1.20.3-1.cm1.aarch64.rpm
wget-debuginfo-1.20.3-1.cm1.aarch64.rpm
wget-1.20.3-2.cm1.aarch64.rpm
wget-debuginfo-1.20.3-2.cm1.aarch64.rpm
which-2.21-7.cm1.aarch64.rpm
which-debuginfo-2.21-7.cm1.aarch64.rpm
xz-5.2.4-3.cm1.aarch64.rpm
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ cryptsetup-debuginfo-2.3.3-2.cm1.x86_64.rpm
cryptsetup-devel-2.3.3-2.cm1.x86_64.rpm
cryptsetup-libs-2.3.3-2.cm1.x86_64.rpm
cryptsetup-reencrypt-2.3.3-2.cm1.x86_64.rpm
curl-7.68.0-1.cm1.x86_64.rpm
curl-debuginfo-7.68.0-1.cm1.x86_64.rpm
curl-devel-7.68.0-1.cm1.x86_64.rpm
curl-libs-7.68.0-1.cm1.x86_64.rpm
curl-7.68.0-2.cm1.x86_64.rpm
curl-debuginfo-7.68.0-2.cm1.x86_64.rpm
curl-devel-7.68.0-2.cm1.x86_64.rpm
curl-libs-7.68.0-2.cm1.x86_64.rpm
device-mapper-2.03.05-5.cm1.x86_64.rpm
device-mapper-devel-2.03.05-5.cm1.x86_64.rpm
device-mapper-event-2.03.05-5.cm1.x86_64.rpm
Expand Down Expand Up @@ -378,8 +378,8 @@ util-linux-devel-2.32.1-3.cm1.x86_64.rpm
util-linux-lang-2.32.1-3.cm1.x86_64.rpm
util-linux-libs-2.32.1-3.cm1.x86_64.rpm
veritysetup-2.3.3-2.cm1.x86_64.rpm
wget-1.20.3-1.cm1.x86_64.rpm
wget-debuginfo-1.20.3-1.cm1.x86_64.rpm
wget-1.20.3-2.cm1.x86_64.rpm
wget-debuginfo-1.20.3-2.cm1.x86_64.rpm
which-2.21-7.cm1.x86_64.rpm
which-debuginfo-2.21-7.cm1.x86_64.rpm
xz-5.2.4-3.cm1.x86_64.rpm
Expand Down