Accepting request 1127725 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1127725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cronie?expand=0&rev=89
This commit is contained in:
Ana Guerrero 2023-12-21 22:38:05 +00:00 committed by Git OBS Bridge
commit 994fb65592
9 changed files with 61 additions and 24 deletions

BIN
cronie-1.6.1.tar.gz (Stored with Git LFS)

Binary file not shown.

3
cronie-1.7.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:956c6a722ad7fc332b96ecc2f8374236825a7c6f4a48dcaf7d23b0f17670cdcc
size 153390

View File

@ -1,8 +1,8 @@
Index: cronie-1.4.4/src/pathnames.h Index: cronie-cronie-1.7.0/src/pathnames.h
=================================================================== ===================================================================
--- cronie-1.4.4.orig/src/pathnames.h --- cronie-cronie-1.7.0.orig/src/pathnames.h
+++ cronie-1.4.4/src/pathnames.h +++ cronie-cronie-1.7.0/src/pathnames.h
@@ -41,7 +41,7 @@ @@ -45,7 +45,7 @@
# define PIDDIR SYSCONFDIR "/" # define PIDDIR SYSCONFDIR "/"
# endif # endif
#endif #endif

View File

@ -43,7 +43,7 @@ Index: src/crontab.c
while (EOF != (ch = get_char(f))) { while (EOF != (ch = get_char(f))) {
if (colorize) { if (colorize) {
if (!in_comment && new_line && ch == '#') { if (!in_comment && new_line && ch == '#') {
@@ -533,7 +549,7 @@ static void edit_cmd(void) { @@ -646,7 +662,7 @@ static void edit_cmd(void) {
char n[MAX_FNAME], q[MAX_TEMPSTR]; char n[MAX_FNAME], q[MAX_TEMPSTR];
const char *editor; const char *editor;
FILE *f; FILE *f;
@ -52,7 +52,7 @@ Index: src/crontab.c
struct stat statbuf; struct stat statbuf;
struct utimbuf utimebuf; struct utimbuf utimebuf;
WAIT_T waiter; WAIT_T waiter;
@@ -585,10 +601,20 @@ static void edit_cmd(void) { @@ -698,10 +714,20 @@ static void edit_cmd(void) {
} }
Set_LineNum(1); Set_LineNum(1);
@ -76,7 +76,7 @@ Index: src/crontab.c
/* copy the rest of the crontab (if any) to the temp file. /* copy the rest of the crontab (if any) to the temp file.
*/ */
if (EOF != ch) if (EOF != ch)
@@ -812,6 +838,7 @@ static int replace_cmd(void) { @@ -925,6 +951,7 @@ static int replace_cmd(void) {
int ch, fd; int ch, fd;
int error = 0; int error = 0;
uid_t file_owner; uid_t file_owner;
@ -84,7 +84,7 @@ Index: src/crontab.c
char *safename; char *safename;
safename = host_specific_filename("#tmp", "XXXXXXXXXX"); safename = host_specific_filename("#tmp", "XXXXXXXXXX");
@@ -839,10 +866,10 @@ static int replace_cmd(void) { @@ -952,10 +979,10 @@ static int replace_cmd(void) {
* *
* VERY IMPORTANT: make sure NHEADER_LINES agrees with this code. * VERY IMPORTANT: make sure NHEADER_LINES agrees with this code.
*/ */

View File

@ -0,0 +1,14 @@
---
pam/crond | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: cronie-cronie-1.7.0/pam/crond
===================================================================
--- cronie-cronie-1.7.0.orig/pam/crond
+++ cronie-cronie-1.7.0/pam/crond
@@ -10,4 +10,4 @@ auth include common-auth
account include common-account
password include common-password
session optional pam_keyinit.so force revoke
-session include common-session
+session include common-session-nonlogin

View File

@ -1,7 +1,7 @@
Index: cronie-cronie-1.5.4/pam/crond Index: cronie-cronie-1.7.0/pam/crond
=================================================================== ===================================================================
--- cronie-cronie-1.5.4.orig/pam/crond --- cronie-cronie-1.7.0.orig/pam/crond
+++ cronie-cronie-1.5.4/pam/crond +++ cronie-cronie-1.7.0/pam/crond
@@ -4,8 +4,10 @@ @@ -4,8 +4,10 @@
# #
# Although no PAM authentication is called, auth modules # Although no PAM authentication is called, auth modules

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Nov 11 15:17:43 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
- Update to 1.7.0:
* anacron: Add support for NO_MAIL_OUTPUT environment variable
* anacron: Support enabling anacron jobs on battery power
* crond: Support -n crontab entry option to disable mailing the output
* crontab: Make a backup of the crontab file on edition and deletion
- Add patch cronie-pam_config-nonlogin.diff
- Refreshed patches:
* cronie-crond_pid.diff
* cronie-pam_config.diff
* cronie-nheader_lines.diff
* fix-manpage-replace-anacrontab-with-crontab.patch
-------------------------------------------------------------------
Fri Mar 31 13:54:41 UTC 2023 - Michal Koutný <mkoutny@suse.com>
- PAM: Use common-session-nonlogin for >15 codestreams
More info in https://github.com/SUSE/pam-config/pull/16
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 20 16:10:11 UTC 2022 - Stefan Schubert <schubi@suse.com> Tue Dec 20 16:10:11 UTC 2022 - Stefan Schubert <schubi@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package cronie # spec file for package cronie
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: cronie Name: cronie
Version: 1.6.1 Version: 1.7.0
Release: 0 Release: 0
Summary: Cron Daemon Summary: Cron Daemon
License: BSD-3-Clause AND GPL-2.0-only AND MIT License: BSD-3-Clause AND GPL-2.0-only AND MIT
@ -46,6 +46,8 @@ Patch5: cronie-crond_pid.diff
# PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab" # PATCH-FIX-SUSE the first occurance of "/etc/anacrontab" was replaced by "/etc/crontab"
# in manpage file because the /etc/crontab is still used in SUSE. # in manpage file because the /etc/crontab is still used in SUSE.
Patch13: fix-manpage-replace-anacrontab-with-crontab.patch Patch13: fix-manpage-replace-anacrontab-with-crontab.patch
# PATCH-FEATURE-OPENSUSE user common-session-nonlogin
Patch14: cronie-pam_config-nonlogin.diff
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -104,6 +106,9 @@ overloaded in settings.
%patch5 -p1 %patch5 -p1
cp %{SOURCE7} ./cron_to_cronie.README cp %{SOURCE7} ./cron_to_cronie.README
%patch13 -p1 %patch13 -p1
%if 0%{?suse_version} > 1500
%patch14 -p1
%endif
%build %build
# fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked

View File

@ -9,11 +9,11 @@ Fixes bnc#833240
man/cron.8 | 2 +- man/cron.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/cron.8 b/man/cron.8 Index: cronie-cronie-1.7.0/man/cron.8
index 633dbc0..9716f8f 100644 ===================================================================
--- a/man/cron.8 --- cronie-cronie-1.7.0.orig/man/cron.8
+++ b/man/cron.8 +++ cronie-cronie-1.7.0/man/cron.8
@@ -53,7 +53,7 @@ for crontab files which are named after accounts in @@ -56,7 +56,7 @@ for crontab files which are named after
The found crontabs are loaded into the memory. The found crontabs are loaded into the memory.
.I Cron .I Cron
also searches for also searches for
@ -22,6 +22,3 @@ index 633dbc0..9716f8f 100644
and any files in the and any files in the
.I /etc/cron.d .I /etc/cron.d
directory, which have a different format (see directory, which have a different format (see
--
1.8.4.5