@@ -1,33 +1,35 @@

-Summary:	Contains programs for compressing and decompressing files

-Name:		bzip2

-Version:	1.0.6

-Release:	8%{?dist}

-License:	BSD

-URL:		http://www.bzip.org/

-Group:		System Environment/Base

-Vendor:		VMware, Inc.

-Distribution: Photon

-Source0:		http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz

-Provides:    libbz2.so.1()(64bit)

+Summary:        Contains programs for compressing and decompressing files

+Name:           bzip2

+Version:        1.0.6

+Release:        9%{?dist}

+License:        BSD

+URL:            http://www.bzip.org/

+Group:          System Environment/Base

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz

+Provides:       libbz2.so.1()(64bit)

 %define sha1 bzip2=3f89f861209ce81a6bab1fd1998c0ef311712002

-Patch0:		http://www.linuxfromscratch.org/patches/lfs/7.2/bzip2-1.0.6-install_docs-1.patch

+Patch0:         http://www.linuxfromscratch.org/patches/lfs/7.2/bzip2-1.0.6-install_docs-1.patch

 Patch1:         CVE-2016-3189.patch

 Requires:       bzip2-libs = %{version}-%{release}

+Conflicts:      toybox

+

 %description

 The Bzip2 package contains programs for compressing and

 decompressing files.  Compressing text files with bzip2 yields a much better

 compression percentage than with the traditional gzip.

-%package	devel

-Summary:	Header and development files for bzip2

-Requires:	bzip2

-%description	devel

-It contains the libraries and header files to create applications 

+%package        devel

+Summary:        Header and development files for bzip2

+Requires:       bzip2

+%description    devel

+It contains the libraries and header files to create applications

 %package libs

-Summary: Libraries for bzip2

-Group:      System Environment/Libraries

-%description libs

+Summary:        Libraries for bzip2

+Group:          System Environment/Libraries

+%description    libs

 This package contains minimal set of shared bzip2 libraries.

 %prep

@@ -36,10 +38,12 @@ This package contains minimal set of shared bzip2 libraries.

 %patch1 -p1

 sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile

 sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile

+

 %build

 make VERBOSE=1 %{?_smp_mflags} -f Makefile-libbz2_so

 make clean

 make VERBOSE=1 %{?_smp_mflags}

+

 %install

 make PREFIX=%{buildroot}/usr install

 install -vdm 0755 %{buildroot}/%{_lib}

@@ -52,10 +56,13 @@ rm -v %{buildroot}%{_bindir}/{bunzip2,bzcat}

 ln -sv bzip2 %{buildroot}/usr/bin/bunzip2

 ln -sv bzip2 %{buildroot}/usr/bin/bzcat

 find %{buildroot} -name '*.a'  -delete

+

 %check

 make %{?_smp_mflags} check

+

 %post	-p /sbin/ldconfig

 %postun	-p /sbin/ldconfig

+

 %files

 %defattr(-,root,root)

 %{_bindir}/bzcat

@@ -87,19 +94,21 @@ make %{?_smp_mflags} check

 %{_lib}/libbz2.so.*

 %changelog

+*   Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 1.0.6-9

+-   Add conflicts toybox.

 *   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 1.0.6-8

--   Fix symlink

+-   Fix symlink.

 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.6-7

--   Added -libs subpackage

+-   Added -libs subpackage.

 *   Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.6-6

 -   Fixing security bug CVE-2016-3189.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.6-5

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms.

 *   Tue Nov 10 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 1.0.6-4

 -   Providing libbz2.so.1, miror fix for devel provides.

 *   Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.6-3

--   Adding bzip2 package run time required package for bzip2-devel package 

+-   Adding bzip2 package run time required package for bzip2-devel package.

 *   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2

 -   Update according to UsrMove.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.0.6-1

--   Initial build.	First version

+-   Initial build First version.

@@ -1,7 +1,7 @@

 Summary:	Programs that show the differences between files or directories

 Name:		diffutils

 Version:	3.6

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/diffutils

 Group:		System Environment/Base

@@ -9,21 +9,26 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz

 %define sha1 diffutils=1287a553868b808ebfff3790a5cdc6fdf7cb2886

-BuildRequires:	coreutils

+BuildRequires:  coreutils

+Conflicts:      toybox

+

 %description

 The Diffutils package contains programs that show the

 differences between files or directories.

 %prep

 %setup -q

 sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in

+

 %build

-./configure \

-	--prefix=%{_prefix} \

-	--disable-silent-rules

+

+%configure --disable-silent-rules

+

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 rm -rf %{buildroot}%{_infodir}

+

 %find_lang %{name}

 %check

@@ -34,16 +39,19 @@ make %{?_smp_mflags} check

 %defattr(-,root,root)

 %{_bindir}/*

 %{_mandir}/*/*

+

 %changelog

+*       Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 3.6-2

+-       Add conflicts toybox.

 *       Fri Aug 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 3.6-1

--       Update to version 3.6 to get it to build with gcc 7.3

+-       Update to version 3.6 to get it to build with gcc 7.3.

 *       Wed Apr 19 2017 Bo Gan <ganb@vmware.com> 3.5-1

--       Update to 3.5

+-       Update to 3.5.

 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 3.3-4

--       Modified %check

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3-3

--	GA - Bump release of all rpms

-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 3.3-2

--	Adding coreutils package to build requires

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.3-1

--	Initial build.	First version

+-       Modified %check.

+*       Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3-3

+-       GA Bump release of all rpms.

+*       Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 3.3-2

+-       Adding coreutils package to build requires.

+*       Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.3-1

+-       Initial build First version.

@@ -1,7 +1,7 @@

 Summary:        Contains the utilities for the ext2 file system

 Name:           e2fsprogs

 Version:        1.44.3

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2+

 URL:            http://e2fsprogs.sourceforge.net

 Group:          System Environment/Base

@@ -10,9 +10,10 @@ Distribution:   Photon

 Source0:        http://prdownloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz

 %define sha1    e2fsprogs=bfe11b75fee61c4d3795ac27eea11f9f7843294b

 Requires:       %{name}-libs = %{version}-%{release}

+Conflicts:      toybox

+

 %description

-The E2fsprogs package contains the utilities for handling

-the ext2 file system.

+The E2fsprogs package contains the utilities for handling the ext2 file system.

 %package    libs

 Summary:    contains libraries used by other packages

@@ -23,7 +24,7 @@ It contains the libraries: libss and libcom_err

 Summary:    Header and development files for e2fsprogs

 Requires:   %{name} = %{version}

 %description    devel

-It contains the libraries and header files to create applications 

+It contains the libraries and header files to create applications

 %package lang

 Summary: Additional language files for e2fsprogs

@@ -34,16 +35,13 @@ These are the additional language files of e2fsprogs

 %prep

 %setup -q

-install -vdm 755 build

 sed -i -e 's|^LD_LIBRARY_PATH.*|&:/tools/lib|' tests/test_config

 %build

-cd build

 LIBS=-L/tools/lib \

 CFLAGS=-I/tools/include \

 PKG_CONFIG_PATH=/tools/lib/pkgconfig \

-../configure \

-    --prefix=%{_prefix} \

+%configure \

     --with-root-prefix='' \

     --enable-elf-shlibs \

     --disable-libblkid \

@@ -55,20 +53,18 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \

 make %{?_smp_mflags}

 %install

-pushd build

 make DESTDIR=%{buildroot} install

 make DESTDIR=%{buildroot} install-libs

 chmod -v u+w %{buildroot}/%{_libdir}/{libcom_err,libe2p,libext2fs,libss}.a

 rm -rf %{buildroot}%{_infodir}

-popd

 %find_lang %{name}

 %check

-cd build

 make %{?_smp_mflags} check

 %post

 /sbin/ldconfig

+

 %postun

 /sbin/ldconfig

@@ -88,21 +84,17 @@ make %{?_smp_mflags} check

 %{_mandir}/man1/*

 %{_mandir}/man5/*

 %{_sbindir}/*

-/lib/libext2fs.so.2.4

-/lib/libe2p.so.2.3

-/lib/libe2p.so.2

-/lib/libext2fs.so.2

-/sbin/*

+%{_libdir}/libext2fs.so.2.4

+%{_libdir}/libe2p.so.2.3

+%{_libdir}/libe2p.so.2

+%{_libdir}/libext2fs.so.2

 %{_libdir}/libe2p.so

 %{_libdir}/libext2fs.so

 %files libs

-/lib/libss.so.2

-/lib/libcom_err.so.2.1

-/lib/libss.so.2.0

-/lib/libcom_err.so.2

-%{_libdir}/libcom_err.so

 %{_libdir}/libss.so

+%{_libdir}/libss.so.*

+%{_libdir}/libcom_err.*

 %files devel

 %{_includedir}/ss/ss_err.h

@@ -135,28 +127,29 @@ make %{?_smp_mflags} check

 %defattr(-,root,root)

 %changelog

+*   Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 1.44.3-2

+-   Add conflicts toybox.

 *   Mon Sep 10 2018 Alexey Makhalov <amakhalov@vmware.com> 1.44.3-1

--   Version update to fix compilation issue againts glibc-2.28

+-   Version update to fix compilation issue againts glibc-2.28.

 *   Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 1.43.4-2

 -   Add lang package.

 *   Mon Apr 03 2017 Chang Lee <changlee@vmware.com> 1.43.4-1

--   Updated to version 1.43.4

+-   Updated to version 1.43.4.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.42.13-5

 -   Moved man3 to devel subpackage.

 *   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 1.42.13-4

--   Create libs subpackage for krb5

+-   Create libs subpackage for krb5.

 *   Tue Sep 20 2016 Alexey Makhalov <amakhalov@vmware.com> 1.42.13-3

--   Use symlinks - save a diskspace

+-   Use symlinks - save a diskspace.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.42.13-2

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms.

 *   Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 1.42.13-1

--   Updated to version 1.42.13

+-   Updated to version 1.42.13.

 *   Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 1.42.9-4

 -   Edit post script.

 *   Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.42.9-3

--   Handled locale files with macro find_lang

+-   Handled locale files with macro find_lang.

 *   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.42.9-2

 -   Update according to UsrMove.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.42.9-1

--   Initial build. First version

-

+-   Initial build First version.

@@ -1,7 +1,7 @@

 Summary:	Key table files, console fonts, and keyboard utilities

 Name:		kbd

 Version:	2.0.4

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv2

 URL:		http://ftp.altlinux.org/pub/people/legion/kbd

 Group:		Applications/System

@@ -11,20 +11,22 @@ Source0:	http://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.xz

 %define sha1 kbd=cf5d45c62d6af70b8b1f210d89193b52f5efb05d

 Patch0:		kbd-2.0.4-backspace-1.patch

 BuildRequires:	check >= 0.9.4

+Conflicts:      toybox

+

 %description

 The Kbd package contains key-table files, console fonts, and keyboard utilities.

+

 %prep

 %setup -q

 %patch0 -p1

 sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure

 sed -i 's/resizecons.8 //'  docs/man/man8/Makefile.in

+

 %build

 PKG_CONFIG_PATH=/tools/lib/pkgconfig \

-./configure \

-	--prefix=%{_prefix} \

-	--disable-vlock \

-	--disable-silent-rules

+%configure --disable-vlock --disable-silent-rules

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 install -vdm 755 %{buildroot}%{_defaultdocdir}/%{name}-%{version}

@@ -46,14 +48,17 @@ make %{?_smp_mflags} check

 %{_datarootdir}/keymaps/*

 %{_datarootdir}/unimaps/*

 %{_mandir}/*/*

+

 %changelog

+*   Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 2.0.4-3

+-   Add conflict toybox.

 *   Mon Sep 11 2017 Anish Swaminathan <anishs@vmware.com> 2.0.4-2

--   Remove FAQs from main package

+-   Remove FAQs from main package.

 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 2.0.4-1

--   Updated to version 2.0.4

+-   Updated to version 2.0.4.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.3-2

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms.

 *   Wed Jan 13 2016 Xiaolin Li <xiaolinl@vmware.com> 2.0.3-1

--   Updated to version 2.0.3

+-   Updated to version 2.0.3.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.0.1-1

--   Initial build. First version

+-   Initial build First version.

@@ -1,39 +1,39 @@

-Summary:	GNU Parted manipulates partition tables

-Name:		parted

-Version:	3.2

-Release:	6%{?dist}

-License:	GPLv3+

-URL:		http://ftp.gnu.org/gnu/parted/parted-3.2.tar.xz

-Group:		Applications/System

-Vendor:		VMware, Inc.

-Distribution:	Photon

-Source0:	http://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz

+Summary:        GNU Parted manipulates partition tables

+Name:           parted

+Version:        3.2

+Release:        7%{?dist}

+License:        GPLv3+

+URL:            http://ftp.gnu.org/gnu/parted/parted-3.2.tar.xz

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz

 %define sha1 parted=8cabb2d6789badec15c857dcc003d0dd931a818b

+Conflicts:      toybox

+

 %description

 This is useful for creating space for new operating systems,

 reorganizing disk usage, copying data on hard disks and disk imaging.

 The package contains a library, libparted, as well as well as a

 command-line frontend, parted, which can also be used in scripts.

+

 %prep

 %setup -q

 %build

 #Add a header to allow building with glibc-2.28 or later

 sed -i '/utsname.h/a#include <sys/sysmacros.h>' libparted/arch/linux.c &&

-./configure \

-	--prefix=%{_prefix} \

-	--bindir=%{_bindir} \

-	--infodir=%{_infodir}/%{name}-%{version} \

-	--without-readline \

-	--disable-debug \

-	--disable-nls \

-	--disable-device-mapper

+

+%configure --without-readline --disable-debug \

+	   --disable-nls --disable-device-mapper

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 %post	-p /sbin/ldconfig

 %postun	-p /sbin/ldconfig

-%files 

+

+%files

 %defattr(-,root,root)

 %{_sbindir}/*

 %{_libdir}/*.a

@@ -42,18 +42,21 @@ make DESTDIR=%{buildroot} install

 %{_libdir}/*.so.*

 %{_libdir}/pkgconfig/*.pc

 %{_includedir}/*

-%{_infodir}/%{name}-%{version}/*

+%{_infodir}/*

 %{_datadir}/*

+

 %changelog

-* Sun Sep 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2-6

-- Fix compilation issue against glibc-2.28

-* Wed Aug 16 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-5

-- Fix summary and description

-* Tue Jun 06 2017 ChangLee <changlee@vmware.com> 3.2-4

-- Remove %check

-* Fri Oct 07 2016 ChangLee <changlee@vmware.com> 3.2-3

-- Modified %check

-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-2

-- GA - Bump release of all rpms

-* Wed Nov 12 2014 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.2-1

-- Initial version

+*  Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 3.2-7

+-  Add conflict toybox.

+*  Sun Sep 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2-6

+-  Fix compilation issue against glibc-2.28.

+*  Wed Aug 16 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-5

+-  Fix summary and description.

+*  Tue Jun 06 2017 ChangLee <changlee@vmware.com> 3.2-4

+-  Remove %check.

+*  Fri Oct 07 2016 ChangLee <changlee@vmware.com> 3.2-3

+-  Modified %check.

+*  Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2-2

+-  GA Bump release of all rpms.

+*  Wed Nov 12 2014 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.2-1

+-  Initial version.

@@ -1,43 +1,51 @@

-Summary:	Program for modifying or creating files

-Name:		patch

-Version:	2.7.6

-Release:	1%{?dist}

-License:	GPLv3+

-URL:		http://www.gnu.org/software/%{name}

-Source0:	ftp://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.gz

+Summary:        Program for modifying or creating files

+Name:           patch

+Version:        2.7.6

+Release:        2%{?dist}

+License:        GPLv3+

+URL:            http://www.gnu.org/software/%{name}

+Source0:        ftp://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.gz

 %define sha1 patch=0ed8f3e49d84964f27e27c712fc8780e291dfa60

-Group:		Development/Tools

-Vendor:		VMware, Inc.

-Distribution: 	Photon

+Group:          Development/Tools

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Conflicts:      toybox

+

 %description

 Program for modifying or creating files by applying a patch

 file typically created by the diff program.

+

 %prep

 %setup -q

+

 %build

-./configure \

-	--prefix=%{_prefix} \

-	--disable-silent-rules

+%configure --disable-silent-rules

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

+

 %check

 sed -i "s/ulimit -n 32/ulimit -n 1024/g" tests/deep-directories

 make  %{?_smp_mflags} check

+

 %files

 %defattr(-,root,root)

 %{_bindir}/*

 %{_mandir}/*/*

+

 %changelog

+*   Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 2.7.6-2

+-   Add conflicts toybox.

 *   Tue Sep 11 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 2.7.6-1

--   Upgrade to 2.7.6

+-   Upgrade to 2.7.6.

 *   Fri Apr 28 2017 Divya Thaluru <dthaluru@vmware.com> 2.7.5-4

--   Fixed ulimit in test script

+-   Fixed ulimit in test script.

 *   Fri Oct 07 2016 ChangLee <changlee@vmware.com> 2.7.5-3

--   Modified %check

+-   Modified %check.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.5-2

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms.

 *   Tue Aug 11 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.5-1

--   Updating to 2.7.5 version

+-   Updating to 2.7.5 version.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.7.1-1

--   Initial build. First version

+-   Initial build First version.

@@ -1,7 +1,7 @@

 Summary:        Programs for handling passwords in a secure way

 Name:           shadow

 Version:        4.6

-Release:        1%{?dist}

+Release:        3%{?dist}

 URL:            https://github.com/shadow-maint/

 License:        BSD

 Group:          Applications/System

@@ -33,16 +33,17 @@ The Shadow package contains programs for handling passwords

 in a secure way.

 %package tools

-Summary: Contains subset of tools which might be replaced by toybox

-Group:      Applications/System

-Requires: %{name} = %{version}-%{release}

+Summary:     Contains subset of tools which might be replaced by toybox

+Group:       Applications/System

+Requires:    %{name} = %{version}-%{release}

+Conflicts:   toybox

 %description tools

 Contains subset of tools which might be replaced by toybox

 %package lang

-Summary: Additional language files for shadow

-Group:      Applications/System

-Requires: %{name} = %{version}-%{release}

+Summary:     Additional language files for shadow

+Group:       Applications/System

+Requires:    %{name} = %{version}-%{release}

 %description lang

 These are the additional language files of shadow.

@@ -58,13 +59,10 @@ sed -i 's@DICTPATH.*@DICTPATH\t/usr/share/cracklib/pw_dict@' \

     etc/login.defs

 %build

-./configure \

-    --sysconfdir=/etc \

-    --with-libpam \

-        --with-libcrack \

-    --with-group-name-max-length=32

-

+%configure --sysconfdir=/etc --with-libpam \

+           --with-libcrack --with-group-name-max-length=32

 make %{?_smp_mflags}

+

 %install

 make DESTDIR=%{buildroot} install

 install -vdm 755 %{buildroot}/bin

@@ -116,6 +114,7 @@ do

     install -v -m644 %{buildroot}%{_sysconfdir}/pam.d/chage %{buildroot}%{_sysconfdir}/pam.d/${PROGRAM}

     sed -i "s/chage/$PROGRAM/" %{buildroot}%{_sysconfdir}/pam.d/${PROGRAM}

 done

+

 %find_lang %{name}

 %check

@@ -131,12 +130,13 @@ make %{?_smp_mflags} check

 %config(noreplace) /etc/login.access

 %config(noreplace) /etc/default/useradd

 %config(noreplace) /etc/limits

-/sbin/nologin

 %{_bindir}/*

 %{_sbindir}/*

 %{_mandir}/man1

 %{_mandir}/man5

 %{_mandir}/man8

+%exclude %{_bindir}/su

+%exclude %{_bindir}/login

 %exclude %{_mandir}/cs

 %exclude %{_mandir}/da

 %exclude %{_mandir}/de

@@ -159,59 +159,65 @@ make %{?_smp_mflags} check

 %files tools

 %defattr(-,root,root)

-/bin/*

+/bin/passwd

+%{_bindir}/su

+%{_bindir}/login

 %files lang -f %{name}.lang

 %defattr(-,root,root)

 %changelog

+*   Wed Oct 24 2018 Michelle Wang <michellew@vmware.com> 4.6-3

+-   Add su and login into shadow-tool.

+*   Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 4.6-2

+-   Add conflict toybox for shadow-tools.

 *   Wed Sep 19 2018 Srinidhi Rao <srinidhir@vmware.com> 4.6-1

--   Upgrading the version to 4.6

+-   Upgrading the version to 4.6.

 *   Mon Jul 30 2018 Tapas Kundu <tkundu@vmware.com> 4.2.1-16

--   Added fix for CVE-2018-7169

+-   Added fix for CVE-2018-7169.

 *   Fri Apr 20 2018 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-15

 -   Move pam.d config file to here for better tracking.

 -   Add pam_loginuid module as optional in a session.

 *   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-14

--   Added -tools subpackage

--   Main package requires -tools or toybox

+-   Added -tools subpackage.

+-   Main package requires -tools or toybox.

 *   Tue Aug 15 2017 Anish Swaminathan <anishs@vmware.com> 4.2.1-13

--   Added fix for CVE-2017-12424, CVE-2016-6252

+-   Added fix for CVE-2017-12424, CVE-2016-6252.

 *   Thu Apr 27 2017 Divya Thaluru <dthaluru@vmware.com> 4.2.1-12

--   Allow '.' in username

+-   Allow '.' in username.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 4.2.1-11

--   BuildRequires Linux-PAM-devel

+-   BuildRequires Linux-PAM-devel.

 *   Wed Nov 23 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-10

--   Added -lang subpackage

-*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 4.2.1-9

--   Modified %check

+-   Added -lang subpackage.

+*   Tue Oct 04 2016 ChangLee <changlee@vmware.com> 4.2.1-9

+-   Modified %check.

 *   Tue Jun 21 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-8

--   Added logic to not replace pam.d conf files in upgrade scenario

+-   Added logic to not replace pam.d conf files in upgrade scenario.

 *   Fri May 27 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-7

--   Adding pam_cracklib module as requisite to pam password configuration

+-   Adding pam_cracklib module as requisite to pam password configuration.

 *   Wed May 25 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-6

--   Modifying pam_systemd module as optional in a session

+-   Modifying pam_systemd module as optional in a session.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.1-5

--   GA - Bump release of all rpms

+-   GA Bump release of all rpms.

 *   Mon May 2 2016 Xiaolin Li <xiaolinl@vmware.com> 4.2.1-4

 -   Enabling pam_systemd module in a session.

 *   Fri Apr 29 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-3

--   Setting password aging limits to 90 days

+-   Setting password aging limits to 90 days.

 *   Wed Apr 27 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-3

--   Setting password aging limits to 365 days

+-   Setting password aging limits to 365 days.

 *   Wed Mar 23 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.1-2

--   Enabling pam_limits module in a session

+-   Enabling pam_limits module in a session.

 *   Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 4.2.1-1

--   Update version

+-   Update version.

 *   Wed Dec 2 2015 Divya Thaluru <dthaluru@vmware.com> 4.1.5.1-6

--   Fixed PAM Configuration file for passwd

+-   Fixed PAM Configuration file for passwd.

 *   Mon Oct 26 2015 Sharath George <sharathg@vmware.com> 4.1.5.1-5

 -   Allow mixed case in username.

 *   Mon Jun 29 2015 Divya Thaluru <dthaluru@vmware.com> 4.1.5.1-4

--   Fixed PAM Configuration file for chpasswd

+-   Fixed PAM Configuration file for chpasswd.

 *   Tue Jun 16 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.5.1-3

--   Use group id 100(users) by default

+-   Use group id 100(users) by default.

 *   Wed May 27 2015 Divya Thaluru <dthaluru@vmware.com> 4.1.5.1-2

--   Adding PAM support

+-   Adding PAM support.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.1.5.1-1

--   Initial build. First version

+-   Initial build First version.

@@ -3,7 +3,7 @@

 Summary:        Text editor

 Name:           vim

 Version:        8.1.0388

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Charityware

 URL:            http://www.vim.org

 Group:          Applications/Editors

@@ -20,6 +20,7 @@ The Vim package contains a powerful text editor.

 Summary:    Extra files for Vim text editor

 Group:      Applications/Editors

 Requires:   tcsh

+Conflicts:  toybox

 %description extra

 The vim extra package contains a extra files for powerful text editor.

@@ -29,10 +30,10 @@ The vim extra package contains a extra files for powerful text editor.

 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h

 %build

-./configure \

-    --prefix=%{_prefix} \

-    --enable-multibyte

+

+%configure --enable-multibyte

 make VERBOSE=1 %{?_smp_mflags}

+

 %install

 #cd %{_builddir}/%{name}74

 make DESTDIR=%{buildroot} install

@@ -172,28 +173,30 @@ make test

 %{_bindir}/vimdiff

 %changelog

+*   Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 8.1.0388-2

+-   Add conflicts toybox for vim-extra.

 *   Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 8.1.0388-1

--   Update to version 8.1.0388

+-   Update to version 8.1.0388.

 *   Tue Jul 10 2018 Tapas Kundu <tkundu@vmware.com> 8.0.0533-4

 -   Fix for CVE-2017-17087 and CVE-2017-1000382.

 *   Mon Aug 14 2017 Chang Lee <changlee@vmware.com>  8.0.0533-3

--   Disabled Test_recover_root_dir in %check

+-   Disabled Test_recover_root_dir in %check.

 *   Tue May 02 2017 Anish Swaminathan <anishs@vmware.com>  8.0.0533-2

--   Remove tcsh requires

+-   Remove tcsh requires.

 *   Fri Apr 14 2017 Xiaolin Li <xiaolinl@vmware.com> 8.0.0533-1

 -   Updated to version 8.0.0533.

 *   Tue Feb 28 2017 Anish Swaminathan <anishs@vmware.com>  7.4-10

--   Fix for CVE-2017-6349 and CVE-2017-6350

+-   Fix for CVE-2017-6349 and CVE-2017-6350.

 *   Fri Feb 17 2017 Anish Swaminathan <anishs@vmware.com>  7.4-9

--   Fix for CVE-2017-5953

+-   Fix for CVE-2017-5953.

 *   Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  7.4-8

--   Fix for CVE-2016-1248

+-   Fix for CVE-2016-1248.

 *   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 7.4-7

--   Modified %check

+-   Modified %check.

 *   Wed Aug 24 2016 Alexey Makhalov <amakhalov@vmware.com> 7.4-6

--   vimrc: Added tags search, tab->spaces and some bindings

+-   vimrc: Added tags search, tab->spaces and some bindings.

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.4-5

--   GA - Bump release of all rpms

+-   GA - Bump release of all rpms.

 *   Thu Jul 16 2015 Touseef Liaqat <tliaqat@vmware.com> 7.4-3

 -   Added profile related files in minimal vim package.

 *   Tue Jun 30 2015 Touseef Liaqat <tliaqat@vmware.com> 7.4-3

@@ -201,4 +204,4 @@ make test

 *   Fri Jun 19 2015 Alexey Makhalov <amakhalov@vmware.com> 7.4-2

 -   Disable debug package. Use 'desert' colorscheme.

 *   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 7.4-1

--   Initial build. First version

+-   Initial build First version.

@@ -52,7 +52,7 @@ function check-for-bogus-dates()

   local y=''

   local epoch_seconds=''

-  sed -e '1,/%changelog/d' "$1" | grep -v '^[[:space:]]*-' | awk '{printf "%s %s %02d %04d\n", $2, $3, $4, $5}' | \

+  sed -e '1,/%changelog/d' "$1" | grep '^\*' | awk '{printf "%s %s %02d %04d\n", $2, $3, $4, $5}' | \

   while read D m d y

   do

     day=$(date --date="$m $d $y" '+%a')