rpms/busybox/devel busybox-1.10.3-findfs.patch, NONE, 1.1 busybox.spec, 1.85, 1.86

Ivana Varekova varekova at fedoraproject.org
Tue Aug 26 12:18:23 UTC 2008


Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1732

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.10.3-findfs.patch 
Log Message:
- fix findfs problem - #455998


busybox-1.10.3-findfs.patch:

--- NEW FILE busybox-1.10.3-findfs.patch ---
diff -up busybox-1.10.3/scripts/defconfig.ff busybox-1.10.3/scripts/defconfig
--- busybox-1.10.3/scripts/defconfig.ff	2008-08-26 14:09:49.000000000 +0200
+++ busybox-1.10.3/scripts/defconfig	2008-08-26 14:12:30.000000000 +0200
@@ -488,8 +488,8 @@ CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_V0=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
+CONFIG_VOLUMEID=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_FAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
diff -up busybox-1.10.3/include/applets.h.ff busybox-1.10.3/include/applets.h
--- busybox-1.10.3/include/applets.h.ff	2008-04-19 05:50:36.000000000 +0200
+++ busybox-1.10.3/include/applets.h	2008-08-26 14:09:49.000000000 +0200
@@ -155,7 +155,7 @@ USE_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _B
 USE_FETCHMAIL(APPLET_ODDNAME(fetchmail, sendgetmail, _BB_DIR_USR_BIN, _BB_SUID_NEVER, fetchmail))
 USE_FEATURE_GREP_FGREP_ALIAS(APPLET_NOUSAGE(fgrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_NEVER, find))
-USE_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
 USE_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_NEVER))


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- busybox.spec	24 Jul 2008 08:44:03 -0000	1.85
+++ busybox.spec	26 Aug 2008 12:17:53 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.10.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -16,6 +16,7 @@
 Patch14: busybox-1.9.0-msh.patch
 Patch16: busybox-1.10.1-hwclock.patch
 Patch17: busybox-1.10.1-headers.patch
+Patch18: busybox-1.10.3-findfs.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -60,13 +61,13 @@
 %patch14 -b .msh -p1
 %patch16 -b .ia64 -p1
 %patch17 -b .header -p1
+%patch18 -b .ff -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
 make defconfig
 make CC="gcc $RPM_OPT_FLAGS"
 cp busybox busybox-static
-
 # create busybox optimized for anaconda 
 make clean
 # revert the static patches
@@ -112,6 +113,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Tue Aug 26 2008 Ivana Varekova <varekova at redhat.com> - 1:1.10.3-3
+- fix findfs problem - #455998
+
 * Wed Jul 23 2008 Ivana Varekova <varekova at redhat.com> - 1:1.10.3-2
 - add findfs to static version of busybox 
   (kexec-tools need it #455998)




More information about the fedora-extras-commits mailing list