X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=busybox.spec;h=e7df2bfb506333f9cbaad742b1274b9d00cbb6a9;hb=7f5251d7fc5d3e5a88866d3b15ff81e328694e3d;hp=8152a0b4bc893e828aa7825bf196109b216f5d82;hpb=77109ddb8d3b70284c49bec336c0ab6e45ff6095;p=packages%2Fbusybox.git

diff --git a/busybox.spec b/busybox.spec
index 8152a0b..e7df2bf 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -18,7 +18,7 @@
 %bcond_without	initrd		# don't build initrd version
 %bcond_with	dietlibc	# build dietlibc-based initrd and static versions
 %bcond_with	glibc		# build glibc-based initrd and static versions
-%bcond_with	verbose		# verbose build
+%bcond_without	verbose		# verbose build
 # Options below are useful, when you want fileutils and grep providing.
 # For example, ash package requires fileutils and grep.
 %bcond_with	fileutl_prov	# adds fileutils providing
@@ -30,29 +30,33 @@
 # functionality as their GNU countenders.
 #
 %ifnarch %{ix86} %{x8664} ppc
-%define with_glibc 1
+%define		with_glibc	1
+%endif
+%ifarch x32
+# until uClibc builds on x32
+%undefine	with_static
 %endif
 Summary:	Set of common Unix utilities for embeded systems
 Summary(pl.UTF-8):	Zestaw narzędzi uniksowych dla systemów wbudowanych
 Summary(pt_BR.UTF-8):	BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:		busybox
 # stable line only
-Version:	1.20.2
-Release:	3
+Version:	1.24.2
+Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	e025414bc6cd79579cc7a32a45d3ae1c
+# Source0-md5:	2eaae519cac1143bcf583636a745381f
 Source1:	%{name}.config
 Source2:	%{name}-initrd.config
 %{?with_altconfig:Source3:	%{cfgfile}}
-Patch100:	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-kernel_ver.patch
-# Patch100-md5:	3386a2bf992f2284b86608498f4cb822
-Patch101:	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
-# Patch101-md5:	a1b6587697c70808808f3693c4610884
-Patch102:	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-sys-resource.patch
-# Patch102-md5:	cfb5d5d7ed1414b5749f2c2ec0bf066a
-
+Patch100:	https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-CVE-2016-2147.patch
+# Patch100-md5:	c45a85f5ced712743efbb683900f8c1d
+Patch101:	https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-CVE-2016-2148.patch
+# Patch101-md5:	850a57ca2871e370b4916161a0320a3f
+Patch102:	https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-ash-recursive-heredocs.patch
+# Patch102-md5:	b59eb7536609db1ab5215de860d9e558
+Patch0:		x32.patch
 Patch1:		%{name}-logconsole.patch
 Patch2:		%{name}-printf-gettext.patch
 Patch3:		%{name}-loadfont.patch
@@ -163,6 +167,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch101 -p1
 %patch102 -p1
 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p1