From 424974e332e37136470280064c5116b9e6749a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 19 Feb 2010 08:32:19 +0000 Subject: [PATCH] - update to new release --- .cvsignore | 2 +- DSO.patch | 14 ------------ cronie-pam.patch | 8 ------- cronie-selinux_passwd.patch | 44 ------------------------------------- cronie.spec | 13 +++++------ sources | 2 +- 6 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 DSO.patch delete mode 100644 cronie-pam.patch delete mode 100644 cronie-selinux_passwd.patch diff --git a/.cvsignore b/.cvsignore index 48319eb..aca3933 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cronie-1.4.3.tar.gz +cronie-1.4.4.tar.gz diff --git a/DSO.patch b/DSO.patch deleted file mode 100644 index ec59114..0000000 --- a/DSO.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up cronie-1.4.3/configure.ac.old cronie-1.4.3/configure.ac ---- cronie-1.4.3/configure.ac.old 2009-11-03 14:26:51.000000000 +0100 -+++ cronie-1.4.3/configure.ac 2010-02-15 10:50:38.000000000 +0100 -@@ -208,8 +208,9 @@ AC_ARG_WITH(audit, - [ if test "x$withval" != "xno" ; then - saved_LIBS="$LIBS" - AC_DEFINE(WITH_AUDIT,1,[Define if you want Audit trails.]) -- SELINUX_MSG="yes" - AC_CHECK_HEADER([libaudit.h], ,AC_MSG_ERROR(Audit trails requires libaudit.h header)) -+ AC_CHECK_LIB(audit, audit_open, [ LIBAUDIT="-laudit" ], -+ AC_MSG_ERROR(Audit support needs audit libraries.)) - LIBS="$saved_LIBS $LIBAUDIT" - AC_SUBST(LIBAUDIT) - fi ] diff --git a/cronie-pam.patch b/cronie-pam.patch deleted file mode 100644 index 7543ac0..0000000 --- a/cronie-pam.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up cronie-1.4.3/pam/crond.ppp cronie-1.4.3/pam/crond ---- cronie-1.4.3/pam/crond.ppp 2009-09-25 08:23:18.000000000 +0200 -+++ cronie-1.4.3/pam/crond 2009-11-05 16:34:06.000000000 +0100 -@@ -7,3 +7,4 @@ account required pam_access.so - account include password-auth - session required pam_loginuid.so - session include password-auth -+auth include password-auth diff --git a/cronie-selinux_passwd.patch b/cronie-selinux_passwd.patch deleted file mode 100644 index 8cf75fa..0000000 --- a/cronie-selinux_passwd.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up cronie-1.4.3/src/security.c.old cronie-1.4.3/src/security.c ---- cronie-1.4.3/src/security.c.old 2009-09-25 08:23:18.000000000 +0200 -+++ cronie-1.4.3/src/security.c 2009-11-05 16:43:13.000000000 +0100 -@@ -486,9 +486,37 @@ void free_security_context(security_cont - - int crontab_security_access(void) { - #ifdef WITH_SELINUX -- if (is_selinux_enabled() > 0) -- if (selinux_check_passwd_access(PASSWD__CRONTAB) != 0) -- return -1; -+ int selinux_check_passwd_access = -1; -+ if (is_selinux_enabled() > 0) { -+ security_context_t user_context; -+ if (getprevcon_raw(&user_context) == 0) { -+ security_class_t passwd_class; -+ struct av_decision avd; -+ int retval; -+ -+ passwd_class = string_to_security_class("passwd"); -+ if (passwd_class == 0) { -+ selinux_check_passwd_access = -1; -+ fprintf(stderr, "Security class \"passwd\" is not defined in the SELinux policy.\n"); -+ } -+ -+ retval = security_compute_av_raw(user_context, -+ user_context, -+ passwd_class, -+ PASSWD__CRONTAB, -+ &avd); -+ -+ if ((retval == 0) && ((PASSWD__CRONTAB & avd.allowed) == PASSWD__CRONTAB)) { -+ selinux_check_passwd_access = 0; -+ } -+ freecon(user_context); -+ } -+ -+ if (selinux_check_passwd_access != 0 && security_getenforce() == 0) -+ selinux_check_passwd_access = 0; -+ -+ return selinux_check_passwd_access; -+ } - #endif - return 0; - } diff --git a/cronie.spec b/cronie.spec index f815ce6..d5d5b7a 100644 --- a/cronie.spec +++ b/cronie.spec @@ -5,15 +5,12 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: MIT and BSD and ISC and GPLv2 Group: System Environment/Base URL: https://fedorahosted.org/cronie Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz -Patch0: cronie-selinux_passwd.patch -Patch1: cronie-pam.patch -Patch2: DSO.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: syslog, bash >= 2.0 @@ -75,9 +72,6 @@ Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .old %build @@ -200,6 +194,9 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||: %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs %changelog +* Fri Feb 19 2010 Marcela Mašláňová - 1.4.4-1 +- update to new release + * Mon Feb 15 2010 Marcela Mašláňová - 1.4.3-3 - 564894 FTBFS DSOLinking diff --git a/sources b/sources index f267b6c..62465f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2393b3e5828fc09d9acf04dfd7796ab9 cronie-1.4.3.tar.gz +eb9834c5f87cca9efeed68e6fed3fe3d cronie-1.4.4.tar.gz