[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/busybox/devel busybox-1.5.1-anaconda.patch, NONE, 1.1 busybox-1.5.1-clean.patch, NONE, 1.1 busybox-1.5.1-selinux.patch, NONE, 1.1 busybox-1.5.1-static.patch, NONE, 1.1 busybox-1.5.1-tar.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 busybox.spec, 1.58, 1.59 sources, 1.14, 1.15 busybox-1.2.0-anaconda.patch, 1.1, NONE busybox-1.2.0-page_size.patch, 1.1, NONE busybox-1.2.0-selinux.patch, 1.2, NONE busybox-1.2.0-static.patch, 1.1, NONE busybox-1.2.0-tar.patch, 1.1, NONE busybox-1.2.2-ash.patch, 1.1, NONE busybox-1.2.2-id_ps.patch, 1.2, NONE



Author: varekova

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

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.5.1-anaconda.patch busybox-1.5.1-clean.patch 
	busybox-1.5.1-selinux.patch busybox-1.5.1-static.patch 
	busybox-1.5.1-tar.patch 
Removed Files:
	busybox-1.2.0-anaconda.patch busybox-1.2.0-page_size.patch 
	busybox-1.2.0-selinux.patch busybox-1.2.0-static.patch 
	busybox-1.2.0-tar.patch busybox-1.2.2-ash.patch 
	busybox-1.2.2-id_ps.patch 
Log Message:
- update to 1.5.1


busybox-1.5.1-anaconda.patch:

--- NEW FILE busybox-1.5.1-anaconda.patch ---
--- busybox-1.5.1/scripts/defconfig.anaconda	2007-05-24 11:59:44.000000000 +0200
+++ busybox-1.5.1/scripts/defconfig	2007-05-24 12:06:54.000000000 +0200
@@ -112,7 +112,7 @@
 #
 # 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
@@ -172,7 +172,7 @@
 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
@@ -291,7 +291,7 @@
 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
@@ -326,7 +326,7 @@
 #
 # Init Utilities
 #
-CONFIG_INIT=y
+# CONFIG_INIT is not set
 # CONFIG_DEBUG_INIT is not set
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_INIT_SCTTY=y
@@ -334,7 +334,7 @@
 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
 
 #
@@ -632,7 +632,7 @@
 #
 # 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
@@ -659,15 +659,15 @@
 #
 # System Logging Utilities
 #
-CONFIG_SYSLOGD=y
+# CONFIG_SYSLOGD is not set
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 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.5.1-clean.patch:

--- NEW FILE busybox-1.5.1-clean.patch ---
--- busybox-1.5.1/Makefile.clean	2007-05-20 19:00:47.000000000 +0200
+++ busybox-1.5.1/Makefile	2007-05-23 15:24:26.000000000 +0200
@@ -910,7 +910,7 @@
 
 # Directories & files removed with 'make clean'
 CLEAN_DIRS  += $(MODVERDIR)
-CLEAN_FILES +=	busybox* System.map .kernelrelease \
+CLEAN_FILES +=	busybox busybox.map busybox_unstripped System.map .kernelrelease \
                 .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
 
 # Directories & files removed with 'make mrproper'

busybox-1.5.1-selinux.patch:

--- NEW FILE busybox-1.5.1-selinux.patch ---
--- busybox-1.5.1/scripts/defconfig.selinux	2007-05-20 18:54:41.000000000 +0200
+++ busybox-1.5.1/scripts/defconfig	2007-05-23 15:13:06.000000000 +0200
@@ -27,7 +27,8 @@
 CONFIG_FEATURE_SUID_CONFIG=y
 CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 # CONFIG_FEATURE_HAVE_RPC is not set
-# CONFIG_SELINUX is not set
+CONFIG_SELINUX=y
+CONFIG_LOAD_POLICY=y
 # CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 
--- busybox-1.5.1/include/usage.h.selinux	2007-05-20 18:57:20.000000000 +0200
+++ busybox-1.5.1/include/usage.h	2007-05-23 15:13:06.000000000 +0200
@@ -2574,6 +2574,14 @@
 #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" 
+
 #define ps_trivial_usage \
        ""
 #define ps_full_usage \
--- busybox-1.5.1/include/applets.h.selinux	2007-05-20 18:57:20.000000000 +0200
+++ busybox-1.5.1/include/applets.h	2007-05-23 15:13:06.000000000 +0200
@@ -180,6 +180,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))
--- /dev/null	2007-05-21 09:50:45.581956304 +0200
+++ busybox-1.5.1/selinux/load_policy.c	2007-05-23 15:13:06.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.5.1/selinux/Config.in.selinux	2007-05-20 18:57:21.000000000 +0200
+++ busybox-1.5.1/selinux/Config.in	2007-05-23 15:13:06.000000000 +0200
@@ -71,5 +71,11 @@
 	help
 	  Enable support to modify the mode SELinux is running in.
 
+config LOAD_POLICY 
+       bool "load_policy" 
+       default n 
+       help 
+         Enable support for loading SE Linux into the kernel. 
+
 endmenu
 
--- busybox-1.5.1/selinux/Kbuild.selinux	2007-05-20 18:57:21.000000000 +0200
+++ busybox-1.5.1/selinux/Kbuild	2007-05-23 15:13:06.000000000 +0200
@@ -13,3 +13,4 @@
 lib-$(CONFIG_RUNCON)		+= runcon.o
 lib-$(CONFIG_SELINUXENABLED)	+= selinuxenabled.o
 lib-$(CONFIG_SETENFORCE)	+= setenforce.o
+lib-$(CONFIG_LOAD_POLICY)       += load_policy.o
\ No newline at end of file

busybox-1.5.1-static.patch:

--- NEW FILE busybox-1.5.1-static.patch ---
--- busybox-1.5.1/scripts/defconfig.static	2007-05-24 11:49:57.000000000 +0200
+++ busybox-1.5.1/scripts/defconfig	2007-05-24 11:50:54.000000000 +0200
@@ -35,7 +35,7 @@
 #
 # Build Options
 #
-# CONFIG_STATIC is not set
+CONFIG_STATIC=y
 # CONFIG_BUILD_LIBBUSYBOX is not set
 # CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
@@ -172,7 +172,7 @@
 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
@@ -400,7 +400,7 @@
 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

busybox-1.5.1-tar.patch:

--- NEW FILE busybox-1.5.1-tar.patch ---
--- busybox-1.5.1/archival/tar.c.pom	2007-05-20 18:55:18.000000000 +0200
+++ busybox-1.5.1/archival/tar.c	2007-05-23 16:15:01.000000000 +0200
@@ -34,6 +34,9 @@
 
 #define TAR_BLOCK_SIZE		512
 
+static const int TAR_MAGIC_LEN = 6; 
+static const int TAR_VERSION_LEN = 2; 
+
 /* POSIX tar Header Block, from POSIX 1003.1-1990  */
 #define NAME_SIZE      100
 #define NAME_SIZE_STR "100"
@@ -178,7 +181,8 @@
 	const unsigned char *cp;
 	int chksum, size;
 
-	strcpy(hp->magic, "ustar  ");
+        strncpy(hp->magic, "ustar ",TAR_MAGIC_LEN); 
+        strncpy(hp->version," ",TAR_VERSION_LEN); 
 
 	/* Calculate and store the checksum (i.e., the sum of all of the bytes of
 	 * the header).  The checksum field must be filled with blanks for the


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Nov 2006 07:28:34 -0000	1.14
+++ .cvsignore	24 May 2007 10:45:06 -0000	1.15
@@ -1 +1 @@
-busybox-1.2.2.tar.bz2
+busybox-1.5.1.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- busybox.spec	10 Apr 2007 14:23:59 -0000	1.58
+++ busybox.spec	24 May 2007 10:45:06 -0000	1.59
@@ -1,22 +1,20 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.2.2
-Release: 8%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source1: busybox-petitboot.config
-Patch: busybox-1.2.0-static.patch
-Patch1: busybox-1.2.0-anaconda.patch
-Patch2: busybox-1.2.0-selinux.patch
+Patch: busybox-1.5.1-static.patch
+Patch1: busybox-1.5.1-anaconda.patch
+Patch2: busybox-1.5.1-selinux.patch
 Patch4: busybox-1.2.0-ppc64.patch
-Patch5: busybox-1.2.0-page_size.patch
-Patch7: busybox-1.2.2-id_ps.patch
-Patch9: busybox-1.2.0-tar.patch
-Patch10: busybox-1.2.2-ash.patch
+Patch9: busybox-1.5.1-tar.patch
 Patch11: busybox-1.2.2-iptunnel.patch
 Patch12: busybox-1.2.2-ls.patch
+Patch13: busybox-1.5.1-clean.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -54,16 +52,14 @@
 
 %prep
 %setup -q
+%patch13 -b .clean -p1
 #SELINUX Patch
 %patch2 -b .selinux -p1
 %patch -b .static -p1
 %ifarch ppc64
 %patch4 -b .ppc64 -p1
 %endif
-%patch5 -b .ia64 -p1
-%patch7 -b .id_ps -p1
 %patch9 -b .tar -p1
-%patch10 -b .ash -p1
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
 
@@ -71,6 +67,7 @@
 # create static busybox - the executable is kept as busybox-static
 make defconfig
 make CC="gcc $RPM_OPT_FLAGS"
+ls -la
 cp busybox busybox-static
 make clean
 
@@ -97,29 +94,29 @@
 install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.anaconda $RPM_BUILD_ROOT/sbin/busybox.anaconda
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
-install -p docs/BusyBox.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
-chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc LICENSE docs/BusyBox.html
+%doc LICENSE docs/busybox.net/*.html docs/busybox.net/images/*
 %defattr(-,root,root,-)
 /sbin/busybox
-%{_mandir}/man1/busybox*
 
 %files anaconda
-%doc LICENSE docs/BusyBox.html
+%doc LICENSE docs/busybox.net/*.html docs/busybox.net/images/*
 %defattr(-,root,root,-)
 /sbin/busybox.anaconda
 
 %files petitboot
-%doc LICENSE docs/BusyBox.html
+%doc LICENSE 
 %defattr(-,root,root,-)
 /sbin/busybox.petitboot
 
 %changelog
+* Thu May 24 2007 Ivana Varekova <varekova redhat com> - 1:1.5.1-1
+- update to 1.5.1
+
 * Sat Apr  7 2007 David Woodhouse <dwmw2 redhat com> - 1:1.2.2-8
 - Add busybox-petitboot subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Nov 2006 07:28:34 -0000	1.14
+++ sources	24 May 2007 10:45:06 -0000	1.15
@@ -1 +1 @@
-ae8a4c65b9464c8ece3483a3d3b9544c  busybox-1.2.2.tar.bz2
+30df6f796b350fd126c07cff7c33b538  busybox-1.5.1.tar.bz2


--- busybox-1.2.0-anaconda.patch DELETED ---


--- busybox-1.2.0-page_size.patch DELETED ---


--- busybox-1.2.0-selinux.patch DELETED ---


--- busybox-1.2.0-static.patch DELETED ---


--- busybox-1.2.0-tar.patch DELETED ---


--- busybox-1.2.2-ash.patch DELETED ---


--- busybox-1.2.2-id_ps.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]