rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Feb 14 21:12:01 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28092
Modified Files:
vixie-cron-4.1-_52-bz181439.patch
Log Message:
fix bug 181439: enable easier selection of conditional compilation WITH_* features
vixie-cron-4.1-_52-bz181439.patch:
Makefile | 16 ++++++++++++++--
security.c | 3 +--
structs.h | 5 +++--
3 files changed, 18 insertions(+), 6 deletions(-)
Index: vixie-cron-4.1-_52-bz181439.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_52-bz181439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-_52-bz181439.patch 14 Feb 2006 21:02:14 -0000 1.1
+++ vixie-cron-4.1-_52-bz181439.patch 14 Feb 2006 21:11:58 -0000 1.2
@@ -1,5 +1,24 @@
---- vixie-cron-4.1/Makefile.bz181439 2006-02-14 15:57:08.000000000 -0500
-+++ vixie-cron-4.1/Makefile 2006-02-14 15:57:22.000000000 -0500
+--- vixie-cron-4.1/security.c.bz181439 2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/security.c 2006-02-14 16:11:00.000000000 -0500
+@@ -190,6 +190,7 @@
+ int crontab_fd,
+ security_context_t *rcontext,
+ const char *tabname) {
++#ifdef WITH_SELINUX
+ security_context_t scontext=NULL;
+ security_context_t file_context=NULL;
+ struct av_decision avd;
+@@ -199,8 +200,6 @@
+
+ *rcontext = NULL;
+
+-#ifdef WITH_SELINUX
+-
+ if (is_selinux_enabled() <= 0)
+ return 0;
+
+--- vixie-cron-4.1/Makefile.bz181439 2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/Makefile 2006-02-14 16:10:39.000000000 -0500
@@ -60,7 +60,19 @@
INCLUDE = -I.
#INCLUDE =
@@ -30,3 +49,25 @@
#(SGI IRIX systems need this)
#DEFS = -D_BSD_SIGNALS -Dconst=
#<<the name of the BSD-like install program>>
+--- vixie-cron-4.1/structs.h.bz181439 2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/structs.h 2006-02-14 16:10:39.000000000 -0500
+@@ -44,6 +44,9 @@
+ *
+ * These are the crontabs.
+ */
++#ifndef WITH_SELINUX
++#define security_context_t unsigned
++#endif
+
+ typedef struct _user {
+ struct _user *next, *prev; /* links */
+@@ -51,9 +54,7 @@
+ char *tabname; /* /etc/cron.d/ file name or NULL */
+ time_t mtime; /* last modtime of crontab */
+ entry *crontab; /* this person's crontab */
+-#ifdef WITH_SELINUX
+ security_context_t scontext; /* SELinux security context */
+-#endif
+ } user;
+
+ typedef struct _cron_db {
More information about the fedora-cvs-commits
mailing list