From 67138a99a0ecff0785511c864ef7a55af560f810c801c3038e49a4b7ba066a4e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 24 Oct 2018 18:22:11 +0000 Subject: [PATCH 1/2] Accepting request 643964 from home:kstreitova:branches:Base:System - Version update to at 3.1.23 * 832368-Using_of_the_meaningless_fcntl: Fix call of fcntl by replacing (long) 1 with FD_CLOEXEC * 892819-at__improvements_to_atd.service: Improve atd.service, see bug report 892819 * 885891-at__stale_batchjobs_after_reboot: Remove stale at jobs after a boot. * 897669-897670-Some_fixes_in_the_manuals: Fix some warnings in manpages at.1 and atd.8 * 883730-Remove_invalid_email_from_man_page: Remove invalid email from man pages. * Draft of a release script * Finalised script to release software. - refresh at-atq-timeformat.patch - refresh at-adjust_load_to_cpu_count.patch OBS-URL: https://build.opensuse.org/request/show/643964 OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=106 --- at-adjust_load_to_cpu_count.patch | 28 ++++++++++++------------- at-atq-timeformat.patch | 34 +++++++++++++++---------------- at.changes | 19 +++++++++++++++++ at.spec | 10 ++++----- at_3.1.20.orig.tar.gz | 3 --- at_3.1.23.orig.tar.gz | 3 +++ 6 files changed, 58 insertions(+), 39 deletions(-) delete mode 100644 at_3.1.20.orig.tar.gz create mode 100644 at_3.1.23.orig.tar.gz diff --git a/at-adjust_load_to_cpu_count.patch b/at-adjust_load_to_cpu_count.patch index 345c4a2..405359c 100644 --- a/at-adjust_load_to_cpu_count.patch +++ b/at-adjust_load_to_cpu_count.patch @@ -1,7 +1,7 @@ -Index: at-3.1.16/at.1.in +Index: at-3.1.23/at.1.in =================================================================== ---- at-3.1.16.orig/at.1.in 2015-06-23 18:12:35.348993941 +0200 -+++ at-3.1.16/at.1.in 2015-06-23 18:48:39.666401868 +0200 +--- at-3.1.23.orig/at.1.in ++++ at-3.1.23/at.1.in @@ -68,6 +68,9 @@ deletes jobs, identified by their job nu executes commands when system load levels permit; in other words, when the load average drops below @LOADAVG_MX@, or the value specified in the invocation of @@ -12,11 +12,11 @@ Index: at-3.1.16/at.1.in .PP .B At allows fairly complex time -Index: at-3.1.16/atd.c +Index: at-3.1.23/atd.c =================================================================== ---- at-3.1.16.orig/atd.c 2015-06-23 18:12:35.353994001 +0200 -+++ at-3.1.16/atd.c 2015-06-23 18:31:52.137058536 +0200 -@@ -763,6 +763,7 @@ run_loop() +--- at-3.1.23.orig/atd.c ++++ at-3.1.23/atd.c +@@ -625,6 +625,7 @@ run_loop() int run_batch; static time_t next_batch = 0; double currlavg[3]; @@ -24,7 +24,7 @@ Index: at-3.1.16/atd.c /* Main loop. Open spool directory for reading and look over all the * files in there. If the filename indicates that the job should be run, -@@ -907,7 +908,14 @@ run_loop() +@@ -775,7 +776,14 @@ run_loop() #ifdef GETLOADAVG_PRIVILEGED END_PRIV #endif @@ -40,20 +40,20 @@ Index: at-3.1.16/atd.c run_file(batch_name, batch_uid, batch_gid); run_batch--; } -Index: at-3.1.16/atd.8.in +Index: at-3.1.23/atd.8.in =================================================================== ---- at-3.1.16.orig/atd.8.in 2014-09-30 08:29:02.000000000 +0200 -+++ at-3.1.16/atd.8.in 2015-06-23 18:48:17.519128303 +0200 +--- at-3.1.23.orig/atd.8.in ++++ at-3.1.23/atd.8.in @@ -20,10 +20,8 @@ runs jobs queued by - .B -l + .B \-l Specifies a limiting load factor, over which batch jobs should not be run, instead of the compile-time choice of @LOADAVG_MX@. -For an SMP system with -.I n -CPUs, you will probably want to set this higher than --.IR n-1. +-.IR n\-1. +This number is multiplied by the amount of CPUs when comparing +to /proc/loadavg, because loadavg is a sum over all processors on Linux. .TP 8 - .B -b + .B \-b Specify the minimum interval in seconds between the start of two diff --git a/at-atq-timeformat.patch b/at-atq-timeformat.patch index c24dc43..fc9ef91 100644 --- a/at-atq-timeformat.patch +++ b/at-atq-timeformat.patch @@ -1,8 +1,8 @@ Index: at.c =================================================================== ---- at.c.orig 2014-07-25 10:59:06.264608764 +0200 -+++ at.c 2014-07-25 11:00:04.036607665 +0200 -@@ -132,9 +132,10 @@ +--- at.c.orig ++++ at.c +@@ -132,9 +132,10 @@ int fcreated; char *namep; char atfile[] = ATJOB_DIR "/12345678901234"; @@ -16,7 +16,7 @@ Index: at.c /* Function declarations */ -@@ -494,7 +495,7 @@ +@@ -513,7 +514,7 @@ writefile(time_t runtimer, char queue) runtime = localtime(&runtimer); @@ -25,7 +25,7 @@ Index: at.c fprintf(stderr, "job %ld at %s\n", jobno, timestr); /* Signal atd, if present. Usual precautions taken... */ -@@ -608,7 +609,7 @@ +@@ -627,7 +628,7 @@ list_jobs(long *joblist, int len) runtimer = 60 * (time_t) ctm; runtime = localtime(&runtimer); @@ -34,7 +34,7 @@ Index: at.c if ((pwd = getpwuid(buf.st_uid))) printf("%ld\t%s %c %s\n", jobno, timestr, queue, pwd->pw_name); -@@ -805,7 +806,7 @@ +@@ -824,7 +825,7 @@ main(int argc, char **argv) */ if (strcmp(pgm, "atq") == 0) { program = ATQ; @@ -43,7 +43,7 @@ Index: at.c } else if (strcmp(pgm, "atrm") == 0) { program = ATRM; options = "hV"; -@@ -889,6 +890,10 @@ +@@ -908,6 +909,10 @@ main(int argc, char **argv) timer -= timer % 60; break; @@ -56,18 +56,18 @@ Index: at.c break; Index: at.1.in =================================================================== ---- at.1.in.orig 2014-07-25 10:59:06.204608765 +0200 -+++ at.1.in 2014-07-25 11:17:27.828587820 +0200 -@@ -29,6 +29,8 @@ - .RB [ -V ] - .RB [ -q +--- at.1.in.orig ++++ at.1.in +@@ -29,6 +29,8 @@ at, batch, atq, atrm \- queue, examine, + .RB [ \-V ] + .RB [ \-q .IR queue ] +.RB [ -o +.IR timeformat ] .br .B at - .RB [ -rd ] -@@ -254,6 +256,9 @@ + .RB [ \-rd ] +@@ -260,6 +262,9 @@ Times displayed will be in the format "T .B \-c cats the jobs listed on the command line to standard output. @@ -79,9 +79,9 @@ Index: at.1.in .br Index: panic.c =================================================================== ---- panic.c.orig 2014-07-25 10:59:06.168608765 +0200 -+++ panic.c 2014-07-25 11:06:20.232600513 +0200 -@@ -96,7 +96,7 @@ +--- panic.c.orig ++++ panic.c +@@ -96,7 +96,7 @@ usage(void) " at [-V] [-q x] [-f file] [-mMlbv] -t time\n" " at -c job ...\n" " at [-V] -l [job ...]\n" diff --git a/at.changes b/at.changes index d28a58f..efe8090 100644 --- a/at.changes +++ b/at.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Oct 23 12:36:49 UTC 2018 - kstreitova@suse.com + +- Version update to at 3.1.23 + * 832368-Using_of_the_meaningless_fcntl: Fix call of fcntl by + replacing (long) 1 with FD_CLOEXEC + * 892819-at__improvements_to_atd.service: Improve atd.service, + see bug report 892819 + * 885891-at__stale_batchjobs_after_reboot: Remove stale at jobs + after a boot. + * 897669-897670-Some_fixes_in_the_manuals: Fix some warnings in + manpages at.1 and atd.8 + * 883730-Remove_invalid_email_from_man_page: Remove invalid email + from man pages. + * Draft of a release script + * Finalised script to release software. +- refresh at-atq-timeformat.patch +- refresh at-adjust_load_to_cpu_count.patch + ------------------------------------------------------------------- Thu Nov 23 13:39:24 UTC 2017 - rbrown@suse.com diff --git a/at.spec b/at.spec index 7b814c1..97c6cd6 100644 --- a/at.spec +++ b/at.spec @@ -1,7 +1,7 @@ # # spec file for package at # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,13 @@ %endif Name: at -Version: 3.1.20 +Version: 3.1.23 Release: 0 Summary: A Job Manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Daemons -Url: ftp://ftp.debian.org/debian/pool/main/a/at -Source: ftp://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz +Url: http://ftp.debian.org/debian/pool/main/a/at +Source: http://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz Source2: atd.pamd Source3: sysconfig.atd Source5: atd.service diff --git a/at_3.1.20.orig.tar.gz b/at_3.1.20.orig.tar.gz deleted file mode 100644 index ec87d7c..0000000 --- a/at_3.1.20.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9 -size 127666 diff --git a/at_3.1.23.orig.tar.gz b/at_3.1.23.orig.tar.gz new file mode 100644 index 0000000..c43de7f --- /dev/null +++ b/at_3.1.23.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710 +size 126284 From dc37b7036885a06dd728aff81730a5efff2dbac8c4bb181aeab5ee6b3378daca Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 25 Oct 2018 08:31:21 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=107 --- at.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/at.changes b/at.changes index efe8090..ee9f00d 100644 --- a/at.changes +++ b/at.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Oct 23 12:36:49 UTC 2018 - kstreitova@suse.com -- Version update to at 3.1.23 +- Version update to at 3.1.23 [bsc#1112660] * 832368-Using_of_the_meaningless_fcntl: Fix call of fcntl by replacing (long) 1 with FD_CLOEXEC * 892819-at__improvements_to_atd.service: Improve atd.service,