rpms/busybox/devel busybox-1.10.1-anaconda.patch, NONE, 1.1 busybox-1.10.1-hwclock.patch, NONE, 1.1 busybox-1.10.1-static.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 busybox.spec, 1.77, 1.78 sources, 1.22, 1.23 busybox-1.5.1-anaconda.patch, 1.1, NONE busybox-1.5.1-static.patch, 1.1, NONE busybox-1.9.0-hwclock.patch, 1.1, NONE busybox-1.9.1-headers.patch, 1.1, NONE

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Fri May 9 09:27:53 UTC 2008


Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1419

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.10.1-anaconda.patch busybox-1.10.1-hwclock.patch 
	busybox-1.10.1-static.patch 
Removed Files:
	busybox-1.5.1-anaconda.patch busybox-1.5.1-static.patch 
	busybox-1.9.0-hwclock.patch busybox-1.9.1-headers.patch 
Log Message:
- update to 1.10.1



busybox-1.10.1-anaconda.patch:

--- NEW FILE busybox-1.10.1-anaconda.patch ---
diff -up busybox-1.10.1/scripts/defconfig.pom busybox-1.10.1/scripts/defconfig
--- busybox-1.10.1/scripts/defconfig.pom	2008-05-09 10:48:54.000000000 +0200
+++ busybox-1.10.1/scripts/defconfig	2008-05-09 11:06:37.000000000 +0200
@@ -130,7 +130,7 @@ CONFIG_UNZIP=y
 #
 # Common options for cpio and tar
 #
-CONFIG_FEATURE_UNARCHIVE_TAPE=y
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
 # CONFIG_FEATURE_DEB_TAR_GZ is not set
 # CONFIG_FEATURE_DEB_TAR_BZ2 is not set
 # CONFIG_FEATURE_DEB_TAR_LZMA is not set
@@ -188,7 +188,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
 CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR is not set
 CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
@@ -321,7 +321,7 @@ CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
+# CONFIG_FEATURE_VI_READONLY is not set
 CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
@@ -366,7 +366,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 #
 # Init Utilities
 #
-CONFIG_INIT=y
+# CONFIG_INIT is not set
 # CONFIG_DEBUG_INIT is not set
 CONFIG_FEATURE_USE_INITTAB=y
 # CONFIG_FEATURE_KILL_REMOVED is not set
@@ -376,7 +376,7 @@ CONFIG_FEATURE_INIT_SCTTY=y
 CONFIG_FEATURE_EXTRA_QUIET=y
 CONFIG_FEATURE_INIT_COREDUMPS=y
 CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
+# CONFIG_HALT is not set
 CONFIG_MESG=y
 
 #
@@ -752,7 +752,7 @@ CONFIG_ASH=y
 #
 # Ash Shell Options
 #
-CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_JOB_CONTROL is not set
 CONFIG_ASH_READ_NCHARS=y
 CONFIG_ASH_READ_TIMEOUT=y
 # CONFIG_ASH_ALIAS is not set
@@ -786,7 +786,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y
 #
 # System Logging Utilities
 #
-CONFIG_SYSLOGD=y
+# CONFIG_SYSLOGD is not set
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
@@ -794,8 +794,8 @@ CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
+# CONFIG_KLOGD is not set
+# CONFIG_LOGGER is not set
 
 #
 # Runit Utilities

busybox-1.10.1-hwclock.patch:

--- NEW FILE busybox-1.10.1-hwclock.patch ---
diff -up busybox-1.10.1/libbb/rtc.c.pom busybox-1.10.1/libbb/rtc.c
--- busybox-1.10.1/libbb/rtc.c.pom	2008-04-19 05:50:33.000000000 +0200
+++ busybox-1.10.1/libbb/rtc.c	2008-05-07 12:53:19.000000000 +0200
@@ -44,6 +44,7 @@ int rtc_xopen(const char **default_rtc, 
 {
 	int rtc;
 
+#ifdef __ia64__
 	if (!*default_rtc) {
 		*default_rtc = "/dev/rtc";
 		rtc = open(*default_rtc, flags);
@@ -55,6 +56,20 @@ int rtc_xopen(const char **default_rtc, 
 			return rtc;
 		*default_rtc = "/dev/misc/rtc";
 	}
+#else 
+
+	if (!*default_rtc) {
+		*default_rtc = "/dev/rtc";
+		rtc = open(*default_rtc, flags);
+		if (rtc >= 0)
+			return rtc;
+		*default_rtc = "/dev/rtc0";
+		rtc = open(*default_rtc, flags);
+		if (rtc >= 0)
+			return rtc;
+		*default_rtc = "/dev/misc/rtc";
+	}
+#endif
 
 	return xopen(*default_rtc, flags);
 }

busybox-1.10.1-static.patch:

--- NEW FILE busybox-1.10.1-static.patch ---
diff -up busybox-1.10.1/scripts/defconfig.pom busybox-1.10.1/scripts/defconfig
--- busybox-1.10.1/scripts/defconfig.pom	2008-05-09 10:48:54.000000000 +0200
+++ busybox-1.10.1/scripts/defconfig	2008-05-09 10:54:30.000000000 +0200
@@ -38,7 +38,7 @@ CONFIG_FEATURE_HAVE_RPC=y
 #
 # Build Options
 #
-# CONFIG_STATIC is not set
+# CONFIG_STATIC=y
 # CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
 # CONFIG_FEATURE_INDIVIDUAL is not set
@@ -188,7 +188,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
 CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR is not set
 CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
@@ -450,7 +450,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 CONFIG_FBSET=y
 CONFIG_FEATURE_FBSET_FANCY=y
 CONFIG_FEATURE_FBSET_READMODE=y
-CONFIG_FDFLUSH=y
+CONFIG_FDFLUSH is not set
 CONFIG_FDFORMAT=y
 CONFIG_FDISK=y
 CONFIG_FDISK_SUPPORT_LARGE_DISKS=y


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	14 Feb 2008 08:27:18 -0000	1.22
+++ .cvsignore	9 May 2008 09:27:17 -0000	1.23
@@ -1 +1 @@
-busybox-1.9.1.tar.bz2
+busybox-1.10.1.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- busybox.spec	19 Feb 2008 14:52:14 -0000	1.77
+++ busybox.spec	9 May 2008 09:27:17 -0000	1.78
@@ -1,22 +1,20 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.9.1
+Version: 1.10.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source1: busybox-petitboot.config
-Patch: busybox-1.5.1-static.patch
-Patch1: busybox-1.5.1-anaconda.patch
+Patch: busybox-1.10.1-static.patch
+Patch1: busybox-1.10.1-anaconda.patch
 Patch4: busybox-1.2.0-ppc64.patch
 Patch11: busybox-1.2.2-iptunnel.patch
 Patch12: busybox-1.2.2-ls.patch
 Patch13: busybox-1.5.1-clean.patch
 Patch14: busybox-1.9.0-msh.patch
-Patch15: busybox-1.9.0-gc-section.patch
-Patch16: busybox-1.9.0-hwclock.patch
-Patch17: busybox-1.9.1-headers.patch
+Patch16: busybox-1.10.1-hwclock.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -59,9 +57,7 @@
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
-%patch15 -b .sect -p1
 %patch16 -b .ia64 -p1
-%patch17 -b .head -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -73,7 +69,6 @@
 make clean
 # revert the static patches
 patch -R -p1 <%{PATCH0}
-patch -R -p1 <%{PATCH15}
 # applied anaconda patch
 patch -b --suffix .anaconda -p1 < %{PATCH1}
 make defconfig
@@ -115,6 +110,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Thu May  9 2008 Ivana Varekova <varekova at redhat.com> - 1:1.10.1-1
+- update to 1.10.1
+
 * Thu Feb 14 2008 Ivana Varekova <varekova at redhat.com> - 1:1.9.1-1
 - update to 1.9.1
 - fix a problem with netfilter.h - thanks dwmw2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	14 Feb 2008 08:27:18 -0000	1.22
+++ sources	9 May 2008 09:27:17 -0000	1.23
@@ -1 +1 @@
-0cf00342f48feb92d561b6b4d0a441c1  busybox-1.9.1.tar.bz2
+953c5d829a3ff11014f41c6c1b446eb8  busybox-1.10.1.tar.bz2


--- busybox-1.5.1-anaconda.patch DELETED ---


--- busybox-1.5.1-static.patch DELETED ---


--- busybox-1.9.0-hwclock.patch DELETED ---


--- busybox-1.9.1-headers.patch DELETED ---




More information about the fedora-extras-commits mailing list