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

diff --git a/busybox.spec b/busybox.spec
index 66cf5d1..e7df2bf 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -30,34 +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.22.1
-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:	337d1a15ab1cb1d4ed423168b1eb7d7e
+# Source0-md5:	2eaae519cac1143bcf583636a745381f
 Source1:	%{name}.config
 Source2:	%{name}-initrd.config
 %{?with_altconfig:Source3:	%{cfgfile}}
-Patch100:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-ash.patch
-# Patch100-md5:	538d8cddbdfc449239b25a40bc8d1575
-Patch101:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-date.patch
-# Patch101-md5:	bc381f9ceb3824141c968f5bc4353943
-Patch102:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-iplink.patch
-# Patch102-md5:	24686ec2750a8703feb57fc9c6aaed1d
-Patch103:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-nc.patch
-# Patch103-md5:	69eecaae5f812d08655dfdf34b60503f
-Patch104:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-lzop.patch
-# Patch104-md5:	14fb3bf7ffaba153b3cad385677b18c3
-Patch105:	http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-zcat-no-ext.patch
-# Patch105-md5:	158c8c4c73db6d920bdd7d4b9b65b2a5
+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
@@ -167,7 +166,8 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
+
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p1