[calendar/el6] Add missing braces to 'adjust bodun rate' block (#892234)
David Cantrell
dcantrel at fedoraproject.org
Mon Jan 28 19:24:44 UTC 2013
commit 2d002417212b3284b7cf1e2b1ca2a3dfff40775b
Author: David Cantrell <david.l.cantrell at gmail.com>
Date: Mon Jan 28 14:24:21 2013 -0500
Add missing braces to 'adjust bodun rate' block (#892234)
calendar-1.25-linux.patch | 53 +++++++++++++++++++++++---------------------
calendar.spec | 5 +++-
2 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/calendar-1.25-linux.patch b/calendar-1.25-linux.patch
index 1314ffe..de0c4f4 100644
--- a/calendar-1.25-linux.patch
+++ b/calendar-1.25-linux.patch
@@ -1,6 +1,6 @@
-diff -up calendar-1.25/calendar.c.orig calendar-1.25/calendar.c
---- calendar-1.25/calendar.c.orig 2005-11-16 06:45:11.000000000 -1000
-+++ calendar-1.25/calendar.c 2009-02-12 12:47:01.000000000 -1000
+diff -up calendar-1.25/calendar.c.linux calendar-1.25/calendar.c
+--- calendar-1.25/calendar.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/calendar.c 2013-01-28 14:21:16.896956782 -0500
@@ -49,14 +49,12 @@ static const char rcsid[] = "$OpenBSD: c
#include <err.h>
#include <errno.h>
@@ -27,9 +27,9 @@ diff -up calendar-1.25/calendar.c.orig calendar-1.25/calendar.c
if (acstat) {
if (chdir(pw->pw_dir) ||
stat(calendarFile, &sbuf) != 0 ||
-diff -up calendar-1.25/calendar.h.orig calendar-1.25/calendar.h
---- calendar-1.25/calendar.h.orig 2005-08-09 02:32:58.000000000 -1000
-+++ calendar-1.25/calendar.h 2009-02-12 15:35:24.000000000 -1000
+diff -up calendar-1.25/calendar.h.linux calendar-1.25/calendar.h
+--- calendar-1.25/calendar.h.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/calendar.h 2013-01-28 14:21:16.896956782 -0500
@@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
@@ -53,9 +53,9 @@ diff -up calendar-1.25/calendar.h.orig calendar-1.25/calendar.h
#define USERTIMEOUT 20
+
+#define SECSPERDAY 86400
-diff -up calendar-1.25/day.c.orig calendar-1.25/day.c
---- calendar-1.25/day.c.orig 2008-04-12 14:22:17.000000000 -1000
-+++ calendar-1.25/day.c 2009-02-12 15:41:08.000000000 -1000
+diff -up calendar-1.25/day.c.linux calendar-1.25/day.c
+--- calendar-1.25/day.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/day.c 2013-01-28 14:21:41.163018324 -0500
@@ -53,7 +53,6 @@ static const char rcsid[] = "$OpenBSD: d
#include <stdlib.h>
#include <string.h>
@@ -73,17 +73,20 @@ diff -up calendar-1.25/day.c.orig calendar-1.25/day.c
cumdays = daytab[1];
else
cumdays = daytab[0];
-@@ -301,7 +300,8 @@ isnow(char *endp, int bodun)
+@@ -300,8 +299,10 @@ isnow(char *endp, int bodun)
+ return (NULL);
/* adjust bodun rate */
- if (bodun && !bodun_always)
+- if (bodun && !bodun_always)
- bodun = !arc4random_uniform(3);
++ if (bodun && !bodun_always) {
+ srandom(3);
+ bodun = random();
++ }
/* Easter or Easter depending days */
if (flags & F_SPECIAL)
-@@ -452,7 +452,7 @@ isnow(char *endp, int bodun)
+@@ -452,7 +453,7 @@ isnow(char *endp, int bodun)
}
v2 = day - tp->tm_yday;
if ((v2 > v1) || (v2 < 0)) {
@@ -92,7 +95,7 @@ diff -up calendar-1.25/day.c.orig calendar-1.25/day.c
<= v1)
tmtmp.tm_year++;
else if(!bodun || (day - tp->tm_yday) != -1)
-@@ -688,7 +688,7 @@ variable_weekday(int *day, int month, in
+@@ -688,7 +689,7 @@ variable_weekday(int *day, int month, in
int *cumdays;
int day1;
@@ -101,9 +104,9 @@ diff -up calendar-1.25/day.c.orig calendar-1.25/day.c
cumdays = daytab[1];
else
cumdays = daytab[0];
-diff -up calendar-1.25/io.c.orig calendar-1.25/io.c
---- calendar-1.25/io.c.orig 2007-10-17 10:10:44.000000000 -1000
-+++ calendar-1.25/io.c 2009-02-12 12:48:11.000000000 -1000
+diff -up calendar-1.25/io.c.linux calendar-1.25/io.c
+--- calendar-1.25/io.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/io.c 2013-01-28 14:21:16.897955707 -0500
@@ -59,7 +59,6 @@ static const char rcsid[] = "$OpenBSD: i
#include <stdio.h>
#include <stdlib.h>
@@ -121,9 +124,9 @@ diff -up calendar-1.25/io.c.orig calendar-1.25/io.c
char buf[2048 + 1], *prefix = NULL, *p;
struct match *m;
FILE *fp;
-diff -up calendar-1.25/ostern.c.orig calendar-1.25/ostern.c
---- calendar-1.25/ostern.c.orig 2005-11-16 06:45:11.000000000 -1000
-+++ calendar-1.25/ostern.c 2009-02-12 15:35:55.000000000 -1000
+diff -up calendar-1.25/ostern.c.linux calendar-1.25/ostern.c
+--- calendar-1.25/ostern.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/ostern.c 2013-01-28 14:21:16.897955707 -0500
@@ -34,7 +34,6 @@ static const char rcsid[] = "$OpenBSD: o
#include <stdio.h>
@@ -141,9 +144,9 @@ diff -up calendar-1.25/ostern.c.orig calendar-1.25/ostern.c
e_q++;
if (e_n == 4)
-diff -up calendar-1.25/paskha.c.orig calendar-1.25/paskha.c
---- calendar-1.25/paskha.c.orig 2005-11-16 06:45:11.000000000 -1000
-+++ calendar-1.25/paskha.c 2009-02-12 15:36:27.000000000 -1000
+diff -up calendar-1.25/paskha.c.linux calendar-1.25/paskha.c
+--- calendar-1.25/paskha.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/paskha.c 2013-01-28 14:21:16.897955707 -0500
@@ -31,7 +31,7 @@ static const char rcsid[] = "$OpenBSD: p
#endif /* not lint */
@@ -162,9 +165,9 @@ diff -up calendar-1.25/paskha.c.orig calendar-1.25/paskha.c
cumdays++;
return ((cumdays + 22) + (d + e) + 13);
}
-diff -up calendar-1.25/pesach.c.orig calendar-1.25/pesach.c
---- calendar-1.25/pesach.c.orig 2004-12-10 10:50:45.000000000 -1000
-+++ calendar-1.25/pesach.c 2009-02-12 15:32:37.000000000 -1000
+diff -up calendar-1.25/pesach.c.linux calendar-1.25/pesach.c
+--- calendar-1.25/pesach.c.linux 2009-02-17 16:19:33.000000000 -0500
++++ calendar-1.25/pesach.c 2013-01-28 14:21:16.897955707 -0500
@@ -22,7 +22,7 @@ static const char rcsid[] = "$OpenBSD: p
#endif /* not lint */
diff --git a/calendar.spec b/calendar.spec
index c8e4109..0f2e786 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,7 +1,7 @@
Summary: Reminder utility
Name: calendar
Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
License: BSD
Group: Applications/Productivity
URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -58,6 +58,9 @@ done
%{_datadir}/calendar
%changelog
+* Mon Jan 28 2013 David Cantrell <dcantrell at redhat.com> - 1.25-8
+- Add missing braces to 'adjust bodun rate' block (#892234)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list