rpms/busybox/devel busybox-1.1.1-selinux.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 6 15:07:14 UTC 2006 

Author: varekova

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

Modified Files:
	busybox-1.1.1-selinux.patch 
Log Message:
fix selinux patch 


busybox-1.1.1-selinux.patch:
 Config.in             |    1 
 Makefile              |    6 ++---
 include/applets.h     |    1 
 include/usage.h       |    9 ++++++++
 selinux/Config.in     |   16 ++++++++++++++
 selinux/Makefile      |   30 +++++++++++++++++++++++++++
 selinux/Makefile.in   |   35 +++++++++++++++++++++++++++++++
 selinux/load_policy.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 150 insertions(+), 3 deletions(-)

Index: busybox-1.1.1-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox-1.1.1-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.1.1-selinux.patch	6 Apr 2006 12:21:29 -0000	1.1
+++ busybox-1.1.1-selinux.patch	6 Apr 2006 15:07:08 -0000	1.2
@@ -1,9 +1,44 @@
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Makefile.in	2006-04-06 12:28:37.485563704 +0200
-@@ -0,0 +1,35 @@
+--- busybox-1.1.1/Makefile.selinux	2006-03-22 22:16:26.000000000 +0100
++++ busybox-1.1.1/Makefile	2006-04-06 16:27:46.000000000 +0200
+@@ -27,7 +27,7 @@
+ 
+ DIRS:=applets archival archival/libunarchive coreutils console-tools \
+ 	debianutils editors findutils init miscutils modutils networking \
+-	networking/libiproute networking/udhcp procps loginutils shell \
++	networking/libiproute networking/udhcp procps loginutils selinux shell \
+ 	sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb
+ 
+ SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
+@@ -196,7 +196,7 @@
+ 
+ defconfig: scripts/config/conf
+ 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+-	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
++	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+ 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN)
+ 
+ 
+@@ -298,7 +298,7 @@
+ 	-o $@ -Wl,--start-group  \
+ 	$(APPLETS_DEFINE) $(APPLET_SRC) \
+ 	$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
+-	$(LDBUSYBOX) $(LIBRARIES) \
++	$(LDBUSYBOX) $(LIBRARIES) -lsepol\
+ 	-Wl,--end-group
+ 
+ busybox: busybox_unstripped
+--- busybox-1.1.1/Config.in.selinux	2006-03-22 22:16:26.000000000 +0100
++++ busybox-1.1.1/Config.in	2006-04-06 16:27:38.000000000 +0200
+@@ -405,3 +405,4 @@
+ source procps/Config.in
+ source shell/Config.in
+ source sysklogd/Config.in
++source selinux/Config.in
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Makefile	2006-04-06 16:27:38.000000000 +0200
+@@ -0,0 +1,30 @@
 +# Makefile for busybox
 +#
-+# Copyright (C) 2003 by Dan Walsh <dwalsh at redhat.com>
 +# Copyright (C) 1999-2003 by Erik Andersen <andersen at codepoet.org>
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -21,23 +56,19 @@
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 +#
 +
-+SELINUX_AR:=selinux.a
-+ifndef $(SELINUX_DIR)
-+SELINUX_DIR:=$(TOPDIR)selinux/
-+endif
-+
-+SELINUX-y:=
-+SELINUX-$(CONFIG_LOAD_POLICY)		+= load_policy.o
-+libraries-y+=$(SELINUX_DIR)$(SELINUX_AR)
-+
-+$(SELINUX_DIR)$(SELINUX_AR): $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
-+	$(AR) -ro $@ $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
++TOPDIR:= ../
++SELINUX_DIR:=./
++include $(TOPDIR).config
++include $(TOPDIR)Rules.mak
++include Makefile.in
++all: $(libraries-y)
++-include $(TOPDIR).depend
 +
-+$(SELINUX_DIR)%.o: $(SELINUX_DIR)%.c
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++clean:
++	rm -f *.o *.a $(AR_TARGET)
 +
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Config.in	2006-04-06 12:28:37.490562944 +0200
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Config.in	2006-04-06 16:27:38.000000000 +0200
 @@ -0,0 +1,16 @@
 +#
 +# For a description of the syntax of this configuration file,
@@ -55,11 +86,12 @@
 +endif
 +endmenu
 +
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/Makefile	2006-04-06 12:28:37.491562792 +0200
-@@ -0,0 +1,30 @@
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/Makefile.in	2006-04-06 16:27:38.000000000 +0200
+@@ -0,0 +1,35 @@
 +# Makefile for busybox
 +#
++# Copyright (C) 2003 by Dan Walsh <dwalsh at redhat.com>
 +# Copyright (C) 1999-2003 by Erik Andersen <andersen at codepoet.org>
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -77,19 +109,23 @@
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 +#
 +
-+TOPDIR:= ../
-+SELINUX_DIR:=./
-+include $(TOPDIR).config
-+include $(TOPDIR)Rules.mak
-+include Makefile.in
-+all: $(libraries-y)
-+-include $(TOPDIR).depend
++SELINUX_AR:=selinux.a
++ifndef $(SELINUX_DIR)
++SELINUX_DIR:=$(TOPDIR)selinux/
++endif
 +
-+clean:
-+	rm -f *.o *.a $(AR_TARGET)
++SELINUX-y:=
++SELINUX-$(CONFIG_LOAD_POLICY)		+= load_policy.o
++libraries-y+=$(SELINUX_DIR)$(SELINUX_AR)
++
++$(SELINUX_DIR)$(SELINUX_AR): $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
++	$(AR) -ro $@ $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
++
++$(SELINUX_DIR)%.o: $(SELINUX_DIR)%.c
++	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 +
---- /dev/null	2006-04-06 08:55:50.820704048 +0200
-+++ busybox-1.1.1/selinux/load_policy.c	2006-04-06 12:28:37.491562792 +0200
+--- /dev/null	2006-04-05 10:16:44.607940000 +0200
++++ busybox-1.1.1/selinux/load_policy.c	2006-04-06 16:27:38.000000000 +0200
 @@ -0,0 +1,55 @@
 +#include <unistd.h>
 +#include <sys/types.h>
@@ -146,8 +182,18 @@
 +	}
 +	return EXIT_SUCCESS;
 +}
+--- busybox-1.1.1/include/applets.h.selinux	2006-03-22 22:16:24.000000000 +0100
++++ busybox-1.1.1/include/applets.h	2006-04-06 16:27:38.000000000 +0200
+@@ -163,6 +163,7 @@
+ USE_SETARCH(APPLET_NOUSAGE(linux64, setarch_main, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT, _BB_SUID_NEVER))
+ USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
++USE_LOAD_POLICY(APPLET(load_policy, load_policy_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 --- busybox-1.1.1/include/usage.h.selinux	2006-03-22 22:16:24.000000000 +0100
-+++ busybox-1.1.1/include/usage.h	2006-04-06 12:28:37.493562488 +0200
++++ busybox-1.1.1/include/usage.h	2006-04-06 16:27:38.000000000 +0200
 @@ -2413,6 +2413,15 @@
  #else
  #define USAGE_PS "\nOptions:"
@@ -164,40 +210,3 @@
  #if ENABLE_FEATURE_PS_WIDE
  #define USAGE_PS_WIDE(a) a
  #else
---- busybox-1.1.1/include/applets.h.selinux	2006-03-22 22:16:24.000000000 +0100
-+++ busybox-1.1.1/include/applets.h	2006-04-06 12:28:37.494562336 +0200
-@@ -163,6 +163,7 @@
- USE_SETARCH(APPLET_NOUSAGE(linux64, setarch_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT, _BB_SUID_NEVER))
- USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
-+USE_LOAD_POLICY(APPLET(load_policy, load_policy_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
---- busybox-1.1.1/Config.in.selinux	2006-03-22 22:16:26.000000000 +0100
-+++ busybox-1.1.1/Config.in	2006-04-06 12:28:37.494562336 +0200
-@@ -405,3 +405,4 @@
- source procps/Config.in
- source shell/Config.in
- source sysklogd/Config.in
-+source selinux/Config.in
---- busybox-1.1.1/Makefile.selinux	2006-03-22 22:16:26.000000000 +0100
-+++ busybox-1.1.1/Makefile	2006-04-06 12:30:20.636882320 +0200
-@@ -27,7 +27,7 @@
- 
- DIRS:=applets archival archival/libunarchive coreutils console-tools \
- 	debianutils editors findutils init miscutils modutils networking \
--	networking/libiproute networking/udhcp procps loginutils shell \
-+	networking/libiproute networking/udhcp procps loginutils selinux shell \
- 	sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb
- 
- SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
-@@ -196,7 +196,7 @@
- 
- defconfig: scripts/config/conf
- 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN)
--	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
-+	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
- 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN)
- 
-

More information about the fedora-cvs-commits mailing list