Merge pull request #17 from microsoft/anphel/utility-packages

Update tar and iputils packages with symlinks for utilities

Author: jslobodzian

SPECS/iputils/iputils.spec

@@ -1,7 +1,7 @@
 Summary:          Programs for basic networking
 Name:             iputils
 Version:          20180629
-Release:          4%{?dist}
+Release:          5%{?dist}
 License:          BSD-3 and GPLv2+ and Rdisc
 URL:              https://github.com/iputils/iputils
 Group:            Applications/Communications
@@ -43,6 +43,7 @@ install -cp tracepath %{buildroot}%{_bindir}/
 install -cp traceroute6 %{buildroot}%{_bindir}/
 install -cp ninfod/ninfod %{buildroot}%{_sbindir}/
 
+ln -sf ../bin/ping %{buildroot}%{_bindir}/ping6
 ln -sf ../bin/tracepath %{buildroot}%{_sbindir}
 ln -sf ../bin/traceroute6 %{buildroot}%{_sbindir}
 
@@ -63,11 +64,13 @@ mv -f RELNOTES.tmp RELNOTES.old
 %caps(cap_net_raw=p) %{_sbindir}/clockdiff
 %caps(cap_net_raw=p) %{_sbindir}/arping
 %caps(cap_net_raw=p cap_net_admin=p) %{_bindir}/ping
+%caps(cap_net_raw=p cap_net_admin=p) %{_bindir}/ping6
 
 %changelog
-* Sat May 09 00:21:37 PST 2020 Nick Samson <[email protected]> - 20180629-4
-- Added %%license line automatically
-
+*   Wed Jul 29 2020 Andrew Phelps 20180629-5
+-   Add ping6 symlink.
+*   Sat May 09 2020 Nick Samson <[email protected]> 20180629-4
+-   Added %%license line automatically
 *   Mon Apr 13 2020 Jon Slobodzian <[email protected]> 20180629-3
 -   Verified license. Removed sha1. Fixed commented out URL. Fixed formatting.
 *   Tue Sep 03 2019 Mateusz Malisz <[email protected]> 20180629-2

SPECS/tar/tar.spec

@@ -1,7 +1,7 @@
 Summary:        Archiving program
 Name:           tar
 Version:        1.32
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3+
 URL:            https://www.gnu.org/software/tar
 Group:          Applications/System
@@ -25,6 +25,7 @@ make %{?_smp_mflags}
 install -vdm 755 %{buildroot}%{_sbindir}
 make DESTDIR=%{buildroot} install
 make DESTDIR=%{buildroot} -C doc install-html docdir=%{_defaultdocdir}/%{name}-%{version}
+ln -sf tar %{buildroot}/bin/gtar
 install -vdm 755 %{buildroot}/usr/share/man/man1
 rm -rf %{buildroot}%{_infodir}
 %find_lang %{name}
@@ -36,11 +37,14 @@ make  %{?_smp_mflags} check
 %defattr(-,root,root)
 %license COPYING
 /bin/tar
+/bin/gtar
 %{_libexecdir}/rmt
 %{_defaultdocdir}/%{name}-%{version}/*
 %{_mandir}/*/*
 
 %changelog
+*   Wed Jul 29 2020 Andrew Phelps <[email protected]> 1.32-2
+-   Add symlink for gtar.
 *   Wed Jun 03 2020 Joe Schmitt <[email protected]> 1.32-1
 -   Update to version 1.32 to resolve CVE-2019-9923.
 -   Fix macro in changelog.

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -63,7 +63,7 @@ patch-2.7.6-7.cm1.aarch64.rpm
 util-linux-2.32.1-3.cm1.aarch64.rpm
 util-linux-devel-2.32.1-3.cm1.aarch64.rpm
 util-linux-libs-2.32.1-3.cm1.aarch64.rpm
-tar-1.32-1.cm1.aarch64.rpm
+tar-1.32-2.cm1.aarch64.rpm
 xz-5.2.4-3.cm1.aarch64.rpm
 xz-devel-5.2.4-3.cm1.aarch64.rpm
 xz-lang-5.2.4-3.cm1.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -63,7 +63,7 @@ patch-2.7.6-7.cm1.x86_64.rpm
 util-linux-2.32.1-3.cm1.x86_64.rpm
 util-linux-devel-2.32.1-3.cm1.x86_64.rpm
 util-linux-libs-2.32.1-3.cm1.x86_64.rpm
-tar-1.32-1.cm1.x86_64.rpm
+tar-1.32-2.cm1.x86_64.rpm
 xz-5.2.4-3.cm1.x86_64.rpm
 xz-devel-5.2.4-3.cm1.x86_64.rpm
 xz-lang-5.2.4-3.cm1.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -355,8 +355,8 @@ systemd-bootstrap-devel-239-29.cm1.aarch64.rpm
 systemd-debuginfo-239-30.cm1.aarch64.rpm
 systemd-devel-239-30.cm1.aarch64.rpm
 systemd-lang-239-30.cm1.aarch64.rpm
-tar-1.32-1.cm1.aarch64.rpm
-tar-debuginfo-1.32-1.cm1.aarch64.rpm
+tar-1.32-2.cm1.aarch64.rpm
+tar-debuginfo-1.32-2.cm1.aarch64.rpm
 tdnf-2.1.0-3.cm1.aarch64.rpm
 tdnf-cli-libs-2.1.0-3.cm1.aarch64.rpm
 tdnf-debuginfo-2.1.0-3.cm1.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -355,8 +355,8 @@ systemd-bootstrap-devel-239-29.cm1.x86_64.rpm
 systemd-debuginfo-239-30.cm1.x86_64.rpm
 systemd-devel-239-30.cm1.x86_64.rpm
 systemd-lang-239-30.cm1.x86_64.rpm
-tar-1.32-1.cm1.x86_64.rpm
-tar-debuginfo-1.32-1.cm1.x86_64.rpm
+tar-1.32-2.cm1.x86_64.rpm
+tar-debuginfo-1.32-2.cm1.x86_64.rpm
 tdnf-2.1.0-3.cm1.x86_64.rpm
 tdnf-cli-libs-2.1.0-3.cm1.x86_64.rpm
 tdnf-debuginfo-2.1.0-3.cm1.x86_64.rpm