1. photon
  2. Commit b9703617cab552e985bf27c9f2a5ae82ef1103db
Browse code

toybox: update version to 0.8.2

To enable sha256sum.

Extra use system libcrypto to reduce the size as openssl is
always installed.

Change-Id: I774eb22640a51da99a8ff3de377e6d790b51bfd7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/8445
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Alexey Makhalov authored on 2019/10/31 09:33:19
Showing 2 changed files
SPECS/toybox/config-toybox
History View file @ b970361
... ... 
@@ -1,9 +1,9 @@
1 1 
 #
2 2 
 # Automatically generated make config: don't edit
3 3 
 # ToyBox version: KCONFIG_VERSION
4 
-# Mon Oct  1 21:44:17 2018
4 
+# Thu Oct 31 00:31:06 2019
5 5 
 #
6 
-# CONFIG_TOYBOX_CONTAINER is not set
6 
+CONFIG_TOYBOX_CONTAINER=y
7 7 
 CONFIG_TOYBOX_FIFREEZE=y
8 8 
 CONFIG_TOYBOX_ICONV=y
9 9 
 CONFIG_TOYBOX_FALLOCATE=y
... ... 
@@ -12,7 +12,8 @@ CONFIG_TOYBOX_SHADOW=y
12 12 
 # CONFIG_TOYBOX_ON_ANDROID is not set
13 13 
 # CONFIG_TOYBOX_ANDROID_SCHEDPOLICY is not set
14 14 
 CONFIG_TOYBOX_FORK=y
15 
-# CONFIG_TOYBOX_PRLIMIT is not set
15 
+CONFIG_TOYBOX_PRLIMIT=y
16 
+CONFIG_TOYBOX_GETRANDOM=y
16 17
17 18 
 #
18 19 
 # Posix commands
... ... 
@@ -62,7 +63,6 @@ CONFIG_LINK=y
62 62 
 CONFIG_LN=y
63 63 
 # CONFIG_LOGGER is not set
64 64 
 CONFIG_LS=y
65 
-CONFIG_LS_COLOR=y
66 65 
 CONFIG_MKDIR=y
67 66 
 # CONFIG_MKDIR_Z is not set
68 67 
 CONFIG_MKFIFO=y
... ... 
@@ -85,20 +85,20 @@ CONFIG_RM=y
85 85 
 CONFIG_RMDIR=y
86 86 
 CONFIG_SED=y
87 87 
 CONFIG_SLEEP=y
88 
-CONFIG_SLEEP_FLOAT=y
89 88 
 CONFIG_SORT=y
90 
-CONFIG_SORT_BIG=y
91 89 
 CONFIG_SORT_FLOAT=y
92 90 
 CONFIG_SPLIT=y
93 91 
 # CONFIG_STRINGS is not set
94 92 
 CONFIG_TAIL=y
95 
-CONFIG_TAIL_SEEK=y
93 
+# CONFIG_TAR is not set
96 94 
 CONFIG_TEE=y
95 
+# CONFIG_TEST is not set
97 96 
 CONFIG_TIME=y
98 97 
 CONFIG_TOUCH=y
99 98 
 CONFIG_TRUE=y
100 99 
 CONFIG_TTY=y
101 100 
 # CONFIG_ULIMIT is not set
101 
+# CONFIG_ARCH is not set
102 102 
 CONFIG_UNAME=y
103 103 
 CONFIG_UNIQ=y
104 104 
 CONFIG_UNLINK=y
... ... 
@@ -107,17 +107,15 @@ CONFIG_UUENCODE=y
107 107 
 CONFIG_WC=y
108 108 
 CONFIG_WHO=y
109 109 
 CONFIG_XARGS=y
110 
-# CONFIG_XARGS_PEDANTIC is not set
111 110
112 111 
 #
113 112 
 # pending (see toys/pending/README)
114 113 
 #
115 114 
 # CONFIG_ARP is not set
116 115 
 # CONFIG_ARPING is not set
116 
+# CONFIG_BC is not set
117 117 
 # CONFIG_BOOTCHARTD is not set
118 118 
 # CONFIG_BRCTL is not set
119 
-# CONFIG_COMPRESS is not set
120 
-# CONFIG_DECOMPRESS is not set
121 119 
 # CONFIG_CROND is not set
122 120 
 # CONFIG_CRONTAB is not set
123 121 
 # CONFIG_DD is not set
... ... 
@@ -135,9 +133,6 @@ CONFIG_XARGS=y
135 135 
 # CONFIG_GETTY is not set
136 136 
 # CONFIG_GROUPADD is not set
137 137 
 # CONFIG_GROUPDEL is not set
138 
-# CONFIG_GZIP is not set
139 
-# CONFIG_GUNZIP is not set
140 
-# CONFIG_ZCAT is not set
141 138 
 # CONFIG_HOST is not set
142 139 
 # CONFIG_INIT is not set
143 140 
 # CONFIG_IP is not set
... ... 
@@ -147,6 +142,7 @@ CONFIG_XARGS=y
147 147 
 # CONFIG_KLOGD_SOURCE_RING_BUFFER is not set
148 148 
 # CONFIG_LAST is not set
149 149 
 # CONFIG_LSOF is not set
150 
+# CONFIG_MAN is not set
150 151 
 # CONFIG_MDEV is not set
151 152 
 # CONFIG_MDEV_CONF is not set
152 153 
 # CONFIG_MKE2FS is not set
... ... 
@@ -165,11 +161,9 @@ CONFIG_XARGS=y
165 165 
 CONFIG_STTY=y
166 166 
 # CONFIG_SULOGIN is not set
167 167 
 # CONFIG_SYSLOGD is not set
168 
-# CONFIG_TAR is not set
169 168 
 # CONFIG_TCPSVD is not set
170 169 
 # CONFIG_TELNET is not set
171 170 
 # CONFIG_TELNETD is not set
172 
-# CONFIG_TEST is not set
173 171 
 # CONFIG_TFTP is not set
174 172 
 # CONFIG_TFTPD is not set
175 173 
 # CONFIG_TRACEROUTE is not set
... ... 
@@ -177,7 +171,6 @@ CONFIG_STTY=y
177 177 
 # CONFIG_USERADD is not set
178 178 
 # CONFIG_USERDEL is not set
179 179 
 # CONFIG_VI is not set
180 
-# CONFIG_WATCH is not set
181 180 
 # CONFIG_WGET is not set
182 181 
 # CONFIG_XZCAT is not set
183 182
... ... 
@@ -198,6 +191,7 @@ CONFIG_CHROOT=y
198 198 
 CONFIG_CHVT=y
199 199 
 # CONFIG_CLEAR is not set
200 200 
 CONFIG_COUNT=y
201 
+# CONFIG_DEVMEM is not set
201 202 
 CONFIG_DOS2UNIX=y
202 203 
 CONFIG_UNIX2DOS=y
203 204 
 CONFIG_EJECT=y
... ... 
@@ -213,6 +207,10 @@ CONFIG_HELP=y
213 213 
 CONFIG_HELP_EXTRAS=y
214 214 
 CONFIG_HEXEDIT=y
215 215 
 CONFIG_HWCLOCK=y
216 
+# CONFIG_I2CDETECT is not set
217 
+# CONFIG_I2CDUMP is not set
218 
+# CONFIG_I2CGET is not set
219 
+# CONFIG_I2CSET is not set
216 220 
 CONFIG_INOTIFYD=y
217 221 
 # CONFIG_INSMOD is not set
218 222 
 CONFIG_IONICE=y
... ... 
@@ -226,6 +224,7 @@ CONFIG_LSPCI=y
226 226 
 CONFIG_LSPCI_TEXT=y
227 227 
 CONFIG_LSUSB=y
228 228 
 CONFIG_MAKEDEVS=y
229 
+# CONFIG_MCOOKIE is not set
229 230 
 CONFIG_MIX=y
230 231 
 CONFIG_MKPASSWD=y
231 232 
 CONFIG_MKSWAP=y
... ... 
@@ -265,6 +264,7 @@ CONFIG_UPTIME=y
265 265 
 # CONFIG_UUIDGEN is not set
266 266 
 CONFIG_VCONFIG=y
267 267 
 CONFIG_VMSTAT=y
268 
+# CONFIG_WATCH is not set
268 269 
 CONFIG_W=y
269 270 
 CONFIG_WHICH=y
270 271 
 CONFIG_XXD=y
... ... 
@@ -282,20 +282,25 @@ CONFIG_NETCAT_LISTEN=y
282 282 
 CONFIG_NETSTAT=y
283 283 
 # CONFIG_PING is not set
284 284 
 CONFIG_RFKILL=y
285 
+# CONFIG_SNTP is not set
285 286 
 CONFIG_TUNCTL=y
286 287
287 288 
 #
288 289 
 # Linux Standard Base commands
289 290 
 #
290 291 
 # CONFIG_DMESG is not set
292 
+# CONFIG_GZIP is not set
293 
+# CONFIG_GUNZIP is not set
294 
+# CONFIG_ZCAT is not set
291 295 
 CONFIG_HOSTNAME=y
296 
+# CONFIG_DNSDOMAINNAME is not set
292 297 
 CONFIG_KILLALL=y
293 298 
 CONFIG_MD5SUM=y
294 299 
 CONFIG_SHA1SUM=y
295 
-# CONFIG_SHA224SUM is not set
296 
-# CONFIG_SHA256SUM is not set
297 
-# CONFIG_SHA384SUM is not set
298 
-# CONFIG_SHA512SUM is not set
300 
+CONFIG_SHA224SUM=y
301 
+CONFIG_SHA256SUM=y
302 
+CONFIG_SHA384SUM=y
303 
+CONFIG_SHA512SUM=y
299 304 
 CONFIG_MKNOD=y
300 305 
 # CONFIG_MKNOD_Z is not set
301 306 
 CONFIG_MKTEMP=y
... ... 
@@ -317,6 +322,7 @@ CONFIG_UMOUNT=y
317 317 
 # CONFIG_DEMO_UTF8TOWC is not set
318 318 
 # CONFIG_HELLO is not set
319 319 
 # CONFIG_HOSTID is not set
320 
+# CONFIG_LOGWRAPPER is not set
320 321 
 # CONFIG_SKELETON is not set
321 322 
 # CONFIG_SKELETON_ALIAS is not set
322 323
... ... 
@@ -324,16 +330,12 @@ CONFIG_UMOUNT=y
324 324 
 # Android
325 325 
 #
326 326 
 # CONFIG_GETENFORCE is not set
327 
-# CONFIG_GETPROP is not set
328 327 
 # CONFIG_LOAD_POLICY is not set
329 328 
 # CONFIG_LOG is not set
330 329 
 # CONFIG_RESTORECON is not set
331 330 
 # CONFIG_RUNCON is not set
332 331 
 # CONFIG_SENDEVENT is not set
333 332 
 # CONFIG_SETENFORCE is not set
334 
-# CONFIG_SETPROP is not set
335 
-# CONFIG_START is not set
336 
-# CONFIG_STOP is not set
337 333
338 334 
 #
339 335 
 #
... ... 
@@ -347,7 +349,7 @@ CONFIG_TOYBOX_SUID=y
347 347 
 CONFIG_TOYBOX_LSM_NONE=y
348 348 
 # CONFIG_TOYBOX_SELINUX is not set
349 349 
 # CONFIG_TOYBOX_SMACK is not set
350 
-# CONFIG_TOYBOX_LIBCRYPTO is not set
350 
+CONFIG_TOYBOX_LIBCRYPTO=y
351 351 
 # CONFIG_TOYBOX_LIBZ is not set
352 352 
 CONFIG_TOYBOX_FLOAT=y
353 353 
 CONFIG_TOYBOX_HELP=y
SPECS/toybox/toybox.spec
History View file @ b970361
... ... 
@@ -1,5 +1,5 @@
1 1 
 Name:           toybox
2 
-Version:        0.7.7
2 
+Version:        0.8.2
3 3 
 Release:        1%{?dist}
4 4 
 License:        BSD
5 5 
 Summary:        Common Linux command line utilities in a single executable
... ... 
@@ -8,8 +8,10 @@ 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=5475bc98a0dd807061a4fc4ebad57f323b328dbc
12 
-Source1:	config-toybox
11 
+%define sha1 toybox=0477740759f5132397fdfdbf8aea88e811869173
12 
+Source1:        config-toybox
13 
+BuildRequires:  openssl-devel
14 
+Requires:       openssl
13 15 
 %description
14 16 
 Toybox combines common Linux command line utilities together into a single
15 17 
 BSD-licensed executable that's simple, small, fast, reasonably
... ... 
@@ -48,6 +50,8 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
48 48 
 %{_sbindir}/*
49 49
50 50 
 %changelog
51 
+*   Wed Oct 30 2019 Alexey Makhalov <amakhalov@vmware.com> 0.8.2-1
52 
+-   Version update. Use system libcrypto.
51 53 
 *   Mon Oct 01 2018 Alexey Makhalov <amakhalov@vmware.com> 0.7.7-1
52 54 
 -   Version update
53 55 
 *   Mon Oct 01 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-6