rpms/busybox/devel busybox-selinux.patch, 1.6, 1.7 busybox.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3292

Modified Files:
	busybox-selinux.patch busybox.spec 
Log Message:
* Thu Oct 13 2005 Daniel Walsh <dwalsh at redhat.com> -  1.01-2
- Add sepol for linking load_policy


busybox-selinux.patch:
 busybox-1.00.rc1/include/applets.h       |    3 +
 busybox-1.00.rc1/include/libbb.h         |    6 +--
 busybox-1.00.rc1/include/usage.h         |   17 ++++++---
 busybox-1.00.rc1/loginutils/login.c      |   31 +++++++----------
 busybox-1.00.rc1/loginutils/su.c         |    2 -
 busybox-1.00.rc1/procps/ps.c             |   20 +++--------
 busybox-1.00.rc1/selinux/Config.in       |   16 +++++++++
 busybox-1.00.rc1/sysdeps/linux/Config.in |    1 
 busybox-1.00.rc1/sysdeps/linux/defconfig |    3 +
 busybox-1.00/Makefile                    |    5 +-
 busybox-1.00/coreutils/id.c              |   18 +++-------
 busybox-1.00/coreutils/ls.c              |   52 +++++++++++++----------------
 busybox-1.00/libbb/procps.c              |    7 ++-
 busybox-1.00/libbb/run_shell.c           |   12 ++----
 busybox-1.00/selinux/Makefile            |   30 ++++++++++++++++
 busybox-1.00/selinux/load_policy.c       |   55 +++++++++++++++++++++++++++++++
 busysox-1.00/selinux/Makefile.in         |   35 +++++++++++++++++++
 17 files changed, 221 insertions(+), 92 deletions(-)

Index: busybox-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox-selinux.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- busybox-selinux.patch	26 Jan 2005 13:07:43 -0000	1.6
+++ busybox-selinux.patch	13 Oct 2005 13:21:39 -0000	1.7
@@ -207,7 +207,6 @@
 +clean:
 +	rm -f *.o *.a $(AR_TARGET)
 +
-
 --- busybox-1.00/coreutils/ls.c.selinux	2004-03-27 11:02:42.000000000 +0100
 +++ busybox-1.00/coreutils/ls.c	2004-09-17 17:58:21.999101125 +0200
 @@ -63,9 +63,7 @@
@@ -558,7 +557,6 @@
  #ifdef CONFIG_LOADFONT
  	APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
  #endif
-
 --- busybox-1.00/Makefile.selinux	2004-10-08 09:45:08.000000000 +0200
 +++ busybox-1.00/Makefile	2005-01-25 11:27:40.083576280 +0100
 @@ -42,13 +42,12 @@
@@ -573,7 +571,7 @@
  ifeq ($(strip $(CONFIG_SELINUX)),y)
 -CFLAGS += -I/usr/include/selinux
 -LIBRARIES += -lsecure
-+LIBRARIES += -lselinux
++LIBRARIES += -lselinux -lsepol
  endif
  
  CONFIG_CONFIG_IN = $(top_srcdir)/sysdeps/$(TARGET_OS)/Config.in


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- busybox.spec	1 Sep 2005 13:12:02 -0000	1.27
+++ busybox.spec	13 Oct 2005 13:21:39 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.01
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -11,7 +11,7 @@
 Patch2: busybox-selinux.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: libselinux-devel
+BuildRequires: libselinux-devel >= 1.27.7-2
 
 %package anaconda
 Group: System Environment/Shells
@@ -74,6 +74,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Thu Oct 13 2005 Daniel Walsh <dwalsh at redhat.com> -  1.01-2
+- Add sepol for linking load_policy
+
 * Thu Sep  1 2005 Ivana Varekova <varekova at redhat.com> - 1.01-1
 - update to 1.01