This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3ad7d26cfcb3844407d7fb3feb004b99a077eead (commit) via 4f95e1d1fe5852bd56575660a5744bca2f78aae8 (commit) via a9e4b4a5cc7eb652ea90f39f6414c75b0a5b12fe (commit) via 6e36cac1f1298556d5f2a333a20e32a3df8cadf6 (commit) via 8f5513345750b18b3a01ea830abcfaf42bb18c3d (commit) via 89cb01d54f51b4da8e8f54475b9eafd013ad1e8d (commit) via 84eb2e511d6194b72436a67027b0a918c9b480f7 (commit) via cf37c8854f26d6cfadeb2da7c004ef14a12a193a (commit) via 1c895816a620bd9a6cb7e7e335baeb17f30363b0 (commit) via 7dff6d968c6a0835066c138c03114f84c4e622ec (commit) via 03a8a0399d9c60e04a44306e0c040b0124025985 (commit) via 270e6641f990d80c240cb63964cb23fd4a839259 (commit) via 7ae28d5c7e910bbbfb6bd837c5d23412e58095f2 (commit) via bcc40cd6bba1e2a98ccd352d75ecc17b522d9838 (commit) via 0b846e53baba7c816424ba81dc7dc8826603d039 (commit) via 790db92c25ad677927251ae2384ba5df863ee424 (commit) via 79be82dc8507ba6a0e79eb98c7f675e2db66a763 (commit) via 9af9967a6324c3a69fea10355cbda998ca1bc961 (commit) via 971d195a1e8f008ec884c6a12f9773b33f5e21eb (commit) via 69d5bd4e252eb78625254fe0f52619ff240e430c (commit) via a589147d7a39811c5edcbaed22ec63d8b11782ef (commit) via c180be295f82e09f9bc9f415f51d3ae48be5909e (commit) via c29940ef1c55845f9cec4cb3fbc035b1d17a577e (commit) via b797993ba67d1cdab24247b403df911a7193f255 (commit) via a3164301ded260c2b0640d5f57ccea8344bc1d04 (commit) via 93558e75a89be713056291eded4456937ffc6de6 (commit) via 0878cdd7c0296c3a46502e17c4eb1352ccd94dd9 (commit) via 7a13f44205f6dad31a651f40d2e2571a9b8e459a (commit) via 77eff67bbb2be58888036ce483d3cc02820ccf58 (commit) via 9a877d1e1d341c7f972d8e6cad3f585daffa8ff2 (commit) via 889b554e33923c701400af97e2e36ee3696b3990 (commit) via 16cc3e67627a9fe94f37b36388ce990738169792 (commit) via 3c5b07f28f9b1dde96115e957496cd4eab16857c (commit) via 55030fe960f177b293d1f08d67509d6fbad17623 (commit) via 9c8317e79600e7883ac361c7af62e659961d69ed (commit) via bda907d37876f11cccc3ae429c3a6f9ac995b633 (commit) via 083fdda9d3181cec95e63df8cfa454eda64f820e (commit) via e1cd4e4b9bfc2b475df4fe0732ffa060744676de (commit) from f309ab6dd8dbe6e1592db3f0d3a157fd1fc89dac (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3ad7d26cfcb3844407d7fb3feb004b99a077eead Merge: 4f95e1d 89cb01d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 10 12:09:48 2011 +0100
Merge remote branch 'stevee/selinux'
commit 4f95e1d1fe5852bd56575660a5744bca2f78aae8 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 10 12:00:13 2011 +0100
libvirt: Requires libgcrypt-devel for build.
commit a9e4b4a5cc7eb652ea90f39f6414c75b0a5b12fe Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 19:17:54 2011 +0100
libvirt: Enable support for selinux.
Reference #85.
commit 6e36cac1f1298556d5f2a333a20e32a3df8cadf6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 10 11:43:44 2011 +0100
libvirt: Add missing build dependencies.
Conflicts:
pkgs/core/libvirt/libvirt.nm
commit 8f5513345750b18b3a01ea830abcfaf42bb18c3d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 10 11:39:34 2011 +0100
xen: Fix build with newer kernels.
Squashed commit of the following:
commit 0f45e52d39523040a3f4f1adcae1dfc6390d33fe Author: Ben Schweikert trikolon@ipfire.org Date: Sat Jan 8 15:50:46 2011 +0100
Xen: removed xen-detect package and xen-detect is now in xen-runtimes.
commit 488b0676070270b6459050d35cb0efeeaff60935 Author: Ben Schweikert trikolon@ipfire.org Date: Sat Jan 8 15:37:04 2011 +0100
libvirt: fixed xen-tools dependencies.
commit 4fe8b5bf1ef19165e9959aba8f2d7f80459d9195 Author: Ben Schweikert trikolon@ipfire.org Date: Sat Jan 8 15:32:35 2011 +0100
Xen: added extra package for xen-detect and fixed a error with \ WRITE definition.
commit 89cb01d54f51b4da8e8f54475b9eafd013ad1e8d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 17:22:31 2011 +0100
xorg-x11-server: Enable support for selinux.
Reference #85.
commit 84eb2e511d6194b72436a67027b0a918c9b480f7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 16:06:30 2011 +0100
glib2: Enable support for selinux.
Reference #85.
commit cf37c8854f26d6cfadeb2da7c004ef14a12a193a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 15:52:10 2011 +0100
joe: Enable support for selinux.
Reference #85.
commit 1c895816a620bd9a6cb7e7e335baeb17f30363b0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 15:44:03 2011 +0100
net-snmp: Enable support for selinux.
Reference #85.
commit 7dff6d968c6a0835066c138c03114f84c4e622ec Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 15:25:09 2011 +0100
python-pyblock: Enable support for selinux.
Referece #85.
commit 03a8a0399d9c60e04a44306e0c040b0124025985 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 15:16:03 2011 +0100
passwd: Clean up NM add popt-devel as dependency.
commit 270e6641f990d80c240cb63964cb23fd4a839259 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 15:08:02 2011 +0100
iptables: Enable support for selinux.
Reference #85.
commit 7ae28d5c7e910bbbfb6bd837c5d23412e58095f2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 14:56:28 2011 +0100
sed: Enable support for selinux.
Reference #85.
commit bcc40cd6bba1e2a98ccd352d75ecc17b522d9838 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 14:39:45 2011 +0100
lsof: Enable support for selinux.
Reference #85.
commit 0b846e53baba7c816424ba81dc7dc8826603d039 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 14:36:15 2011 +0100
sudo: Enable support for selinux.
Reference #85.
commit 790db92c25ad677927251ae2384ba5df863ee424 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 14:17:43 2011 +0100
net-tools: Enable support for selinux.
Reference #85.
commit 79be82dc8507ba6a0e79eb98c7f675e2db66a763 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:43:54 2011 +0100
util-linux-ng: Enable suppor for selinux.
Reference #85.
commit 9af9967a6324c3a69fea10355cbda998ca1bc961 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:34:28 2011 +0100
procps: Enable support for selinux.
Reference #85.
commit 971d195a1e8f008ec884c6a12f9773b33f5e21eb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:29:22 2011 +0100
sysvinit: Enable support for selinux.
Reference #85.
commit 69d5bd4e252eb78625254fe0f52619ff240e430c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:22:22 2011 +0100
psmisc: Enable support for selinux.
Reference #85.
commit a589147d7a39811c5edcbaed22ec63d8b11782ef Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:19:45 2011 +0100
openssh: Enable support for selinux.
Reference #85.
commit c180be295f82e09f9bc9f415f51d3ae48be5909e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:11:42 2011 +0100
libuser: Enable support for selinux.
Reference #85.
commit c29940ef1c55845f9cec4cb3fbc035b1d17a577e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 8 13:08:32 2011 +0100
vim: Enable support for selinux.
commit b797993ba67d1cdab24247b403df911a7193f255 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:50:39 2011 +0100
smartmontools: Add gcc-c++ as dependency.
commit a3164301ded260c2b0640d5f57ccea8344bc1d04 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:38:16 2011 +0100
fuse: Enable support for selinux.
Reference #85.
commit 93558e75a89be713056291eded4456937ffc6de6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:30:34 2011 +0100
lvm2: Activate support for selinux.
Reference #85.
commit 0878cdd7c0296c3a46502e17c4eb1352ccd94dd9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:26:32 2011 +0100
udev: Activate support for selinux.
Reference #85.
commit 7a13f44205f6dad31a651f40d2e2571a9b8e459a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:20:41 2011 +0100
logrotate: Activate support for selinux.
Reference #85.
commit 77eff67bbb2be58888036ce483d3cc02820ccf58 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:14:10 2011 +0100
tar: Activate support for selinux.
Reference #85.
commit 9a877d1e1d341c7f972d8e6cad3f585daffa8ff2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 16:05:25 2011 +0100
smartmontools: Update to 5.40, activate support for selinux.
Reference #85.
commit 889b554e33923c701400af97e2e36ee3696b3990 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 15:57:27 2011 +0100
mesa: Activate support for selinux.
Reference #85
commit 16cc3e67627a9fe94f37b36388ce990738169792 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 15:41:38 2011 +0100
pam: Activate support for selinux and audit.
commit 3c5b07f28f9b1dde96115e957496cd4eab16857c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 15:34:51 2011 +0100
parted: Activate support for selinux.
commit 55030fe960f177b293d1f08d67509d6fbad17623 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 13:19:25 2011 +0100
findutils: Add support for selinux.
commit 9c8317e79600e7883ac361c7af62e659961d69ed Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 13:03:32 2011 +0100
e2fsprogs: Aktivate support for selinux.
commit bda907d37876f11cccc3ae429c3a6f9ac995b633 Merge: 083fdda 4ea11fe Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jan 6 12:53:55 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into selinux
commit 083fdda9d3181cec95e63df8cfa454eda64f820e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Dec 30 17:13:36 2010 +0100
dmraid: Enable support for selinux.
commit e1cd4e4b9bfc2b475df4fe0732ffa060744676de Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Dec 30 16:59:58 2010 +0100
dbus: Enable support for selinux.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/dbus/dbus.nm | 6 +- pkgs/core/dmraid/dmraid.nm | 7 +- pkgs/core/e2fsprogs/e2fsprogs.nm | 5 +- pkgs/core/findutils/findutils.nm | 4 +- pkgs/core/fuse/fuse.nm | 2 + pkgs/core/glib2/glib2.nm | 4 +- pkgs/core/iptables/iptables.nm | 4 +- pkgs/core/joe/joe.nm | 4 +- pkgs/core/joe/patches/joe-3.4-selinux.patch | 103 ++++++++++++++++++++ pkgs/core/libuser/libuser.nm | 8 +- pkgs/core/libvirt/libvirt.nm | 11 ++- pkgs/core/logrotate/logrotate.nm | 6 +- pkgs/core/lsof/lsof.nm | 4 +- pkgs/core/lvm2/lvm2.nm | 4 +- pkgs/core/mesa/mesa.nm | 6 +- pkgs/core/net-snmp/net-snmp.nm | 2 +- pkgs/core/net-tools/config.make | 2 +- pkgs/core/net-tools/net-tools.nm | 4 +- pkgs/core/openssh/openssh.nm | 7 +- pkgs/core/pam/pam.nm | 25 ++--- pkgs/core/parted/parted.nm | 8 +- pkgs/core/passwd/passwd.nm | 16 +-- .../core/procps/patches/procps-3.2.8-selinux.patch | 96 ++++++++++++++++++ pkgs/core/procps/procps.nm | 4 +- pkgs/core/psmisc/psmisc.nm | 7 +- pkgs/core/python-pyblock/python-pyblock.nm | 7 +- pkgs/core/sed/sed.nm | 22 ++--- pkgs/core/smartmontools/smartmontools.nm | 7 +- pkgs/core/sudo/sudo.nm | 10 +- pkgs/core/sysvinit/sysvinit.nm | 4 +- pkgs/core/tar/tar.nm | 5 +- pkgs/core/udev/udev.nm | 7 +- pkgs/core/util-linux-ng/util-linux-ng.nm | 7 +- pkgs/core/vim/vim.nm | 8 +- pkgs/core/xen/patches/xen-WRITE.patch | 23 +++++ pkgs/core/xen/xen.nm | 7 +- pkgs/core/xorg-x11-server/xorg-x11-server.nm | 16 ++-- 37 files changed, 359 insertions(+), 113 deletions(-) create mode 100644 pkgs/core/joe/patches/joe-3.4-selinux.patch create mode 100644 pkgs/core/procps/patches/procps-3.2.8-selinux.patch create mode 100644 pkgs/core/xen/patches/xen-WRITE.patch
Difference in files: diff --git a/pkgs/core/dbus/dbus.nm b/pkgs/core/dbus/dbus.nm index 1a070ea..0f85d40 100644 --- a/pkgs/core/dbus/dbus.nm +++ b/pkgs/core/dbus/dbus.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = GPLv2+ AFL PKG_SUMMARY = D-BUS message bus.
-PKG_BUILD_DEPS+= expat-devel +PKG_BUILD_DEPS+= audit-devel expat-devel libselinux-devel
define PKG_DESCRIPTION D-BUS is a system for sending messages between applications. It is \ @@ -52,7 +52,9 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --localstatedir=/var \ --libdir=/lib \ - --libexecdir=/lib + --libexecdir=/lib \ + --enable-libaudit \ + --enable-selinux=yes
define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib diff --git a/pkgs/core/dmraid/dmraid.nm b/pkgs/core/dmraid/dmraid.nm index 0c1d660..892955d 100644 --- a/pkgs/core/dmraid/dmraid.nm +++ b/pkgs/core/dmraid/dmraid.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dmraid PKG_VER = 1.0.0.rc15 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Filesystems @@ -34,7 +34,7 @@ PKG_URL = http://people.redhat.com/heinzm/sw/dmraid PKG_LICENSE = GPLv2+ PKG_SUMMARY = Device-mapper RAID tool and library.
-PKG_BUILD_DEPS+= libdevmapper-devel +PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel
define PKG_DESCRIPTION DMRAID supports RAID device discovery, RAID set activation, creation, \ @@ -56,7 +56,8 @@ CONFIGURE_OPTIONS += \ --sbindir=/sbin \ --libdir=/lib \ --disable-static \ - --disable-static_link + --disable-static_link \ + --enable-libselinux
define STAGE_BUILD_CMDS cd $(DIR_APP) && make -C lib libdmraid.so diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm index 498a4f6..b33988a 100644 --- a/pkgs/core/e2fsprogs/e2fsprogs.nm +++ b/pkgs/core/e2fsprogs/e2fsprogs.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = e2fsprogs PKG_VER = 1.41.11 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Filesystems @@ -42,7 +42,8 @@ define PKG_DESCRIPTION and third extended (ext2/ext3) filesystems. endef
-PKG_BUILD_DEPS+= libblkid-devel libuuid-devel pkg-config +PKG_BUILD_DEPS+= libblkid-devel libselinux-devel libsepol-devel libuuid-devel\ + pkg-config
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/findutils/findutils.nm b/pkgs/core/findutils/findutils.nm index d588f97..bfbd060 100644 --- a/pkgs/core/findutils/findutils.nm +++ b/pkgs/core/findutils/findutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = findutils PKG_VER = 4.5.9 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Tools @@ -34,6 +34,8 @@ PKG_URL = http://www.gnu.org/software/findutils/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU versions of find utilities (find and xargs).
+PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The findutils package contains programs which will help you locate \ files on your system. The find utility searches through a hierarchy \ diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/core/fuse/fuse.nm index 2ae82e0..9237c2c 100644 --- a/pkgs/core/fuse/fuse.nm +++ b/pkgs/core/fuse/fuse.nm @@ -34,6 +34,8 @@ PKG_URL = http://fuse.sf.net/ PKG_LICENSE = GPL+ PKG_SUMMARY = File System in Userspace (FUSE) utilities.
+PKG_BUILD_DEPS+= libselinux-devel + PKG_PACKAGES += $(PKG_NAME_REAL)-devel
define PKG_DESCRIPTION diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index 91f0e79..f22fa05 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = glib PKG_VER = 2.27.3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,7 @@ PKG_URL = http://www.gtk.org PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A library of handy utility functions.
-PKG_BUILD_DEPS+= gettext pcre-devel pkg-config zlib-devel +PKG_BUILD_DEPS+= gettext libselinux-devel pcre-devel pkg-config zlib-devel
define PKG_DESCRIPTION GLib is the low-level core library that forms the basis \ diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/core/iptables/iptables.nm index 4d98234..355bdcb 100644 --- a/pkgs/core/iptables/iptables.nm +++ b/pkgs/core/iptables/iptables.nm @@ -26,7 +26,9 @@ include $(PKGROOT)/Include
PKG_NAME = iptables PKG_VER = 1.4.10 -PKG_REL = 0 +PKG_REL = 1 + +PKG_BUILD_DEPS+= libselinux-devel
PKG_MAINTAINER = PKG_GROUP = Networking/Tools diff --git a/pkgs/core/joe/joe.nm b/pkgs/core/joe/joe.nm index d5366eb..970cd33 100644 --- a/pkgs/core/joe/joe.nm +++ b/pkgs/core/joe/joe.nm @@ -26,7 +26,9 @@ include $(PKGROOT)/Include
PKG_NAME = joe PKG_VER = 3.7 -PKG_REL = 0 +PKG_REL = 1 + +PKG_BUILD_DEPS+= libselinux-devel
PKG_MAINTAINER = PKG_GROUP = Applications/Editors diff --git a/pkgs/core/joe/patches/joe-3.4-selinux.patch b/pkgs/core/joe/patches/joe-3.4-selinux.patch new file mode 100644 index 0000000..e9a9709 --- /dev/null +++ b/pkgs/core/joe/patches/joe-3.4-selinux.patch @@ -0,0 +1,103 @@ +diff -up joe-3.7/configure.selinux joe-3.7/configure +--- joe-3.7/configure.selinux 2008-10-30 04:07:22.000000000 +0100 ++++ joe-3.7/configure 2009-02-02 11:13:50.000000000 +0100 +@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h + cat >>confdefs.h <<_ACEOF + #define HAVE_SELINUX 1 + _ACEOF +- ++LIBS="$LIBS -lselinux" + fi + + # Checks for typedefs, structures, and compiler characteristics. +diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c +--- joe-3.7/selinux.c.selinux 2006-05-22 06:15:41.000000000 +0200 ++++ joe-3.7/selinux.c 2009-02-02 11:13:50.000000000 +0100 +@@ -4,7 +4,9 @@ + */ + #include "types.h" + +-#ifdef WITH_SELINUX ++#include "config.h" ++ ++#ifdef HAVE_SELINUX + #include <selinux/selinux.h> + static int selinux_enabled = -1; + #endif +@@ -13,7 +15,7 @@ int + copy_security_context(const char *from_file, const char *to_file) + { + int status = 0; +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t from_context; + security_context_t to_context; + +@@ -38,9 +40,7 @@ copy_security_context(const char *from_f + } + + if (getfilecon(to_file, &to_context) < 0) { +- MSG_PUTS(_(joe_gettext(_("\nCould not get security context for ")))); +- msg_outtrans(to_file); +- msg_putchar('\n'); ++ error(0, errno, "Could not get security context for %s", to_file); + freecon(from_context); + return 1; + } +@@ -63,7 +63,7 @@ copy_security_context(const char *from_f + int + match_default_security_context(const char *from_file) + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t scontext; + + if (selinux_enabled == -1) +@@ -102,7 +102,7 @@ match_default_security_context(const cha + int + reset_default_security_context() + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + if (selinux_enabled == -1) + selinux_enabled = (is_selinux_enabled() > 0); + +@@ -121,7 +121,7 @@ reset_default_security_context() + int + output_security_context(char *from_file) + { +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + security_context_t scontext; + + if (selinux_enabled == -1) +@@ -153,7 +153,7 @@ output_security_context(char *from_file) + + /* + Test program compile using the following command +- cc -o t t.c -DWITH_SELINUX -DTEST -lselinux ++ cc -o t t.c -DHAVE_SELINUX -DTEST -lselinux + */ + + #include <stdio.h> +diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c +--- joe-3.7/ufile.c.selinux 2008-11-02 21:39:52.000000000 +0100 ++++ joe-3.7/ufile.c 2009-02-02 11:13:50.000000000 +0100 +@@ -15,7 +15,7 @@ + #endif + #endif + +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + int copy_security_context(const char *from_file, const char *to_file); + #endif + +@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig + utime((char *)to, &utbuf); + #endif + +-#ifdef WITH_SELINUX ++#ifdef HAVE_SELINUX + copy_security_context(from,to); + #endif + diff --git a/pkgs/core/libuser/libuser.nm b/pkgs/core/libuser/libuser.nm index fb6e34c..5363c6a 100644 --- a/pkgs/core/libuser/libuser.nm +++ b/pkgs/core/libuser/libuser.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = libuser PKG_VER = 0.56.9 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,8 @@ PKG_URL = https://fedorahosted.org/libuser/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A user and group account administration library.
-PKG_BUILD_DEPS+= glib2-devel openldap-devel pkg-config popt-devel python-devel +PKG_BUILD_DEPS+= glib2-devel libselinux-devel openldap-devel pkg-config\ + popt-devel python-devel
define PKG_DESCRIPTION The libuser library implements a standardized interface for \ @@ -48,7 +49,8 @@ PKG_PACKAGES += $(PKG_NAME)-devel
CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ - --with-ldap + --with-ldap \ + --with-selinux
define STAGE_PREPARE_CMDS # Little hack that we don't build documentation that requires sgml2html diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm index b4196f4..d52cdf7 100644 --- a/pkgs/core/libvirt/libvirt.nm +++ b/pkgs/core/libvirt/libvirt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = libvirt PKG_VER = 0.8.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/Virtualization @@ -35,8 +35,10 @@ PKG_LICENSE = LGPLv2.1+ PKG_SUMMARY = A library for controlling VMs.
PKG_BUILD_DEPS+= avahi-devel libcurl-devel cyrus-sasl-devel gnutls-devel \ - libpciaccess-devel libssh2-devel libtool libxml2-devel lvm2 parted-devel \ - pkg-config readline-devel libudev-devel xen-tools + libgcrypt-devel libselinux-devel libpciaccess-devel libssh2-devel \ + libtool libxml2-devel lvm2-devel lvm2 parted-devel perl-core pkg-config \ + readline-devel libudev-devel xen-devel + PKG_DEPS += lvm2
define PKG_DESCRIPTION @@ -64,4 +66,5 @@ CONFIGURE_OPTIONS += \ --with-storage-disk \ --with-avahi \ --with-udev \ - --with-libvirtd + --with-libvirtd \ + --with-selinux diff --git a/pkgs/core/logrotate/logrotate.nm b/pkgs/core/logrotate/logrotate.nm index 7242dfa..ebc7406 100644 --- a/pkgs/core/logrotate/logrotate.nm +++ b/pkgs/core/logrotate/logrotate.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = logrotate PKG_VER = 3.7.7 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = https://fedorahosted.org/releases/l/o/logrotate/ PKG_LICENSE = GPL+ PKG_SUMMARY = Rotates, compresses, removes and mails system log files.
-PKG_DEPS += coreutils gzip popt which +PKG_BUILD_DEPS+= coreutils gzip libselinux-devel popt-devel which
define PKG_DESCRIPTION The logrotate utility is designed to simplify the administration of \ @@ -47,7 +47,7 @@ endef PKG_TARBALL = $(THISAPP).tar.gz
define STAGE_BUILD - cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) + cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS)" WITH_SELINUX=yes $(PARALLELISMFLAGS) endef
define STAGE_TEST diff --git a/pkgs/core/lsof/lsof.nm b/pkgs/core/lsof/lsof.nm index f2a1f14..0b41797 100644 --- a/pkgs/core/lsof/lsof.nm +++ b/pkgs/core/lsof/lsof.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = lsof PKG_VER = 4.82 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Development/Debuggers @@ -34,6 +34,8 @@ PKG_URL = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof PKG_LICENSE = zlib PKG_SUMMARY = A utility which lists open files on a Linux/UNIX system.
+PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION Lsof stands for LiSt Open Files, and it does just that: \ it lists information about files that are open by the \ diff --git a/pkgs/core/lvm2/lvm2.nm b/pkgs/core/lvm2/lvm2.nm index db8ca72..67adadf 100644 --- a/pkgs/core/lvm2/lvm2.nm +++ b/pkgs/core/lvm2/lvm2.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = LVM2 PKG_VER = 2.02.54 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = http://sources.redhat.com/lvm2/ PKG_LICENSE = GPLv2 PKG_SUMMARY = Userland logical volume management tools.
-PKG_BUILD_DEPS+= pkg-config ncurses-devel readline-devel +PKG_BUILD_DEPS+= libselinux-devel pkg-config ncurses-devel readline-devel
define PKG_DESCRIPTION LVM2 includes all of the support for handling read/write operations on \ diff --git a/pkgs/core/mesa/mesa.nm b/pkgs/core/mesa/mesa.nm index fcb19e0..0f3be09 100644 --- a/pkgs/core/mesa/mesa.nm +++ b/pkgs/core/mesa/mesa.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = mesa PKG_VER = 7.8.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -34,8 +34,8 @@ PKG_URL = http://www.mesa3d.org PKG_LICENSE = MIT PKG_SUMMARY = Mesa graphics libraries.
-PKG_BUILD_DEPS+= pkg-config libX11-devel libXdamage-devel libXext-devel\ - libXxf86vm-devel libdrm-devel libxcb-devel +PKG_BUILD_DEPS+= expat-devel pkg-config libX11-devel libXdamage-devel libXext-devel\ + libXxf86vm-devel libdrm-devel libselinux-devel libxcb-devel
PKG_PACKAGES += $(PKG_NAME)-devel
diff --git a/pkgs/core/net-snmp/net-snmp.nm b/pkgs/core/net-snmp/net-snmp.nm index 251861c..b263321 100644 --- a/pkgs/core/net-snmp/net-snmp.nm +++ b/pkgs/core/net-snmp/net-snmp.nm @@ -34,7 +34,7 @@ PKG_URL = http://net-snmp.sourceforge.net PKG_LICENSE = BSD PKG_SUMMARY = Simple Network Management Protocol Daemon.
-PKG_BUILD_DEPS+= perl +PKG_BUILD_DEPS+= libselinux-devel perl
define PKG_DESCRIPTION Simple Network Management Protocol (SNMP) is a widely used protocol \ diff --git a/pkgs/core/net-tools/config.make b/pkgs/core/net-tools/config.make index 68fb178..e7cfc99 100644 --- a/pkgs/core/net-tools/config.make +++ b/pkgs/core/net-tools/config.make @@ -34,4 +34,4 @@ HAVE_HWIB=1 HAVE_FW_MASQUERADE=1 HAVE_IP_TOOLS=1 HAVE_MII=1 -HAVE_SELINUX=0 +HAVE_SELINUX=1 diff --git a/pkgs/core/net-tools/net-tools.nm b/pkgs/core/net-tools/net-tools.nm index 0b915a7..ec56935 100644 --- a/pkgs/core/net-tools/net-tools.nm +++ b/pkgs/core/net-tools/net-tools.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = net-tools PKG_VER = 1.60 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Sytem/Base @@ -34,7 +34,7 @@ PKG_URL = http://net-tools.berlios.de/ PKG_LICENSE = GPL+ PKG_SUMMARY = Basic networking tools.
-PKG_BUILD_DEPS+= gettext +PKG_BUILD_DEPS+= gettext libselinux-devel
define PKG_DESCRIPTION The net-tools package contains basic networking tools, \ diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/core/openssh/openssh.nm index 9acc2d9..046d961 100644 --- a/pkgs/core/openssh/openssh.nm +++ b/pkgs/core/openssh/openssh.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = openssh PKG_VER = 5.4p1 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUP = Application/Internet @@ -34,7 +34,7 @@ PKG_URL = http://www.openssh.com/portable.html PKG_LICENSE = MIT PKG_SUMMARY = An open source implementation of SSH protocol versions 1 and 2.
-PKG_BUILD_DEPS+= openssl-devel pam-devel zlib-devel +PKG_BUILD_DEPS+= libselinux-devel openssl-devel pam-devel zlib-devel PKG_DEPS-openssh = openssh-clients=$(THISVER) openssh-server=$(THISVER)
define PKG_DESCRIPTION @@ -78,7 +78,8 @@ CONFIGURE_OPTIONS += \ --libexecdir=/usr/lib/openssh \ --with-md5-passwords \ --with-privsep-path=/var/lib/sshd \ - --with-pam + --with-pam \ + --with-selinux
define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/etc/ssh diff --git a/pkgs/core/pam/pam.nm b/pkgs/core/pam/pam.nm index a3df9b2..99e4bf9 100644 --- a/pkgs/core/pam/pam.nm +++ b/pkgs/core/pam/pam.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = Linux-PAM PKG_VER = 1.1.0 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,7 @@ PKG_URL = http://www.us.kernel.org/pub/linux/libs/pam/index.html PKG_LICENSE = BSD and GPLv2+ and BSD with advertising PKG_SUMMARY = An extensible library which provides authentication for applications.
-PKG_BUILD_DEPS+= bison cracklib-devel flex +PKG_BUILD_DEPS+= audit-devel bison cracklib-devel flex libselinux-devel
define PKG_DESCRIPTION PAM (Pluggable Authentication Modules) is a system security tool that \ @@ -46,21 +46,14 @@ PKG_TARBALL = $(THISAPP).tar.bz2
PKG_PACKAGES += $(PKG_NAME_REAL)-devel
-define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --libdir=/lib \ - --sbindir=/lib/security \ - --enable-securedir=/lib/security \ - --docdir=/usr/share/doc/Linux-PAM-$(PKG_VER) \ - --enable-read-both-confs - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) +CONFIGURE_OPTIONS += \ + --libdir=/lib \ + --sbindir=/lib/security \ + --enable-securedir=/lib/security \ + --docdir=/usr/share/doc/Linux-PAM-$(PKG_VER) \ + --enable-read-both-confs
+define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/sbin chmod -v 4755 $(BUILDROOT)/lib/security/unix_chkpwd mv -v $(BUILDROOT)/lib/security/pam_tally $(BUILDROOT)/sbin diff --git a/pkgs/core/parted/parted.nm b/pkgs/core/parted/parted.nm index 73a93e9..75ef2d6 100644 --- a/pkgs/core/parted/parted.nm +++ b/pkgs/core/parted/parted.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = parted PKG_VER = 2.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,8 @@ PKG_URL = http://www.gnu.org/software/parted PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU disk partition manipulation program.
-PKG_BUILD_DEPS+= libdevmapper-devel libuuid-devel readline-devel +PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel libuuid-devel\ + readline-devel
define PKG_DESCRIPTION The GNU Parted program allows you to create, destroy, resize, move, \ @@ -48,7 +49,8 @@ PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-devel
CONFIGURE_OPTIONS += \ - --libdir=/lib + --libdir=/lib \ + --enable-selinux
define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib diff --git a/pkgs/core/passwd/passwd.nm b/pkgs/core/passwd/passwd.nm index a6a2919..a59d82e 100644 --- a/pkgs/core/passwd/passwd.nm +++ b/pkgs/core/passwd/passwd.nm @@ -35,7 +35,7 @@ PKG_LICENSE = BSD PKG_SUMMARY = An utility for setting or changing passwords using PAM.
PKG_BUILD_DEPS+= audit-devel glib2-devel libuser-devel pam-devel pkg-config \ - libselinux-devel + libselinux-devel popt-devel
define PKG_DESCRIPTION This package contains a system utility (passwd) which sets \ @@ -45,13 +45,9 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --with-selinux \ - --with-audit \ - --disable-static +CONFIGURE_OPTIONS +=\ + --with-selinux \ + --with-audit \ + --disable-static
- cd $(DIR_APP) && make DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) -endef +STAGE_BUILD_TARGETS = DEBUG= RPM_OPT_FLAGS="$(CFLAGS)" diff --git a/pkgs/core/procps/patches/procps-3.2.8-selinux.patch b/pkgs/core/procps/patches/procps-3.2.8-selinux.patch new file mode 100644 index 0000000..a8c1f74 --- /dev/null +++ b/pkgs/core/procps/patches/procps-3.2.8-selinux.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile b/Makefile +index 09fb3ed..4d05900 100644 +--- a/Makefile ++++ b/Makefile +@@ -73,12 +73,12 @@ CURSES := -lncurses + # Something like this is probably needed to make the SE Linux + # library loading not conflict with embedded systems stuff. + # +-#ifeq ($(SHARED),1) +-#ldl := -ldl +-#LIBTYPE := -DSHAREDLIB +-#else +-#LIBTYPE := -DSTATICLIB +-#endif ++ifeq ($(SHARED),1) ++ldl := -ldl ++LIBTYPE := -DSHAREDLIB ++else ++LIBTYPE := -DSTATICLIB ++endif + + # Preprocessor flags. + PKG_CPPFLAGS := -D_GNU_SOURCE -I proc +@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \ + # Note that some stuff below is conditional on CFLAGS containing + # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) + CFLAGS := -O2 -s +-ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) ++ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE) + + PKG_LDFLAGS := -Wl,-warn-common + LDFLAGS := +diff --git a/ps/output.c b/ps/output.c +index 87bf9de..edbb4cb 100644 +--- a/ps/output.c ++++ b/ps/output.c +@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp + return snprintf(outbuf, COLWID, "*"); + } + +- ++#ifdef STATICLIB + /****************** FLASK & seLinux security stuff **********************/ + // move the bulk of this to libproc sometime + +@@ -1131,7 +1131,7 @@ fail: + return 1; + } + +-#if 0 ++#else + // This needs more study, considering: + // 1. the static linking option (maybe disable this in that case) + // 2. the -z and -Z option issue +diff --git a/ps/parser.c b/ps/parser.c +index 5ad9035..2659d4d 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){ + // In the meantime, please do not add to it. The list is + // intended to ONLY contain flags defined by the POSIX and UNIX + // standards published by The Open Group, IEEE, and ISO. +- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX ++ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX + + switch(*flagptr){ + case 'A': +diff --git a/ps/ps.1 b/ps/ps.1 +index 64953d5..aab2584 100644 +--- a/ps/ps.1 ++++ b/ps/ps.1 +@@ -450,6 +450,9 @@ display virtual memory format + Do not show flags; show rss in place of addr. + This option can only be used with \fB-l\fR. + ++.opt -Z ++display security context format (SELinux, etc.) ++ + .opt --format \ format + user-defined format. Identical to \fB-o\fR and \fBo\fR. + +diff --git a/w.c b/w.c +index 1b2a0fc..207a8a1 100644 +--- a/w.c ++++ b/w.c +@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric + if(best && tmp->start_time <= best->start_time) continue; + best = tmp; + } ++ /* It is there but SELinux wouldn't allow us to know the detail. Really ++ w should just be given rights */ ++ if(!kill(u->ut_pid, 0) || errno != ESRCH) ++ *found_utpid = 1; + return best ? best : secondbest; + } + diff --git a/pkgs/core/procps/procps.nm b/pkgs/core/procps/procps.nm index 4e838da..19533fd 100644 --- a/pkgs/core/procps/procps.nm +++ b/pkgs/core/procps/procps.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = procps PKG_VER = 3.2.8 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,7 @@ PKG_URL = http://procps.sourceforge.net/ PKG_LICENSE = GPLv2+ and LGPLv2+ PKG_SUMMARY = System and process monitoring utilities.
-PKG_BUILD_DEPS+= ncurses-devel +PKG_BUILD_DEPS+= libselinux-devel ncurses-devel
define PKG_DESCRIPTION The procps package contains a set of system utilities that provide \ diff --git a/pkgs/core/psmisc/psmisc.nm b/pkgs/core/psmisc/psmisc.nm index d54ed04..4f1a602 100644 --- a/pkgs/core/psmisc/psmisc.nm +++ b/pkgs/core/psmisc/psmisc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = psmisc PKG_VER = 22.10 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,7 +34,7 @@ PKG_URL = http://sourceforge.net/projects/psmisc PKG_LICENSE = GPLv2+ PKG_SUMMARY = Utilities for managing processes on your system.
-PKG_BUILD_DEPS+= ncurses-devel +PKG_BUILD_DEPS+= libselinux-devel ncurses-devel
define PKG_DESCRIPTION The psmisc package contains utilities for managing processes on your \ @@ -47,3 +47,6 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --enable-selinux diff --git a/pkgs/core/python-pyblock/python-pyblock.nm b/pkgs/core/python-pyblock/python-pyblock.nm index 4c17526..6e7824e 100644 --- a/pkgs/core/python-pyblock/python-pyblock.nm +++ b/pkgs/core/python-pyblock/python-pyblock.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pyblock PKG_VER = 0.46 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,8 @@ PKG_URL = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary PKG_LICENSE = GPLv2 or GPLv3 PKG_SUMMARY = Python modules for dealing with block devices.
-PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel python-devel python-parted +PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel libselinux-devel python-devel\ + python-parted
define PKG_DESCRIPTION The pyblock contains Python modules for dealing with block devices. @@ -47,7 +48,7 @@ define STAGE_PREPARE_CMDS endef
define STAGE_BUILD - cd $(DIR_APP) && make USESELINUX=0 + cd $(DIR_APP) && make USESELINUX=1 endef
define STAGE_INSTALL diff --git a/pkgs/core/sed/sed.nm b/pkgs/core/sed/sed.nm index 0f0af4c..6b3261c 100644 --- a/pkgs/core/sed/sed.nm +++ b/pkgs/core/sed/sed.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = sed PKG_VER = 4.1.5 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/Text @@ -34,6 +34,8 @@ PKG_URL = http://sed.sourceforge.net/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A GNU stream text editor.
+PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The sed (Stream EDitor) editor is a stream or batch (non-interactive) \ editor. Sed takes text as input, performs an operation or set of \ @@ -44,20 +46,10 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --bindir=/bin \ - --without-included-regex \ - --mandir=/usr/share/man - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --bindir=/bin \ + --without-included-regex \ + --mandir=/usr/share/man
define STAGE_TEST cd $(DIR_APP) && make check diff --git a/pkgs/core/smartmontools/smartmontools.nm b/pkgs/core/smartmontools/smartmontools.nm index 91b8a4f..4828494 100644 --- a/pkgs/core/smartmontools/smartmontools.nm +++ b/pkgs/core/smartmontools/smartmontools.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = smartmontools -PKG_VER = 5.37 +PKG_VER = 5.40 PKG_REL = 0
PKG_MAINTAINER = @@ -34,6 +34,8 @@ PKG_URL = http://flex.sourceforge.net/ PKG_LICENSE = GPLv2 PKG_SUMMARY = A set of tools that watches HDD S.M.A.R.T status.
+PKG_BUILD_DEPS+= gcc-c++ libselinux-devel + define PKG_DESCRIPTION The smartmontools package contains two utility programs (smartctl \ and smartd) to control and monitor storage systems using the \ @@ -47,7 +49,8 @@ PKG_TARBALL = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \ --mandir=/usr/share/man \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --with-selinux
define STAGE_INSTALL_CMDS rm -rvf $(BUILDROOT)/etc/rc.d diff --git a/pkgs/core/sudo/sudo.nm b/pkgs/core/sudo/sudo.nm index 1f90803..679dae3 100644 --- a/pkgs/core/sudo/sudo.nm +++ b/pkgs/core/sudo/sudo.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = sudo PKG_VER = 1.7.4p3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/System @@ -34,8 +34,8 @@ PKG_URL = http://www.sudo.ws/sudo/download.html PKG_LICENSE = BSD PKG_SUMMARY = Allows restricted root access for specified users.
-PKG_BUILD_DEPS+= cyrus-sasl-devel openldap-devel pam-devel -PKG_DEPS += vim +PKG_BUILD_DEPS+= audit-devel cyrus-sasl-devel libselinux-devel openldap-devel\ + pam-devel
define PKG_DESCRIPTION Sudo (superuser do) allows a system administrator to give certain \ @@ -62,7 +62,9 @@ CONFIGURE_OPTIONS += \ --with-ignore-dot \ --with-tty-tickets \ --with-ldap \ - --with-passprompt="[sudo] password for %p: " + --with-passprompt="[sudo] password for %p: " \ + --with-selinux \ + --with-linux-audit
define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/etc diff --git a/pkgs/core/sysvinit/sysvinit.nm b/pkgs/core/sysvinit/sysvinit.nm index 3f6b7b7..87ddd70 100644 --- a/pkgs/core/sysvinit/sysvinit.nm +++ b/pkgs/core/sysvinit/sysvinit.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = sysvinit PKG_VER = 2.86 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,6 +34,8 @@ PKG_URL = https://alioth.debian.org/projects/pkg-sysvinit/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = Programs which control basic system processes.
+PKG_BUILD_DEPS+= libselinux-devel + define PKG_DESCRIPTION The sysvinit package contains a group of processes that control \ the very basic functions of your system. diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm index 853a223..c1a3b27 100644 --- a/pkgs/core/tar/tar.nm +++ b/pkgs/core/tar/tar.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = tar PKG_VER = 1.23 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUP = System/Packaging @@ -52,7 +52,8 @@ CONFIGURE_ENVIRONMENT = CC="gcc -std=gnu99 -fgnu89-inline"
CONFIGURE_OPTIONS += \ --bindir=/bin \ - --libexecdir=/usr/sbin + --libexecdir=/usr/sbin \ + --enable-selinux
define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i /SIGPIPE/d src/tar.c diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm index 0f42999..1026c77 100644 --- a/pkgs/core/udev/udev.nm +++ b/pkgs/core/udev/udev.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = udev PKG_VER = 160 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,8 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A userspace implementation of devfs.
-PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libuuid-devel \ - libusb-compat-devel pciutils pkg-config usbutils +PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libselinux-devel\ + libuuid-devel libusb-compat-devel pciutils pkg-config usbutils
define PKG_DESCRIPTION The udev package contains an implementation of devfs in userspace using \ @@ -52,6 +52,7 @@ CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --libexecdir=/lib/udev \ --with-rootlibdir=/lib \ + --with-selinux \ --disable-introspection
define STAGE_INSTALL_CMDS diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm index 457b3e2..7ae6390 100644 --- a/pkgs/core/util-linux-ng/util-linux-ng.nm +++ b/pkgs/core/util-linux-ng/util-linux-ng.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = util-linux-ng PKG_VER = 2.18 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,7 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng PKG_LICENSE = GPLv2 and GPLv2+ and BSD with advertising and Public Domain PKG_SUMMARY = A collection of basic system utilities.
-PKG_BUILD_DEPS+= gettext libcap-devel ncurses-devel pam-devel zlib-devel +PKG_BUILD_DEPS+= audit-devel gettext libcap-devel libselinux-devel ncurses-devel\ + pam-devel zlib-devel
define PKG_DESCRIPTION The util-linux-ng package contains a large variety of low-level system \ @@ -120,6 +121,8 @@ CONFIGURE_OPTIONS += \ --enable-login-utils \ --enable-partx \ --enable-write \ + --with-selinux \ + --with-audit \ --disable-makeinstall-chown \ --disable-static diff --git a/pkgs/core/vim/vim.nm b/pkgs/core/vim/vim.nm index 8ef7197..bb2f41d 100644 --- a/pkgs/core/vim/vim.nm +++ b/pkgs/core/vim/vim.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = vim PKG_VER = 7.3 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Applications/Editors @@ -34,7 +34,7 @@ PKG_URL = http://www.vim.org PKG_LICENSE = PublicDomain/Charityware PKG_SUMMARY = Very feature- and powerful editor.
-PKG_BUILD_DEPS+= libacl-devel ncurses-devel +PKG_BUILD_DEPS+= libacl-devel libselinux-devel ncurses-devel
define PKG_DESCRIPTION Vim is a highly configurable text editor built to enable efficient \ @@ -46,7 +46,9 @@ PKG_TARBALL = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/$(PKG_NAME)73
-CONFIGURE_OPTIONS += --enable-multibyte +CONFIGURE_OPTIONS += \ + --enable-multibyte \ + --enable-selinux
define STAGE_PREPARE_CMDS cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h diff --git a/pkgs/core/xen/patches/xen-WRITE.patch b/pkgs/core/xen/patches/xen-WRITE.patch new file mode 100644 index 0000000..eb4f062 --- /dev/null +++ b/pkgs/core/xen/patches/xen-WRITE.patch @@ -0,0 +1,23 @@ +diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap/drivers/blk_linux.c +--- xen-4.0.1/tools/blktap/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000 ++++ xen-4.0.1/tools/blktap/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000 +@@ -1,6 +1,6 @@ + #include <inttypes.h> + #include <sys/ioctl.h> +-#include <linux/fs.h> ++#include <sys/mount.h> + #include "tapdisk.h" + #include "blk.h" + +diff -r d70d7c3311c4 -r 0236d8adb081 tools/blktap2/drivers/blk_linux.c +--- xen-4.0.1/tools/blktap2/drivers/blk_linux.c Tue Dec 14 17:10:49 2010 +0000 ++++ xen-4.0.1/tools/blktap2/drivers/blk_linux.c Thu Dec 16 09:33:54 2010 +0000 +@@ -1,7 +1,7 @@ + #include <inttypes.h> ++#include <errno.h> + #include <sys/ioctl.h> +-#include <linux/fs.h> +-#include <linux/errno.h> ++#include <sys/mount.h> + #include "tapdisk.h" + #include "blk.h" diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm index 2848452..1c71ce3 100644 --- a/pkgs/core/xen/xen.nm +++ b/pkgs/core/xen/xen.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = xen PKG_VER = 4.0.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Ben Schweikert ben.schweikert@ipfire.org PKG_GROUP = Applications/Virtualization @@ -40,8 +40,9 @@ define PKG_DESCRIPTION feature set for virtualization. endef
-PKG_BUILD_DEPS+= gettext-devel libuuid-devel openssl-devel python python-devel \ - sdl-devel xorg-x11-proto-devel zlib-devel +PKG_BUILD_DEPS+= gettext-devel kernel-headers libuuid-devel ncurses-devel \ + openssl-devel python python-devel sdl-devel xorg-x11-proto-devel \ + zlib-devel
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm index a4cac9c..631c433 100644 --- a/pkgs/core/xorg-x11-server/xorg-x11-server.nm +++ b/pkgs/core/xorg-x11-server/xorg-x11-server.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = xorg-x11-server PKG_VER = 1.8.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org PKG_GROUP = X/Server @@ -34,12 +34,13 @@ PKG_URL = http://www.x.org PKG_LICENSE = MIT PKG_SUMMARY = X.Org X11 X server.
-PKG_BUILD_DEPS+= autoconf automake libcap libX11-devel libXau-devel libXdmcp-devel\ - libXext-devel libXfixes-devel libXfont-devel libXmu-devel libXrender-devel\ - libXres-devel libXt-devel libdrm-devel libfontenc-devel libpciaccess-devel\ - libtool libudev-devel libxcb-devel libxkbfile-devel mesa-devel pixman-devel\ - pkg-config xorg-x11-font-utils-devel xorg-x11-util-macros xorg-x11-proto-devel\ - xorg-x11-xtrans-devel +PKG_BUILD_DEPS+= audit-devel autoconf automake libcap libX11-devel libXau-devel \ + libXdmcp-devel libXext-devel libXfixes-devel libXfont-devel libXmu-devel \ + libXrender-devel libXres-devel libXt-devel libdrm-devel libfontenc-devel \ + libpciaccess-devel libselinux-devel libtool libudev-devel libxcb-devel \ + libxkbfile-devel mesa-devel pixman-devel pkg-config xorg-x11-font-utils-devel \ + xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xtrans-devel + PKG_DEPS += mesa pixman udev xkeyboard-config xorg-x11-fonts xorg-x11-font-utils \ xorg-x11-xkb-utils
@@ -72,6 +73,7 @@ CONFIGURE_OPTIONS += \ --disable-xephyr \ --with-pic \ --enable-maintainer-mode \ + --enable-xselinux \ --with-int10=x86emu \ --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ --with-module-dir=/usr/lib/xorg/modules \
hooks/post-receive -- IPFire 3.x development tree