commit 88d8998eb8c04f89c127fc5b9c5f60e9f48e8499
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Jul 19 12:00:23 2013 +0200
- up to 1.21.1
busybox-initrd.config | 2 ++
busybox.config | 7 +++++++
busybox.spec | 17 +++--------------
3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index 8152a0b..d56fac9 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -37,22 +37,15 @@ 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.21.1
+Release: 1
License: GPL v2
Group: Applications
Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: e025414bc6cd79579cc7a32a45d3ae1c
+# Source0-md5: 795394f83903b5eec6567d51eebb417e
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
-
Patch1: %{name}-logconsole.patch
Patch2: %{name}-printf-gettext.patch
Patch3: %{name}-loadfont.patch
@@ -159,10 +152,6 @@ Statycznie skonsolidowany busybox dla initrd.
%prep
%setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-
%patch1 -p1
%patch2 -p1
#%patch3 -p1
diff --git a/busybox-initrd.config b/busybox-initrd.config
index 3f37f36..4ff669c 100644
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -94,6 +94,7 @@ CONFIG_FEATURE_RTMINMAX=y
CONFIG_FEATURE_SKIP_ROOTFS=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
# CONFIG_FEATURE_FAST_TOP is not set
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_EDITING=y
@@ -243,6 +244,7 @@ CONFIG_RM=y
# CONFIG_SHA1SUM is not set
# CONFIG_SHA256SUM is not set
# CONFIG_SHA512SUM is not set
+# CONFIG_SHA3SUM is not set
# CONFIG_SLEEP is not set
# CONFIG_FEATURE_FANCY_SLEEP is not set
# CONFIG_SORT is not set
diff --git a/busybox.config b/busybox.config
index f34307f..3e2b5fb 100644
--- a/busybox.config
+++ b/busybox.config
@@ -38,6 +38,7 @@ CONFIG_GETOPT_LONG=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@@ -96,6 +97,7 @@ CONFIG_FEATURE_SYSTEMD=y
CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_EDITING=y
@@ -253,6 +255,7 @@ CONFIG_SEQ=y
CONFIG_SHA1SUM=y
CONFIG_SHA256SUM=y
CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -591,9 +594,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
CONFIG_FEATURE_VOLUMEID_BTRFS=y
CONFIG_FEATURE_VOLUMEID_REISERFS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_HFS=y
CONFIG_FEATURE_VOLUMEID_JFS=y
CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NILFS=y
CONFIG_FEATURE_VOLUMEID_NTFS=y
CONFIG_FEATURE_VOLUMEID_ISO9660=y
CONFIG_FEATURE_VOLUMEID_UDF=y
@@ -601,6 +606,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
CONFIG_FEATURE_VOLUMEID_SYSV=y
CONFIG_FEATURE_VOLUMEID_OCFS2=y
CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
@@ -1044,6 +1050,7 @@ CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
CONFIG_LOGREAD=y
CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_FEATURE_KMSG_SYSLOG=y
CONFIG_KLOGD=y
CONFIG_FEATURE_KLOGD_KLOGCTL=y
CONFIG_LOGGER=y
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/88d8998eb8c04f89c127fc5b9c5f60e9f48e8499
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
