rpms/busybox/devel busybox-1.2.0-anaconda.patch, NONE, 1.1 busybox-1.2.0-gcc41.patch, NONE, 1.1 busybox-1.2.0-id_ps.patch, NONE, 1.1 busybox-1.2.0-page_size.patch, NONE, 1.1 busybox-1.2.0-selinux.patch, NONE, 1.1 busybox-1.2.0-static.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 busybox.spec, 1.43, 1.44 sources, 1.12, 1.13 busybox-1.1.1-anaconda.patch, 1.2, NONE busybox-1.1.1-id_ps.patch, 1.1, NONE busybox-1.1.1-overfl.patch, 1.1, NONE busybox-1.1.1-page_size.patch, 1.1, NONE busybox-1.1.1-selinux.patch, 1.3, NONE busybox-1.1.1-static.patch, 1.1, NONE busybox-1.1.2-gcc111.patch, 1.2, NONE

[fedora-cvs-commits redhat com]

Author: varekova

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

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.2.0-anaconda.patch busybox-1.2.0-gcc41.patch 
	busybox-1.2.0-id_ps.patch busybox-1.2.0-page_size.patch 
	busybox-1.2.0-selinux.patch busybox-1.2.0-static.patch 
Removed Files:
	busybox-1.1.1-anaconda.patch busybox-1.1.1-id_ps.patch 
	busybox-1.1.1-overfl.patch busybox-1.1.1-page_size.patch 
	busybox-1.1.1-selinux.patch busybox-1.1.1-static.patch 
	busybox-1.1.2-gcc111.patch 
Log Message:
update to 1.2.0


busybox-1.2.0-anaconda.patch:
 Makefile              |    3 ++-
 util-linux/nfsmount.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE busybox-1.2.0-anaconda.patch ---
--- busybox-1.2.0/util-linux/nfsmount.c.anaconda	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/util-linux/nfsmount.c	2006-07-04 12:19:42.000000000 +0200
@@ -412,7 +412,7 @@
 	intr = 0;
 	posix = 0;
 	nocto = 0;
-	nolock = 0;
+	nolock = 1;
 	noac = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 	tcp = 0;
--- busybox-1.2.0/Makefile.anaconda	2006-07-04 12:19:42.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-04 12:37:25.000000000 +0200
@@ -228,7 +228,8 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(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
+	@$(SED) -i -r -e "s/^(CONFIG_FEATURE_UNARCHIVE_TAPE|CONFIG_FEATURE_LS_COLOR|CONFIG_FEATURE_VI_READONLY|CONFIG_FEATURE_SH_IS_NONE|CONFIG_INIT|CONFIG_POWEROFF|CONFIG_REBOOT|CONFIG_HALT|CONFIG_ASH_JOB_CONTROL|CONFIG_SYSLOGD|CONFIG_KLOGD|CONFIG_LOGGER|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
+	@$(SED) -i -r -e "s/^# CONFIG_FEATURE_SH_IS_ASH is not set/CONFIG_FEATURE_SH_IS_ASH=y/" .config
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
 
 

busybox-1.2.0-gcc41.patch:
 Rules.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-gcc41.patch ---
--- busybox-1.2.0/Rules.mak.gcc41	2006-07-04 08:55:30.000000000 +0200
+++ busybox-1.2.0/Rules.mak	2006-07-04 08:57:28.000000000 +0200
@@ -397,7 +397,7 @@
 			-o $@ $(LD_START_GROUP)  \
 			$(APPLETS_DEFINE) $(APPLET_SRC) \
 			$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
-			$(LDBUSYBOX) $(LIBRARIES) -lsepol\
+			$(LDBUSYBOX) $(LIBRARIES) -lsepol \
 			$(LD_END_GROUP)
 cmd_link.so        = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
 			$(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \

busybox-1.2.0-id_ps.patch:
 coreutils/id.c |   35 +++++++++++++++++++++++++++++------
 procps/ps.c    |    4 ++--
 2 files changed, 31 insertions(+), 8 deletions(-)

--- NEW FILE busybox-1.2.0-id_ps.patch ---
--- busybox-1.2.0/coreutils/id.c.id_ps	2006-07-01 00:42:07.000000000 +0200
+++ busybox-1.2.0/coreutils/id.c	2006-07-03 17:12:34.000000000 +0200
@@ -26,6 +26,7 @@
 #define NAME_NOT_NUMBER   2
 #define JUST_USER         4
 #define JUST_GROUP        8
+#define JUST_CONTEXT	 16
 
 static short printf_full(unsigned int id, const char *arg, const char prefix)
 {
@@ -50,9 +51,17 @@
 
 	/* Don't allow -n -r -nr -ug -rug -nug -rnug */
 	/* Don't allow more than one username */
-	bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
+#ifdef CONFIG_SELINUX
+       /* Don't allow -gZ, -uZ or -nZ */
+       bb_opt_complementally = "?1:?:u--g:g--u:g--Z:Z--g:u--Z:Z--u:Z--n:n--Z:r?ug:n?ug";
+#else
+       bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug:";
+#endif
+#ifdef CONFIG_SELINUX
+        flags = bb_getopt_ulflags(argc, argv, "rnugZ");
+#else
 	flags = bb_getopt_ulflags(argc, argv, "rnug");
-
+#endif
 	/* This values could be overwritten later */
 	uid = geteuid();
 	gid = getegid();
@@ -81,12 +90,20 @@
 		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
 
+#ifndef CONFIG_SELINUX
+       if ((flags & JUST_CONTEXT) & (is_selinux_enabled())) {
+               flags -= JUST_CONTEXT;
+       }
+#endif
+
 	/* Print full info like GNU id */
 	/* bb_getpwuid doesn't exit on failure here */
-	status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
-	putchar(' ');
-	/* bb_getgrgid doesn't exit on failure here */
-	status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+       if (!(flags & JUST_CONTEXT))  {
+               status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
+               putchar(' ');
+               /* bb_getgrgid doesn't exit on failure here */
+               status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+       }
 
 #ifdef CONFIG_SELINUX
 	if ( is_selinux_enabled() ) {
@@ -104,6 +121,12 @@
 					safe_strncpy(context, "unknown",8);
 			}
 		bb_printf(" context=%s", context);
+		if (flags & JUST_CONTEXT) {
+		       bb_printf("%s", context);
+		}
+		else {
+		       bb_printf(" context=%s", context);
+		}              
 	}
 #endif
 
--- busybox-1.2.0/procps/ps.c.id_ps	2006-07-01 00:42:12.000000000 +0200
+++ busybox-1.2.0/procps/ps.c	2006-07-03 17:02:27.000000000 +0200
@@ -44,11 +44,11 @@
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 	/* handle arguments */
 #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX
-	i = bb_getopt_ulflags(argc, argv, "wc", &w_count);
+	i = bb_getopt_ulflags(argc, argv, "wZ", &w_count);
 #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX
 	bb_getopt_ulflags(argc, argv, "w", &w_count);
 #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */
-	i = bb_getopt_ulflags(argc, argv, "c");
+	i = bb_getopt_ulflags(argc, argv, "Z");
 #endif
 #if ENABLE_FEATURE_PS_WIDE
 	/* if w is given once, GNU ps sets the width to 132,

busybox-1.2.0-page_size.patch:
 mkswap.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-page_size.patch ---
--- busybox-1.1.1/util-linux/mkswap.c.ia64	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/util-linux/mkswap.c	2006-05-03 11:25:48.000000000 +0200
@@ -42,7 +42,8 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>			/* for _IO */
 #include <sys/utsname.h>
-#include <asm/page.h>			/* for PAGE_SIZE and PAGE_SHIFT */
+//#include <asm/page.h>			
+#include <unistd.h>             /* for syssconf command to get PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */
 #include "busybox.h"
 
@@ -54,6 +55,8 @@
 #define BLKGETSIZE _IO(0x12,96)
 #endif
 
+unsigned long PAGE_SIZE;
+
 static char *device_name = NULL;
 static int DEV = -1;
 static long PAGES = 0;
@@ -84,6 +87,7 @@
 static inline void init_signature_page(void)
 {
 	pagesize = getpagesize();
+        PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
 
 #ifdef PAGE_SIZE
 	if (pagesize != PAGE_SIZE)

busybox-1.2.0-selinux.patch:
 Config.in             |    1 
 Makefile              |    4 +--
 Rules.mak             |    2 -
 include/applets.h     |    1 
 include/usage.h       |   13 ++++++++++-
 selinux/Config.in     |   16 ++++++++++++++
 selinux/Makefile      |   30 +++++++++++++++++++++++++++
 selinux/Makefile.in   |   35 +++++++++++++++++++++++++++++++
 selinux/load_policy.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 152 insertions(+), 5 deletions(-)

--- NEW FILE busybox-1.2.0-selinux.patch ---
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Makefile.in	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,35 @@
+# Makefile for busybox
+#
+# Copyright (C) 2003 by Dan Walsh <dwalsh redhat com>
+# Copyright (C) 1999-2003 by Erik Andersen <andersen codepoet org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# 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))
+
+$(SELINUX_DIR)%.o: $(SELINUX_DIR)%.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Config.in	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,16 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Selinux Utilities"
+
+if CONFIG_SELINUX
+config CONFIG_LOAD_POLICY
+	bool "load_policy"
+	default n
+	help
+	  Enable support for loading SE Linux into the kernel.
+endif
+endmenu
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Makefile	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,30 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2003 by Erik Andersen <andersen codepoet org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# 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
+
+clean:
+	rm -f *.o *.a $(AR_TARGET)
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/load_policy.c	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,55 @@
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/mman.h>
+#include <selinux/selinux.h>
+#include <locale.h>			    /* for setlocale() */
+#include <libintl.h>			    /* for gettext() */
+#define _(msgid) gettext (msgid)
+#ifndef PACKAGE
+#define PACKAGE "policycoreutils"   /* the name of this package lang translation */
+#endif
+
+extern int load_policy_main(int argc, char **argv) 
+{
+	int fd, ret;
+	struct stat sb;
+	void *map;
+
+	if (argc != 2) {
+		fprintf(stderr, _("usage:  %s policyfile\n"), argv[0]);
+		return 1;
+	}
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, _("Can't open '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	if (fstat(fd, &sb) < 0) {
+		fprintf(stderr, _("Can't stat '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED) {
+		fprintf(stderr, _("Can't map '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	ret = security_load_policy(map, sb.st_size);
+	if (ret < 0) {
+		fprintf(stderr, _("%s:  security_load_policy failed\n"), argv[0]);
+		return 3;
+	}
+	return EXIT_SUCCESS;
+}
--- busybox-1.2.0/include/usage.h.selinux	2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.2.0/include/usage.h	2006-07-03 13:22:00.000000000 +0200
@@ -1133,7 +1133,7 @@
 #define id_full_usage \
 	"Print information for USERNAME or the current user\n\n" \
 	"Options:\n" \
-	USAGE_SELINUX("\t-c\tprints only the security context\n") \
+	USAGE_SELINUX("\t-Z\tprints only the security context\n") \
 	"\t-g\tprints only the group ID\n" \
 	"\t-u\tprints only the user ID\n" \
 	"\t-n\tprint a name instead of a number\n" \
@@ -2326,6 +2326,15 @@
 #else
 #define USAGE_PS "\nOptions:"
 #endif
+
+#define load_policy_trivial_usage \
+        ""
+#define load_policy_full_usage \
+	        "load SELinux policy\n"
+		
+#define load_policy_example_usage \
+        "$ load_policy /etc/selinux/strict/policy/policy.17\n"
+			
 #if ENABLE_FEATURE_PS_WIDE
 #define USAGE_PS_WIDE(a) a
 #else
@@ -2337,7 +2346,7 @@
 #define ps_full_usage \
 	"Report process status\n" \
 	USAGE_PS \
-	USAGE_SELINUX("\n\t-c\tshow SE Linux context") \
+	USAGE_SELINUX("\n\t-Z\tshow SE Linux context") \
 	USAGE_PS_WIDE("\n\tw\twide output")
 
 #define ps_example_usage \
--- busybox-1.2.0/include/applets.h.selinux	2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.2.0/include/applets.h	2006-07-03 13:22:27.000000000 +0200
@@ -166,6 +166,7 @@
 USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER))
 USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
--- busybox-1.2.0/Config.in.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Config.in	2006-07-03 13:22:00.000000000 +0200
@@ -473,3 +473,4 @@
 source procps/Config.in
 source shell/Config.in
 source sysklogd/Config.in
+source selinux/Config.in
--- busybox-1.2.0/Rules.mak.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Rules.mak	2006-07-03 13:22:00.000000000 +0200
@@ -397,7 +397,7 @@
 			-o $@ $(LD_START_GROUP)  \
 			$(APPLETS_DEFINE) $(APPLET_SRC) \
 			$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
-			$(LDBUSYBOX) $(LIBRARIES) \
+			$(LDBUSYBOX) $(LIBRARIES) -lsepol\
 			$(LD_END_GROUP)
 cmd_link.so        = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
 			$(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \
--- busybox-1.2.0/Makefile.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-03 13:22:00.000000000 +0200
@@ -33,7 +33,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))
@@ -228,7 +228,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(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) > /dev/null
 
 

busybox-1.2.0-static.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-static.patch ---
--- busybox-1.2.0/Makefile.static	2006-07-03 15:37:16.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-03 15:38:57.000000000 +0200
@@ -228,7 +228,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(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
+	@$(SED) -i -r -e "s/^(CONFIG_FEATURE_LS_COLOR|CONFIG_ASH|CONFIG_FDFLUSH|USING_CROSS_COMPILER|CONFIG_(DEBUG.*|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) > /dev/null
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 May 2006 09:32:21 -0000	1.12
+++ .cvsignore	4 Jul 2006 11:10:22 -0000	1.13
@@ -1 +1 @@
-busybox-1.1.3.tar.bz2
+busybox-1.2.0.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- busybox.spec	9 Jun 2006 02:40:45 -0000	1.43
+++ busybox.spec	4 Jul 2006 11:10:26 -0000	1.44
@@ -1,19 +1,18 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.1.3
-Release: 2
+Version: 1.2.0
+Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-Patch: busybox-1.1.1-static.patch
-Patch1: busybox-1.1.1-anaconda.patch
-Patch2: busybox-1.1.1-selinux.patch
+Patch: busybox-1.2.0-static.patch
+Patch1: busybox-1.2.0-anaconda.patch
+Patch2: busybox-1.2.0-selinux.patch
 Patch4: busybox-1.1.1-ppc64.patch
-Patch5: busybox-1.1.1-page_size.patch
-Patch6: busybox-1.1.1-overfl.patch
-Patch7: busybox-1.1.1-id_ps.patch
-Patch8: busybox-1.1.2-gcc111.patch
+Patch5: busybox-1.2.0-page_size.patch
+Patch7: busybox-1.2.0-id_ps.patch
+Patch8: busybox-1.2.0-gcc41.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -45,7 +44,6 @@
 %patch4 -b .ppc64 -p1
 %endif
 %patch5 -b .ia64 -p1
-%patch6 -b .overfl -p1
 %patch7 -b .id_ps -p1
 %patch8 -b .gcc111 -p1
 
@@ -61,7 +59,7 @@
 done
 
 patch -b --suffix .anaconda -p1 < %{PATCH1}
-patch -b --suffix .gcc111 -p1 <%{PATCH8}
+#patch -b --suffix .gcc111 -p1 <%{PATCH8}
 make DOLFS=y defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 
@@ -86,6 +84,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Tue Jul  4 2006 Ivana Varekova <varekova redhat com> - 1:1.2.0-1
+- update to 1.2.0
+
 * Thu Jun  8 2006 Jeremy Katz <katzj redhat com> - 1:1.1.3-2
 - fix so that busybox.anaconda has sh
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 May 2006 09:32:23 -0000	1.12
+++ sources	4 Jul 2006 11:10:26 -0000	1.13
@@ -1 +1 @@
-19a0b475169335f17e421cf644616fe7  busybox-1.1.3.tar.bz2
+0a3e5d47adc4debda22726295f40a6f2  busybox-1.2.0.tar.bz2


--- busybox-1.1.1-anaconda.patch DELETED ---


--- busybox-1.1.1-id_ps.patch DELETED ---


--- busybox-1.1.1-overfl.patch DELETED ---


--- busybox-1.1.1-page_size.patch DELETED ---


--- busybox-1.1.1-selinux.patch DELETED ---


--- busybox-1.1.1-static.patch DELETED ---


--- busybox-1.1.2-gcc111.patch DELETED ---