rpms/busybox/devel busybox-1.12.1-selinux.patch, NONE, 1.1 busybox.spec, 1.88, 1.89 busybox-1.10.1-headers.patch, 1.3, NONE
Ivana Varekova
varekova at fedoraproject.org
Tue Dec 2 13:14:22 UTC 2008
- Previous message (by thread): rpms/am-utils/devel am-utils-6.1.5-nolock-toplvl.patch, NONE, 1.1 am-utils.spec, 1.48, 1.49
- Next message (by thread): rpms/am-utils/F-9 am-utils-6.1.5-buildsys.patch, NONE, 1.1 am-utils-6.1.5-expn-temp.patch, NONE, 1.1 am-utils-6.1.5-nolock-toplvl.patch, NONE, 1.1 am-utils.spec, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12114
Modified Files:
busybox.spec
Added Files:
busybox-1.12.1-selinux.patch
Removed Files:
busybox-1.10.1-headers.patch
Log Message:
- enable selinux in static version of busybox (#462724)
busybox-1.12.1-selinux.patch:
--- NEW FILE busybox-1.12.1-selinux.patch ---
diff -up busybox-1.12.1/scripts/defconfig.selinux busybox-1.12.1/scripts/defconfig
--- busybox-1.12.1/scripts/defconfig.selinux 2008-12-02 12:55:58.000000000 +0100
+++ busybox-1.12.1/scripts/defconfig 2008-12-02 13:06:28.000000000 +0100
@@ -30,7 +30,7 @@ CONFIG_FEATURE_PIDFILE=y
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
+CONFIG_SELINUX=y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y
Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- busybox.spec 11 Nov 2008 07:55:17 -0000 1.88
+++ busybox.spec 2 Dec 2008 13:13:52 -0000 1.89
@@ -1,7 +1,7 @@
Summary: Statically linked binary providing simplified versions of system commands
Name: busybox
Version: 1.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Shells
@@ -14,13 +14,14 @@
Patch12: busybox-1.2.2-ls.patch
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
Patch19: busybox-1.12.1-headers.patch
+Patch20: busybox-1.12.1-selinux.patch
URL: http://www.busybox.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libselinux-devel >= 1.27.7-2
BuildRequires: libsepol-devel
+BuildRequires: libselinux-static
%define debug_package %{nil}
@@ -59,9 +60,9 @@
%patch12 -b .ls -p1
%patch14 -b .msh -p1
%patch16 -b .ia64 -p1
-#%patch17 -b .header -p1
%patch18 -b .ff -p1
%patch19 -b .kh -p1
+%patch20 -b .sel -p1
%build
# create static busybox - the executable is kept as busybox-static
@@ -70,6 +71,8 @@
cp busybox busybox-static
# create busybox optimized for anaconda
make clean
+#revert selinux patch
+patch -R -p1 <%{PATCH20}
# revert the static patches
patch -R -p1 <%{PATCH0}
# applied anaconda patch
@@ -113,6 +116,9 @@
/sbin/busybox.petitboot
%changelog
+* Tue Dec 2 2008 Ivana Varekova <varekova at redhat.com> - 1:1.12.1-2
+- enable selinux in static version of busybox (#462724)
+
* Mon Nov 10 2008 Ivana Varekova <varekova at redhat.com> - 1:1.12.1-1
- update to 1.12.1
--- busybox-1.10.1-headers.patch DELETED ---
- Previous message (by thread): rpms/am-utils/devel am-utils-6.1.5-nolock-toplvl.patch, NONE, 1.1 am-utils.spec, 1.48, 1.49
- Next message (by thread): rpms/am-utils/F-9 am-utils-6.1.5-buildsys.patch, NONE, 1.1 am-utils-6.1.5-expn-temp.patch, NONE, 1.1 am-utils-6.1.5-nolock-toplvl.patch, NONE, 1.1 am-utils.spec, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list