1. photon
  2. Commit 82d6dba520e09f7f89f3e0db6d6ea20dd2fcb221
Browse code

dracut, elfutils, ethtool, toybox: versions update

Change-Id: Idf3b20b56fffd8ddbf8c51623c2994ffe008846c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5834
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Alexey Makhalov authored on 2018/10/02 06:27:17
Showing 7 changed files
SPECS/dracut/dracut.spec
History View file @ 82d6dba
... ... 
@@ -4,20 +4,16 @@
4 4 
 %define _unitdir /usr/lib/systemd/system
5 5
6 6 
 Name:           dracut
7 
-Version:        045
8 
-Release:        6%{?dist}
7 
+Version:        048
8 
+Release:        1%{?dist}
9 9 
 Group:          System Environment/Base
10 10 
 # The entire source code is GPLv2+
11 11 
 # except install/* which is LGPLv2+
12 12 
 License:        GPLv2+ and LGPLv2+
13 13 
 URL:            https://dracut.wiki.kernel.org/
14 
-# Source can be generated by
15 
-# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
16 
-Source0:        http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.gz
17 
-%define sha1    dracut=f28e531f514c11ee7f042a9d9d52e3f067ab9a74
18 
-Source1:        https://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
19 
-%define sha1    asciidoc=82e574dd061640561fa0560644bc74df71fb7305
20 
-Patch0:         https://www.gnu.org/licenses/lgpl-2.1.txt
14 
+Source0:        http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
15 
+%define sha1    dracut=70daaf4ef1175c87ab35ec76bb84ca1388a13a5d
16 
+Source1:        https://www.gnu.org/licenses/lgpl-2.1.txt
21 17 
 Patch1:         disable-xattr.patch
22 18 
 Patch2:         fix-initrd-naming-for-photon.patch
23 19 
 Summary:        dracut to create initramfs
... ... 
@@ -26,6 +22,7 @@ Distribution:   Photon
26 26 
 BuildRequires:  bash git
27 27 
 BuildRequires:  pkg-config
28 28 
 BuildRequires:  kmod-devel
29 
+BuildRequires:  asciidoc
29 30 
 Requires:       bash >= 4
30 31 
 Requires:       (coreutils or toybox)
31 32 
 Requires:       kmod
... ... 
@@ -52,8 +49,7 @@ This package contains tools to assemble the local initrd and host configuration.
52 52
53 53 
 %prep
54 54 
 %setup -q -n %{name}-%{version}
55 
-cp %{PATCH0} .
56 
-tar xf %{SOURCE1} --no-same-owner
55 
+cp %{SOURCE1} .
57 56 
 %patch1 -p1
58 57 
 %patch2 -p1
59 58
... ... 
@@ -101,12 +97,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
101 101 
 ln -sr $RPM_BUILD_ROOT%{_bindir}/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
102 102
103 103 
 %check
104 
-pushd asciidoc-8.6.9
105 
-autoconf
106 
-./configure
107 
-make
108 
-make install
109 
-popd
110 104 
 make %{?_smp_mflags} -k clean  check
111 105 
 %clean
112 106 
 rm -rf -- $RPM_BUILD_ROOT
... ... 
@@ -168,6 +158,8 @@ rm -rf -- $RPM_BUILD_ROOT
168 168 
 %dir /var/lib/dracut/overlay
169 169
170 170 
 %changelog
171 
+*   Mon Oct 01 2018 Alexey Makhalov <amakhalov@vmware.com> 048-1
172 
+-   Version update
171 173 
 *   Thu Dec 28 2017 Divya Thaluru <dthaluru@vmware.com>  045-6
172 174 
 -   Fixed the log file directory structure
173 175 
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 045-5
SPECS/elfutils/elfutils.spec
History View file @ 82d6dba
... ... 
@@ -1,13 +1,13 @@
1 1 
 # -*- rpm-spec-*-
2 2 
 Summary:	A collection of utilities and DSOs to handle compiled objects
3 3 
 Name:		elfutils
4 
-Version:	0.169
5 
-Release:	2%{?dist}
4 
+Version:	0.174
5 
+Release:	1%{?dist}
6 6 
 License:	GPLv3+ and (GPLv2+ or LGPLv3+)
7 7 
 Group:		Development/Tools
8 8 
 URL:    	https://sourceware.org/elfutils
9 9 
 Source0:	https://sourceware.org/elfutils/ftp/%{version}/%{name}-%{version}.tar.bz2
10 
-%define sha1 elfutils=4977019aece471362dbdd28a27ef1030471dff84
10 
+%define sha1 elfutils=95899ce5fa55002e46bf4e02d01a249516e296fd
11 11 
 Vendor:		VMware, Inc.
12 12 
 Distribution:	Photon
13 13
... ... 
@@ -195,6 +195,8 @@ rm -rf ${RPM_BUILD_ROOT}
195 195 
 %defattr(-,root,root)
196 196
197 197 
 %changelog
198 
+* Mon Oct 01 2018 Alexey Makhalov <amakhalov@vmware.com> 0.174-1
199 
+- Version update
198 200 
 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.169-2
199 201 
 - Requires bzip2-libs
200 202 
 * Tue Jul 11 2017 Divya Thaluru <dthaluru@vmware.com> 0.169-1
SPECS/ethtool/ethtool.spec
History View file @ 82d6dba
... ... 
@@ -1,26 +1,25 @@
1 
-Summary:	ethtool is the standard Linux utility for controlling network drivers and hardware, particularly for wired Ethernet devices.
1 
+Summary:	Standard Linux utility for controlling network drivers and hardware
2 2 
 Name:		ethtool
3 
-Version:	4.8
3 
+Version:	4.18
4 4 
 Release:	1%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		https://www.kernel.org/pub/software/network/ethtool/
7 7 
 Group:		Productivity/Networking/Diagnostic
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 
-Source0:	https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.gz
11 
-%define sha1 ethtool=6ae18bac4f3a66c458142d0c3c438ebade757afb
12 
-#BuildRequires: python2 python2-libs
10 
+Source0:	https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz
11 
+%define sha1 ethtool=11b902b6f1a90e11da3cbcf4b44525bd19e994d1
13 12
14 13 
 %description
15 
- ethtool is the standard Linux utility for controlling network drivers and hardware, particularly for wired Ethernet devices
14 
+ethtool is the standard Linux utility for controlling network drivers and hardware,
15 
+particularly for wired Ethernet devices
16 16
17 17 
 %prep
18 18 
 %setup -q
19 19
20 20 
 %build
21 21 
 autoreconf -fi
22 
-#export CFLAGS="$RPM_OPT_FLAGS -W -Wall -Wstrict-prototypes -Wformat-security -Wpointer-arith"
23 
-./configure --prefix=%{_prefix} --sbindir=/sbin
22 
+%configure --sbindir=/sbin
24 23 
 make %{?_smp_mflags}
25 24
26 25 
 %install
... ... 
@@ -39,11 +38,13 @@ rm -rf %{buildroot}/*
39 39 
 %{_mandir}
40 40
41 41 
 %changelog
42 
-*	Mon Apr 03 2017 Chang Lee <changlee@vmware.com> 4.8-1
43 
--	Upgraded to version 4.8
44 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2-3
45 
--	GA - Bump release of all rpms
46 
-*   	Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 4.2-2
47 
--   	Change file packaging.
48 
-*	Mon Nov 30 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2-1
49 
--	Initial build.	First version
42 
+* Mon Oct 01 2018 Alexey Makhalov <amakhalov@vmware.com> 4.18-1
43 
+- Version update
44 
+* Mon Apr 03 2017 Chang Lee <changlee@vmware.com> 4.8-1
45 
+- Upgraded to version 4.8
46 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2-3
47 
+- GA - Bump release of all rpms
48 
+* Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 4.2-2
49 
+- Change file packaging.
50 
+* Mon Nov 30 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2-1
51 
+- Initial build. First version
SPECS/toybox/config-0.7.3
History View file @ 82d6dba
50 52 
deleted file mode 100644
... ... 
@@ -1,356 +0,0 @@
1 
-#
2 
-# Automatically generated make config: don't edit
3 
-# ToyBox version: KCONFIG_VERSION
4 
-# Mon Oct  2 13:59:43 2017
5 
-#
6 
-# CONFIG_TOYBOX_CONTAINER is not set
7 
-CONFIG_TOYBOX_FIFREEZE=y
8 
-CONFIG_TOYBOX_ICONV=y
9 
-CONFIG_TOYBOX_FALLOCATE=y
10 
-CONFIG_TOYBOX_UTMPX=y
11 
-CONFIG_TOYBOX_SHADOW=y
12 
-# CONFIG_TOYBOX_ON_ANDROID is not set
13 
-CONFIG_TOYBOX_FORK=y
14 
-# CONFIG_TOYBOX_PRLIMIT is not set
15 
-
16 
-#
17 
-# Posix commands
18 
-#
19 
-CONFIG_BASENAME=y
20 
-CONFIG_CAL=y
21 
-CONFIG_CAT=y
22 
-# CONFIG_CAT_V is not set
23 
-CONFIG_CATV=y
24 
-CONFIG_CHGRP=y
25 
-CONFIG_CHOWN=y
26 
-CONFIG_CHMOD=y
27 
-CONFIG_CKSUM=y
28 
-CONFIG_CMP=y
29 
-CONFIG_COMM=y
30 
-CONFIG_CP=y
31 
-CONFIG_CP_PRESERVE=y
32 
-CONFIG_MV=y
33 
-CONFIG_INSTALL=y
34 
-CONFIG_CPIO=y
35 
-CONFIG_CUT=y
36 
-CONFIG_DATE=y
37 
-CONFIG_DF=y
38 
-CONFIG_DIRNAME=y
39 
-CONFIG_DU=y
40 
-CONFIG_ECHO=y
41 
-CONFIG_ENV=y
42 
-CONFIG_EXPAND=y
43 
-CONFIG_FALSE=y
44 
-CONFIG_FILE=y
45 
-CONFIG_FIND=y
46 
-CONFIG_GREP=y
47 
-CONFIG_EGREP=y
48 
-CONFIG_FGREP=y
49 
-CONFIG_HEAD=y
50 
-CONFIG_ID=y
51 
-# CONFIG_ID_Z is not set
52 
-CONFIG_GROUPS=y
53 
-CONFIG_LOGNAME=y
54 
-CONFIG_WHOAMI=y
55 
-CONFIG_KILL=y
56 
-CONFIG_KILLALL5=y
57 
-CONFIG_LINK=y
58 
-CONFIG_LN=y
59 
-CONFIG_LS=y
60 
-CONFIG_LS_COLOR=y
61 
-CONFIG_MKDIR=y
62 
-# CONFIG_MKDIR_Z is not set
63 
-CONFIG_MKFIFO=y
64 
-# CONFIG_MKFIFO_Z is not set
65 
-CONFIG_NICE=y
66 
-CONFIG_NL=y
67 
-CONFIG_NOHUP=y
68 
-CONFIG_OD=y
69 
-CONFIG_PASTE=y
70 
-CONFIG_PATCH=y
71 
-CONFIG_PRINTF=y
72 
-CONFIG_PS=y
73 
-CONFIG_TOP=y
74 
-CONFIG_IOTOP=y
75 
-CONFIG_TOP_COMMON=y
76 
-CONFIG_PGREP=y
77 
-CONFIG_PKILL=y
78 
-CONFIG_PGKILL_COMMON=y
79 
-CONFIG_PWD=y
80 
-CONFIG_RENICE=y
81 
-CONFIG_RM=y
82 
-CONFIG_RMDIR=y
83 
-CONFIG_SED=y
84 
-CONFIG_SLEEP=y
85 
-CONFIG_SLEEP_FLOAT=y
86 
-CONFIG_SORT=y
87 
-CONFIG_SORT_BIG=y
88 
-CONFIG_SORT_FLOAT=y
89 
-CONFIG_SPLIT=y
90 
-# CONFIG_STRINGS is not set
91 
-CONFIG_TAIL=y
92 
-CONFIG_TAIL_SEEK=y
93 
-CONFIG_TEE=y
94 
-CONFIG_TIME=y
95 
-CONFIG_TOUCH=y
96 
-CONFIG_TRUE=y
97 
-CONFIG_TTY=y
98 
-# CONFIG_ULIMIT is not set
99 
-CONFIG_UNAME=y
100 
-CONFIG_UNIQ=y
101 
-CONFIG_UNLINK=y
102 
-CONFIG_UUDECODE=y
103 
-CONFIG_UUENCODE=y
104 
-CONFIG_WC=y
105 
-CONFIG_WHO=y
106 
-CONFIG_XARGS=y
107 
-# CONFIG_XARGS_PEDANTIC is not set
108 
-
109 
-#
110 
-# pending (see toys/pending/README)
111 
-#
112 
-# CONFIG_ARP is not set
113 
-# CONFIG_ARPING is not set
114 
-# CONFIG_BOOTCHARTD is not set
115 
-# CONFIG_BRCTL is not set
116 
-# CONFIG_CHRT is not set
117 
-# CONFIG_COMPRESS is not set
118 
-# CONFIG_GZIP is not set
119 
-# CONFIG_GZIP_D is not set
120 
-# CONFIG_DECOMPRESS is not set
121 
-# CONFIG_ZCAT is not set
122 
-# CONFIG_GUNZIP is not set
123 
-# CONFIG_CROND is not set
124 
-# CONFIG_CRONTAB is not set
125 
-# CONFIG_DD is not set
126 
-# CONFIG_DHCP6 is not set
127 
-# CONFIG_DHCP is not set
128 
-# CONFIG_DHCPD is not set
129 
-# CONFIG_DEBUG_DHCP is not set
130 
-# CONFIG_DIFF is not set
131 
-# CONFIG_DMESG is not set
132 
-# CONFIG_DUMPLEASES is not set
133 
-# CONFIG_EXPR is not set
134 
-# CONFIG_FDISK is not set
135 
-# CONFIG_FOLD is not set
136 
-# CONFIG_FSCK is not set
137 
-# CONFIG_GETFATTR is not set
138 
-# CONFIG_GETTY is not set
139 
-# CONFIG_GROUPADD is not set
140 
-# CONFIG_GROUPDEL is not set
141 
-# CONFIG_HOST is not set
142 
-# CONFIG_ICONV is not set
143 
-# CONFIG_INIT is not set
144 
-# CONFIG_IP is not set
145 
-# CONFIG_IPCRM is not set
146 
-# CONFIG_IPCS is not set
147 
-# CONFIG_KLOGD is not set
148 
-# CONFIG_KLOGD_SOURCE_RING_BUFFER is not set
149 
-# CONFIG_LAST is not set
150 
-# CONFIG_LOGGER is not set
151 
-# CONFIG_LSOF is not set
152 
-# CONFIG_MDEV is not set
153 
-# CONFIG_MDEV_CONF is not set
154 
-# CONFIG_MKE2FS is not set
155 
-# CONFIG_MKE2FS_JOURNAL is not set
156 
-# CONFIG_MKE2FS_GEN is not set
157 
-# CONFIG_MKE2FS_LABEL is not set
158 
-# CONFIG_MKE2FS_EXTENDED is not set
159 
-# CONFIG_MODPROBE is not set
160 
-# CONFIG_MORE is not set
161 
-# CONFIG_OPENVT is not set
162 
-# CONFIG_DEALLOCVT is not set
163 
-# CONFIG_PING is not set
164 
-# CONFIG_ROUTE is not set
165 
-# CONFIG_SETFATTR is not set
166 
-# CONFIG_SH is not set
167 
-# CONFIG_CD is not set
168 
-# CONFIG_EXIT is not set
169 
-# CONFIG_SULOGIN is not set
170 
-# CONFIG_SYSLOGD is not set
171 
-# CONFIG_TAR is not set
172 
-# CONFIG_TCPSVD is not set
173 
-# CONFIG_TELNET is not set
174 
-# CONFIG_TELNETD is not set
175 
-# CONFIG_TEST is not set
176 
-# CONFIG_TFTP is not set
177 
-# CONFIG_TFTPD is not set
178 
-# CONFIG_TRACEROUTE is not set
179 
-# CONFIG_TR is not set
180 
-# CONFIG_USERADD is not set
181 
-# CONFIG_USERDEL is not set
182 
-# CONFIG_VI is not set
183 
-# CONFIG_WATCH is not set
184 
-# CONFIG_WGET is not set
185 
-# CONFIG_XZCAT is not set
186 
-
187 
-#
188 
-# Other commands
189 
-#
190 
-CONFIG_ACPI=y
191 
-# CONFIG_ASCII is not set
192 
-CONFIG_BASE64=y
193 
-CONFIG_BLKID=y
194 
-CONFIG_FSTYPE=y
195 
-CONFIG_BLOCKDEV=y
196 
-CONFIG_BUNZIP2=y
197 
-CONFIG_BZCAT=y
198 
-# CONFIG_CHCON is not set
199 
-CONFIG_CHROOT=y
200 
-CONFIG_CHVT=y
201 
-# CONFIG_CLEAR is not set
202 
-CONFIG_COUNT=y
203 
-CONFIG_DOS2UNIX=y
204 
-CONFIG_UNIX2DOS=y
205 
-CONFIG_EJECT=y
206 
-CONFIG_FACTOR=y
207 
-CONFIG_FALLOCATE=y
208 
-CONFIG_FLOCK=y
209 
-CONFIG_FREE=y
210 
-CONFIG_FREERAMDISK=y
211 
-CONFIG_FSFREEZE=y
212 
-CONFIG_FSYNC=y
213 
-CONFIG_HELP=y
214 
-CONFIG_HELP_EXTRAS=y
215 
-CONFIG_HEXEDIT=y
216 
-CONFIG_HWCLOCK=y
217 
-CONFIG_INOTIFYD=y
218 
-# CONFIG_INSMOD is not set
219 
-CONFIG_IONICE=y
220 
-CONFIG_IORENICE=y
221 
-CONFIG_LOGIN=y
222 
-CONFIG_LOSETUP=y
223 
-CONFIG_LSATTR=y
224 
-CONFIG_CHATTR=y
225 
-# CONFIG_LSMOD is not set
226 
-CONFIG_LSPCI=y
227 
-CONFIG_LSPCI_TEXT=y
228 
-CONFIG_LSUSB=y
229 
-CONFIG_MAKEDEVS=y
230 
-CONFIG_MIX=y
231 
-CONFIG_MKPASSWD=y
232 
-CONFIG_MKSWAP=y
233 
-# CONFIG_MODINFO is not set
234 
-CONFIG_MOUNTPOINT=y
235 
-CONFIG_NBD_CLIENT=y
236 
-# CONFIG_UNSHARE is not set
237 
-# CONFIG_NSENTER is not set
238 
-CONFIG_ONEIT=y
239 
-CONFIG_PARTPROBE=y
240 
-CONFIG_PIVOT_ROOT=y
241 
-CONFIG_PMAP=y
242 
-CONFIG_PRINTENV=y
243 
-CONFIG_PWDX=y
244 
-CONFIG_READAHEAD=y
245 
-CONFIG_READLINK=y
246 
-CONFIG_REALPATH=y
247 
-# CONFIG_REBOOT is not set
248 
-# CONFIG_RESET is not set
249 
-CONFIG_REV=y
250 
-# CONFIG_RMMOD is not set
251 
-CONFIG_SETSID=y
252 
-CONFIG_SHRED=y
253 
-CONFIG_STAT=y
254 
-CONFIG_SWAPOFF=y
255 
-CONFIG_SWAPON=y
256 
-CONFIG_SWITCH_ROOT=y
257 
-CONFIG_SYSCTL=y
258 
-CONFIG_TAC=y
259 
-CONFIG_NPROC=y
260 
-CONFIG_TASKSET=y
261 
-CONFIG_TIMEOUT=y
262 
-CONFIG_TRUNCATE=y
263 
-CONFIG_UPTIME=y
264 
-# CONFIG_USLEEP is not set
265 
-CONFIG_VCONFIG=y
266 
-CONFIG_VMSTAT=y
267 
-CONFIG_W=y
268 
-CONFIG_WHICH=y
269 
-CONFIG_XXD=y
270 
-CONFIG_YES=y
271 
-
272 
-#
273 
-# Networking
274 
-#
275 
-CONFIG_FTPGET=y
276 
-CONFIG_FTPPUT=y
277 
-CONFIG_IFCONFIG=y
278 
-CONFIG_MICROCOM=y
279 
-CONFIG_NETCAT=y
280 
-CONFIG_NETCAT_LISTEN=y
281 
-CONFIG_NETSTAT=y
282 
-CONFIG_RFKILL=y
283 
-CONFIG_TUNCTL=y
284 
-
285 
-#
286 
-# Linux Standard Base commands
287 
-#
288 
-CONFIG_HOSTNAME=y
289 
-CONFIG_KILLALL=y
290 
-CONFIG_MD5SUM=y
291 
-CONFIG_SHA1SUM=y
292 
-# CONFIG_SHA224SUM is not set
293 
-# CONFIG_SHA256SUM is not set
294 
-# CONFIG_SHA384SUM is not set
295 
-# CONFIG_SHA512SUM is not set
296 
-CONFIG_MKNOD=y
297 
-# CONFIG_MKNOD_Z is not set
298 
-CONFIG_MKTEMP=y
299 
-CONFIG_MOUNT=y
300 
-CONFIG_PASSWD=y
301 
-# CONFIG_PASSWD_SAD is not set
302 
-CONFIG_PIDOF=y
303 
-CONFIG_SEQ=y
304 
-CONFIG_SU=y
305 
-CONFIG_SYNC=y
306 
-CONFIG_UMOUNT=y
307 
-
308 
-#
309 
-# Example commands
310 
-#
311 
-# CONFIG_HELLO is not set
312 
-# CONFIG_HOSTID is not set
313 
-# CONFIG_SKELETON is not set
314 
-# CONFIG_SKELETON_ALIAS is not set
315 
-# CONFIG_TEST_HUMAN_READABLE is not set
316 
-# CONFIG_TEST_MANY_OPTIONS is not set
317 
-# CONFIG_TEST_SCANKEY is not set
318 
-
319 
-#
320 
-# Android
321 
-#
322 
-# CONFIG_GETENFORCE is not set
323 
-# CONFIG_GETPROP is not set
324 
-# CONFIG_LOAD_POLICY is not set
325 
-# CONFIG_LOG is not set
326 
-# CONFIG_RESTORECON is not set
327 
-# CONFIG_RUNCON is not set
328 
-# CONFIG_SENDEVENT is not set
329 
-# CONFIG_SETENFORCE is not set
330 
-# CONFIG_SETPROP is not set
331 
-# CONFIG_START is not set
332 
-# CONFIG_STOP is not set
333 
-
334 
-#
335 
-#
336 
-#
337 
-
338 
-#
339 
-# Toybox global settings
340 
-#
341 
-CONFIG_TOYBOX=y
342 
-CONFIG_TOYBOX_SUID=y
343 
-CONFIG_TOYBOX_LSM_NONE=y
344 
-# CONFIG_TOYBOX_SELINUX is not set
345 
-# CONFIG_TOYBOX_SMACK is not set
346 
-# CONFIG_TOYBOX_LIBCRYPTO is not set
347 
-CONFIG_TOYBOX_FLOAT=y
348 
-CONFIG_TOYBOX_HELP=y
349 
-CONFIG_TOYBOX_HELP_DASHDASH=y
350 
-# CONFIG_TOYBOX_I18N is not set
351 
-# CONFIG_TOYBOX_FREE is not set
352 
-# CONFIG_TOYBOX_NORECURSE is not set
353 
-# CONFIG_TOYBOX_DEBUG is not set
354 
-CONFIG_TOYBOX_UID_SYS=100
355 
-CONFIG_TOYBOX_UID_USR=500
356 
-# CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set
SPECS/toybox/config-toybox
History View file @ 82d6dba
357 1 
new file mode 100644
... ... 
@@ -0,0 +1,362 @@
0 
+#
1 
+# Automatically generated make config: don't edit
2 
+# ToyBox version: KCONFIG_VERSION
3 
+# Mon Oct  1 21:44:17 2018
4 
+#
5 
+# CONFIG_TOYBOX_CONTAINER is not set
6 
+CONFIG_TOYBOX_FIFREEZE=y
7 
+CONFIG_TOYBOX_ICONV=y
8 
+CONFIG_TOYBOX_FALLOCATE=y
9 
+CONFIG_TOYBOX_UTMPX=y
10 
+CONFIG_TOYBOX_SHADOW=y
11 
+# CONFIG_TOYBOX_ON_ANDROID is not set
12 
+# CONFIG_TOYBOX_ANDROID_SCHEDPOLICY is not set
13 
+CONFIG_TOYBOX_FORK=y
14 
+# CONFIG_TOYBOX_PRLIMIT is not set
15 
+
16 
+#
17 
+# Posix commands
18 
+#
19 
+CONFIG_BASENAME=y
20 
+CONFIG_CAL=y
21 
+CONFIG_CAT=y
22 
+# CONFIG_CAT_V is not set
23 
+CONFIG_CATV=y
24 
+CONFIG_CHGRP=y
25 
+CONFIG_CHOWN=y
26 
+CONFIG_CHMOD=y
27 
+CONFIG_CKSUM=y
28 
+# CONFIG_CRC32 is not set
29 
+CONFIG_CMP=y
30 
+CONFIG_COMM=y
31 
+CONFIG_CP=y
32 
+CONFIG_CP_PRESERVE=y
33 
+CONFIG_MV=y
34 
+CONFIG_INSTALL=y
35 
+CONFIG_CPIO=y
36 
+CONFIG_CUT=y
37 
+CONFIG_DATE=y
38 
+CONFIG_DF=y
39 
+CONFIG_DIRNAME=y
40 
+CONFIG_DU=y
41 
+CONFIG_ECHO=y
42 
+CONFIG_ENV=y
43 
+CONFIG_EXPAND=y
44 
+CONFIG_FALSE=y
45 
+CONFIG_FILE=y
46 
+CONFIG_FIND=y
47 
+# CONFIG_GETCONF is not set
48 
+CONFIG_GREP=y
49 
+CONFIG_EGREP=y
50 
+CONFIG_FGREP=y
51 
+CONFIG_HEAD=y
52 
+# CONFIG_ICONV is not set
53 
+CONFIG_ID=y
54 
+# CONFIG_ID_Z is not set
55 
+CONFIG_GROUPS=y
56 
+CONFIG_LOGNAME=y
57 
+CONFIG_WHOAMI=y
58 
+CONFIG_KILL=y
59 
+CONFIG_KILLALL5=y
60 
+CONFIG_LINK=y
61 
+CONFIG_LN=y
62 
+# CONFIG_LOGGER is not set
63 
+CONFIG_LS=y
64 
+CONFIG_LS_COLOR=y
65 
+CONFIG_MKDIR=y
66 
+# CONFIG_MKDIR_Z is not set
67 
+CONFIG_MKFIFO=y
68 
+# CONFIG_MKFIFO_Z is not set
69 
+CONFIG_NICE=y
70 
+CONFIG_NL=y
71 
+CONFIG_NOHUP=y
72 
+CONFIG_OD=y
73 
+CONFIG_PASTE=y
74 
+CONFIG_PATCH=y
75 
+CONFIG_PRINTF=y
76 
+CONFIG_PS=y
77 
+CONFIG_TOP=y
78 
+CONFIG_IOTOP=y
79 
+CONFIG_PGREP=y
80 
+CONFIG_PKILL=y
81 
+CONFIG_PWD=y
82 
+CONFIG_RENICE=y
83 
+CONFIG_RM=y
84 
+CONFIG_RMDIR=y
85 
+CONFIG_SED=y
86 
+CONFIG_SLEEP=y
87 
+CONFIG_SLEEP_FLOAT=y
88 
+CONFIG_SORT=y
89 
+CONFIG_SORT_BIG=y
90 
+CONFIG_SORT_FLOAT=y
91 
+CONFIG_SPLIT=y
92 
+# CONFIG_STRINGS is not set
93 
+CONFIG_TAIL=y
94 
+CONFIG_TAIL_SEEK=y
95 
+CONFIG_TEE=y
96 
+CONFIG_TIME=y
97 
+CONFIG_TOUCH=y
98 
+CONFIG_TRUE=y
99 
+CONFIG_TTY=y
100 
+# CONFIG_ULIMIT is not set
101 
+CONFIG_UNAME=y
102 
+CONFIG_UNIQ=y
103 
+CONFIG_UNLINK=y
104 
+CONFIG_UUDECODE=y
105 
+CONFIG_UUENCODE=y
106 
+CONFIG_WC=y
107 
+CONFIG_WHO=y
108 
+CONFIG_XARGS=y
109 
+# CONFIG_XARGS_PEDANTIC is not set
110 
+
111 
+#
112 
+# pending (see toys/pending/README)
113 
+#
114 
+# CONFIG_ARP is not set
115 
+# CONFIG_ARPING is not set
116 
+# CONFIG_BOOTCHARTD is not set
117 
+# CONFIG_BRCTL is not set
118 
+# CONFIG_COMPRESS is not set
119 
+# CONFIG_DECOMPRESS is not set
120 
+# CONFIG_CROND is not set
121 
+# CONFIG_CRONTAB is not set
122 
+# CONFIG_DD is not set
123 
+# CONFIG_DHCP6 is not set
124 
+# CONFIG_DHCP is not set
125 
+# CONFIG_DHCPD is not set
126 
+# CONFIG_DEBUG_DHCP is not set
127 
+# CONFIG_DIFF is not set
128 
+# CONFIG_DUMPLEASES is not set
129 
+# CONFIG_EXPR is not set
130 
+# CONFIG_FDISK is not set
131 
+# CONFIG_FOLD is not set
132 
+# CONFIG_FSCK is not set
133 
+# CONFIG_GETFATTR is not set
134 
+# CONFIG_GETTY is not set
135 
+# CONFIG_GROUPADD is not set
136 
+# CONFIG_GROUPDEL is not set
137 
+# CONFIG_GZIP is not set
138 
+# CONFIG_GUNZIP is not set
139 
+# CONFIG_ZCAT is not set
140 
+# CONFIG_HOST is not set
141 
+# CONFIG_INIT is not set
142 
+# CONFIG_IP is not set
143 
+# CONFIG_IPCRM is not set
144 
+# CONFIG_IPCS is not set
145 
+# CONFIG_KLOGD is not set
146 
+# CONFIG_KLOGD_SOURCE_RING_BUFFER is not set
147 
+# CONFIG_LAST is not set
148 
+# CONFIG_LSOF is not set
149 
+# CONFIG_MDEV is not set
150 
+# CONFIG_MDEV_CONF is not set
151 
+# CONFIG_MKE2FS is not set
152 
+# CONFIG_MKE2FS_JOURNAL is not set
153 
+# CONFIG_MKE2FS_GEN is not set
154 
+# CONFIG_MKE2FS_LABEL is not set
155 
+# CONFIG_MKE2FS_EXTENDED is not set
156 
+# CONFIG_MODPROBE is not set
157 
+# CONFIG_MORE is not set
158 
+# CONFIG_OPENVT is not set
159 
+# CONFIG_DEALLOCVT is not set
160 
+# CONFIG_ROUTE is not set
161 
+# CONFIG_SH is not set
162 
+# CONFIG_CD is not set
163 
+# CONFIG_EXIT is not set
164 
+CONFIG_STTY=y
165 
+# CONFIG_SULOGIN is not set
166 
+# CONFIG_SYSLOGD is not set
167 
+# CONFIG_TAR is not set
168 
+# CONFIG_TCPSVD is not set
169 
+# CONFIG_TELNET is not set
170 
+# CONFIG_TELNETD is not set
171 
+# CONFIG_TEST is not set
172 
+# CONFIG_TFTP is not set
173 
+# CONFIG_TFTPD is not set
174 
+# CONFIG_TRACEROUTE is not set
175 
+# CONFIG_TR is not set
176 
+# CONFIG_USERADD is not set
177 
+# CONFIG_USERDEL is not set
178 
+# CONFIG_VI is not set
179 
+# CONFIG_WATCH is not set
180 
+# CONFIG_WGET is not set
181 
+# CONFIG_XZCAT is not set
182 
+
183 
+#
184 
+# Other commands
185 
+#
186 
+CONFIG_ACPI=y
187 
+# CONFIG_ASCII is not set
188 
+CONFIG_BASE64=y
189 
+CONFIG_BLKID=y
190 
+CONFIG_FSTYPE=y
191 
+CONFIG_BLOCKDEV=y
192 
+CONFIG_BUNZIP2=y
193 
+CONFIG_BZCAT=y
194 
+# CONFIG_CHCON is not set
195 
+CONFIG_CHROOT=y
196 
+# CONFIG_CHRT is not set
197 
+CONFIG_CHVT=y
198 
+# CONFIG_CLEAR is not set
199 
+CONFIG_COUNT=y
200 
+CONFIG_DOS2UNIX=y
201 
+CONFIG_UNIX2DOS=y
202 
+CONFIG_EJECT=y
203 
+CONFIG_FACTOR=y
204 
+CONFIG_FALLOCATE=y
205 
+CONFIG_FLOCK=y
206 
+# CONFIG_FMT is not set
207 
+CONFIG_FREE=y
208 
+CONFIG_FREERAMDISK=y
209 
+CONFIG_FSFREEZE=y
210 
+CONFIG_FSYNC=y
211 
+CONFIG_HELP=y
212 
+CONFIG_HELP_EXTRAS=y
213 
+CONFIG_HEXEDIT=y
214 
+CONFIG_HWCLOCK=y
215 
+CONFIG_INOTIFYD=y
216 
+# CONFIG_INSMOD is not set
217 
+CONFIG_IONICE=y
218 
+CONFIG_IORENICE=y
219 
+CONFIG_LOGIN=y
220 
+CONFIG_LOSETUP=y
221 
+CONFIG_LSATTR=y
222 
+CONFIG_CHATTR=y
223 
+# CONFIG_LSMOD is not set
224 
+CONFIG_LSPCI=y
225 
+CONFIG_LSPCI_TEXT=y
226 
+CONFIG_LSUSB=y
227 
+CONFIG_MAKEDEVS=y
228 
+CONFIG_MIX=y
229 
+CONFIG_MKPASSWD=y
230 
+CONFIG_MKSWAP=y
231 
+# CONFIG_MODINFO is not set
232 
+CONFIG_MOUNTPOINT=y
233 
+CONFIG_NBD_CLIENT=y
234 
+# CONFIG_UNSHARE is not set
235 
+# CONFIG_NSENTER is not set
236 
+CONFIG_ONEIT=y
237 
+CONFIG_PARTPROBE=y
238 
+CONFIG_PIVOT_ROOT=y
239 
+CONFIG_PMAP=y
240 
+CONFIG_PRINTENV=y
241 
+CONFIG_PWDX=y
242 
+CONFIG_READAHEAD=y
243 
+CONFIG_READLINK=y
244 
+CONFIG_REALPATH=y
245 
+# CONFIG_REBOOT is not set
246 
+# CONFIG_RESET is not set
247 
+CONFIG_REV=y
248 
+# CONFIG_RMMOD is not set
249 
+# CONFIG_SETFATTR is not set
250 
+CONFIG_SETSID=y
251 
+CONFIG_SHRED=y
252 
+CONFIG_STAT=y
253 
+CONFIG_SWAPOFF=y
254 
+CONFIG_SWAPON=y
255 
+CONFIG_SWITCH_ROOT=y
256 
+CONFIG_SYSCTL=y
257 
+CONFIG_TAC=y
258 
+CONFIG_NPROC=y
259 
+CONFIG_TASKSET=y
260 
+CONFIG_TIMEOUT=y
261 
+CONFIG_TRUNCATE=y
262 
+CONFIG_UPTIME=y
263 
+# CONFIG_USLEEP is not set
264 
+# CONFIG_UUIDGEN is not set
265 
+CONFIG_VCONFIG=y
266 
+CONFIG_VMSTAT=y
267 
+CONFIG_W=y
268 
+CONFIG_WHICH=y
269 
+CONFIG_XXD=y
270 
+CONFIG_YES=y
271 
+
272 
+#
273 
+# Networking
274 
+#
275 
+CONFIG_FTPGET=y
276 
+CONFIG_FTPPUT=y
277 
+CONFIG_IFCONFIG=y
278 
+CONFIG_MICROCOM=y
279 
+CONFIG_NETCAT=y
280 
+CONFIG_NETCAT_LISTEN=y
281 
+CONFIG_NETSTAT=y
282 
+# CONFIG_PING is not set
283 
+CONFIG_RFKILL=y
284 
+CONFIG_TUNCTL=y
285 
+
286 
+#
287 
+# Linux Standard Base commands
288 
+#
289 
+# CONFIG_DMESG is not set
290 
+CONFIG_HOSTNAME=y
291 
+CONFIG_KILLALL=y
292 
+CONFIG_MD5SUM=y
293 
+CONFIG_SHA1SUM=y
294 
+# CONFIG_SHA224SUM is not set
295 
+# CONFIG_SHA256SUM is not set
296 
+# CONFIG_SHA384SUM is not set
297 
+# CONFIG_SHA512SUM is not set
298 
+CONFIG_MKNOD=y
299 
+# CONFIG_MKNOD_Z is not set
300 
+CONFIG_MKTEMP=y
301 
+CONFIG_MOUNT=y
302 
+CONFIG_PASSWD=y
303 
+# CONFIG_PASSWD_SAD is not set
304 
+CONFIG_PIDOF=y
305 
+CONFIG_SEQ=y
306 
+CONFIG_SU=y
307 
+CONFIG_SYNC=y
308 
+CONFIG_UMOUNT=y
309 
+
310 
+#
311 
+# Example commands
312 
+#
313 
+# CONFIG_DEMO_MANY_OPTIONS is not set
314 
+# CONFIG_DEMO_NUMBER is not set
315 
+# CONFIG_DEMO_SCANKEY is not set
316 
+# CONFIG_DEMO_UTF8TOWC is not set
317 
+# CONFIG_HELLO is not set
318 
+# CONFIG_HOSTID is not set
319 
+# CONFIG_SKELETON is not set
320 
+# CONFIG_SKELETON_ALIAS is not set
321 
+
322 
+#
323 
+# Android
324 
+#
325 
+# CONFIG_GETENFORCE is not set
326 
+# CONFIG_GETPROP is not set
327 
+# CONFIG_LOAD_POLICY is not set
328 
+# CONFIG_LOG is not set
329 
+# CONFIG_RESTORECON is not set
330 
+# CONFIG_RUNCON is not set
331 
+# CONFIG_SENDEVENT is not set
332 
+# CONFIG_SETENFORCE is not set
333 
+# CONFIG_SETPROP is not set
334 
+# CONFIG_START is not set
335 
+# CONFIG_STOP is not set
336 
+
337 
+#
338 
+#
339 
+#
340 
+
341 
+#
342 
+# Toybox global settings
343 
+#
344 
+CONFIG_TOYBOX=y
345 
+CONFIG_TOYBOX_SUID=y
346 
+CONFIG_TOYBOX_LSM_NONE=y
347 
+# CONFIG_TOYBOX_SELINUX is not set
348 
+# CONFIG_TOYBOX_SMACK is not set
349 
+# CONFIG_TOYBOX_LIBCRYPTO is not set
350 
+# CONFIG_TOYBOX_LIBZ is not set
351 
+CONFIG_TOYBOX_FLOAT=y
352 
+CONFIG_TOYBOX_HELP=y
353 
+CONFIG_TOYBOX_HELP_DASHDASH=y
354 
+# CONFIG_TOYBOX_I18N is not set
355 
+# CONFIG_TOYBOX_FREE is not set
356 
+# CONFIG_TOYBOX_NORECURSE is not set
357 
+# CONFIG_TOYBOX_DEBUG is not set
358 
+# CONFIG_TOYBOX_PEDANTIC_ARGS is not set
359 
+CONFIG_TOYBOX_UID_SYS=100
360 
+CONFIG_TOYBOX_UID_USR=500
361 
+# CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set
SPECS/toybox/config2help_use_after_free_fix.patch
History View file @ 82d6dba
0 362 
deleted file mode 100644
... ... 
@@ -1,39 +0,0 @@
1 
-+++ b/scripts/config2help.c	2017-02-21 09:27:25.000000000 -0800
2 
-@@ -248,7 +248,7 @@
3 
-   // entry until we run out of matching pairs.
4 
-   for (;;) {
5 
-     struct symbol *throw = 0, *catch;
6 
--    char *this, *that, *cusage, *tusage, *name;
7 
-+    char *this, *that, *cusage, *tusage, *name = NULL, *that_start;
8 
-     int len;
9 
-
10 
-     // find a usage: name and collate all enabled entries with that name
11 
-@@ -261,11 +261,16 @@
12 
-
13 
-         // Align usage: lines, finding a matching pair so we can suck help
14 
-         // text out of throw into catch, copying from this to that
15 
--        if (!throw) name = that;
16 
-+        if (!throw) {
17 
-+          if (name)
18 
-+            free(name);
19 
-+          name = strdup(that);
20 
-+          that_start = that;
21 
-+        }
22 
-         else if (strncmp(name, that, len) || !isspace(that[len])) continue;
23 
-         catch->enabled++;
24 
-         while (!isspace(*that) && *that) that++;
25 
--        if (!throw) len = that-name;
26 
-+        if (!throw) len = that-that_start;
27 
-         that = trim(that);
28 
-         if (!throw) {
29 
-           throw = catch;
30 
-@@ -370,6 +375,8 @@
31 
-       }
32 
-     }
33 
-
34 
-+    if (name)
35 
-+      free(name);
36 
-     // Did we find one?
37 
-
38 
-     if (!throw) break;
SPECS/toybox/toybox.spec
History View file @ 82d6dba
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           toybox
2 
-Version:        0.7.3
3 
-Release:        6%{?dist}
2 
+Version:        0.7.7
3 
+Release:        1%{?dist}
4 4 
 License:        BSD
5 5 
 Summary:        Common Linux command line utilities in a single executable
6 6 
 Url:            http://landley.net/toybox/
... ... 
@@ -8,9 +8,8 @@ Group:          Applications/System
8 8 
 Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        http://landley.net/toybox/downloads/%{name}-%{version}.tar.gz
11 
-%define sha1 toybox=f3d9f5396a210fb2ad7d6309acb237751c50812f
12 
-Source1:	config-%{version}
13 
-Patch0:         config2help_use_after_free_fix.patch
11 
+%define sha1 toybox=5475bc98a0dd807061a4fc4ebad57f323b328dbc
12 
+Source1:	config-toybox
14 13 
 %description
15 14 
 Toybox combines common Linux command line utilities together into a single
16 15 
 BSD-licensed executable that's simple, small, fast, reasonably
... ... 
@@ -19,7 +18,6 @@ environment.
19 19
20 20 
 %prep
21 21 
 %setup -q -n toybox-%{version}
22 
-%patch0 -p1
23 22
24 23 
 %build
25 24 
 # Move sed to /bin
... ... 
@@ -50,6 +48,8 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
50 50 
 %{_sbindir}/*
51 51
52 52 
 %changelog
53 
+*   Mon Oct 01 2018 Alexey Makhalov <amakhalov@vmware.com> 0.7.7-1
54 
+-   Version update
53 55 
 *   Mon Oct 01 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-6
54 56 
 -   remove strings and usleep to avoid conflict with binutils and initscripts
55 57 
 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-5