From 131a782c58eb3ae126c9e6fbe9cf3a813b0de49e7acc6cf87dc45d64f02cae40 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Mon, 21 Feb 2011 15:02:49 +0000 Subject: [PATCH 1/3] Accepting request 62348 from home:mseben:branches:Base:System added quiet=1 option for pam_listfile rule [bnc#662433], ix build for 11.3 - prereq syslog OBS-URL: https://build.opensuse.org/request/show/62348 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=72 --- cronie-pam_config.diff | 9 ++++----- cronie.changes | 10 ++++++++++ cronie.spec | 11 +++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cronie-pam_config.diff b/cronie-pam_config.diff index 89d8b11..bbc7143 100644 --- a/cronie-pam_config.diff +++ b/cronie-pam_config.diff @@ -1,7 +1,7 @@ -Index: cronie-1.4.4/pam/crond +Index: cronie-1.4.6/pam/crond =================================================================== ---- cronie-1.4.4.orig/pam/crond -+++ cronie-1.4.4/pam/crond +--- cronie-1.4.6.orig/pam/crond ++++ cronie-1.4.6/pam/crond @@ -3,8 +3,9 @@ # # @@ -12,9 +12,8 @@ Index: cronie-1.4.4/pam/crond -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so -+account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed ++account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed quiet=1 +auth include common-auth +account include common-account +password include common-password +session required pam_loginuid.so -+session include common-session diff --git a/cronie.changes b/cronie.changes index 09fb221..ff9a566 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 21 15:01:39 UTC 2011 - mseben@gmail.com + +- added quiet=1 option for pam_listfile rule [bnc#662433] + +------------------------------------------------------------------- +Sun Feb 20 11:00:46 UTC 2011 - mseben@gmail.com + +- fix build for 11.3 - prereq syslog + ------------------------------------------------------------------- Thu Jan 6 15:25:44 UTC 2011 - vcizek@novell.com diff --git a/cronie.spec b/cronie.spec index e496ced..0694e90 100644 --- a/cronie.spec +++ b/cronie.spec @@ -1,7 +1,7 @@ # # spec file for package cronie (Version 1.4.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,9 +28,12 @@ Group: System/Daemons Recommends: smtp_daemon Recommends: postfix AutoReqProv: on -PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) +PreReq: permissions %fillup_prereq %insserv_prereq cron +%if %suse_version > 1130 +PreReq: sysvinit(syslog) +%endif Version: 1.4.6 -Release: 5 +Release: 6 %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.xz @@ -68,7 +71,7 @@ started automatically. %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 7 +Release: 8 Summary: Auxiliary package Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} From e17f93f195ec60105ba6ced12a355844da505decdd33b0f4a8344108f9b93071 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Wed, 23 Feb 2011 13:27:37 +0000 Subject: [PATCH 2/3] osc copypac from project:Base:System package:cronie revision:71 OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=73 --- cronie-pam_config.diff | 9 +++++---- cronie.changes | 10 ---------- cronie.spec | 5 +---- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/cronie-pam_config.diff b/cronie-pam_config.diff index bbc7143..89d8b11 100644 --- a/cronie-pam_config.diff +++ b/cronie-pam_config.diff @@ -1,7 +1,7 @@ -Index: cronie-1.4.6/pam/crond +Index: cronie-1.4.4/pam/crond =================================================================== ---- cronie-1.4.6.orig/pam/crond -+++ cronie-1.4.6/pam/crond +--- cronie-1.4.4.orig/pam/crond ++++ cronie-1.4.4/pam/crond @@ -3,8 +3,9 @@ # # @@ -12,8 +12,9 @@ Index: cronie-1.4.6/pam/crond -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so -+account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed quiet=1 ++account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed +auth include common-auth +account include common-account +password include common-password +session required pam_loginuid.so ++session include common-session diff --git a/cronie.changes b/cronie.changes index ff9a566..09fb221 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Mon Feb 21 15:01:39 UTC 2011 - mseben@gmail.com - -- added quiet=1 option for pam_listfile rule [bnc#662433] - -------------------------------------------------------------------- -Sun Feb 20 11:00:46 UTC 2011 - mseben@gmail.com - -- fix build for 11.3 - prereq syslog - ------------------------------------------------------------------- Thu Jan 6 15:25:44 UTC 2011 - vcizek@novell.com diff --git a/cronie.spec b/cronie.spec index 0694e90..c9a3618 100644 --- a/cronie.spec +++ b/cronie.spec @@ -28,10 +28,7 @@ Group: System/Daemons Recommends: smtp_daemon Recommends: postfix AutoReqProv: on -PreReq: permissions %fillup_prereq %insserv_prereq cron -%if %suse_version > 1130 -PreReq: sysvinit(syslog) -%endif +PreReq: permissions %fillup_prereq %insserv_prereq cron sysvinit(syslog) Version: 1.4.6 Release: 6 %{expand: %%define cronie_version %version} From f48dc98dda0108cf1000e6bacfd3f297ebc382f35ae3dcd91997509ca8fd7ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 24 Feb 2011 12:57:43 +0000 Subject: [PATCH 3/3] - bnc#662433 again: added quiet option to pam config, in order to avoid logging, when /etc/cron.allow is missing OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=74 --- cronie-pam_config.diff | 2 +- cronie.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cronie-pam_config.diff b/cronie-pam_config.diff index 89d8b11..037eba9 100644 --- a/cronie-pam_config.diff +++ b/cronie-pam_config.diff @@ -12,7 +12,7 @@ Index: cronie-1.4.4/pam/crond -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so -+account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed ++account sufficient pam_listfile.so item=user sense=allow file=/etc/cron.allow onerr=succeed quiet +auth include common-auth +account include common-account +password include common-password diff --git a/cronie.changes b/cronie.changes index 09fb221..59de016 100644 --- a/cronie.changes +++ b/cronie.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 24 12:33:31 UTC 2011 - vcizek@novell.com + +- bnc#662433 again: + added quiet option to pam config, in order to avoid logging, + when /etc/cron.allow is missing + ------------------------------------------------------------------- Thu Jan 6 15:25:44 UTC 2011 - vcizek@novell.com