[calendar] - Upgraded to calendar source from OpenBSD 4.8
David Cantrell
dcantrel at fedoraproject.org
Sun Jan 16 04:13:15 UTC 2011
commit 63e5722208aca8435994c52d304fecf60e75ce4b
Author: David Cantrell <david.l.cantrell at gmail.com>
Date: Sat Jan 15 18:11:58 2011 -1000
- Upgraded to calendar source from OpenBSD 4.8
.gitignore | 1 +
...1.25-coding.patch => calendar-1.26-coding.patch | 26 +++---
...r-1.25-linux.patch => calendar-1.26-linux.patch | 80 ++++++++++----------
calendar.spec | 13 ++-
export-calendar-source.sh | 7 +-
sources | 2 +-
6 files changed, 68 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1250fcb..308921b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
calendar-1.25-20091114cvs.tar.gz
+/calendar-1.26-20110115cvs.tar.gz
diff --git a/calendar-1.25-coding.patch b/calendar-1.26-coding.patch
similarity index 83%
rename from calendar-1.25-coding.patch
rename to calendar-1.26-coding.patch
index 655c6e8..c7e94fe 100644
--- a/calendar-1.25-coding.patch
+++ b/calendar-1.26-coding.patch
@@ -1,6 +1,6 @@
-diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
---- calendar-1.25.orig/calendar.h 2009-03-03 22:37:55.000000000 -0500
-+++ calendar-1.25/calendar.h 2009-03-04 00:08:53.000000000 -0500
+diff -up calendar-1.26-20110115cvs/calendar.h.coding calendar-1.26-20110115cvs/calendar.h
+--- calendar-1.26-20110115cvs/calendar.h.coding 2011-01-15 17:27:14.000000000 -1000
++++ calendar-1.26-20110115cvs/calendar.h 2011-01-15 17:27:52.000000000 -1000
@@ -31,6 +31,8 @@
#include <sys/uio.h>
@@ -10,7 +10,7 @@ diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
extern struct passwd *pw;
extern int doall;
extern int bodun_always;
-@@ -70,6 +72,7 @@
+@@ -69,6 +71,7 @@ struct specialev {
int (*getev)(int);
};
@@ -18,10 +18,10 @@ diff -urN calendar-1.25.orig/calendar.h calendar-1.25/calendar.h
void cal(void);
void closecal(FILE *);
int getday(char *);
-diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
---- calendar-1.25.orig/io.c 2009-03-03 22:37:55.000000000 -0500
-+++ calendar-1.25/io.c 2009-03-04 00:11:21.000000000 -0500
-@@ -61,10 +61,17 @@
+diff -up calendar-1.26-20110115cvs/io.c.coding calendar-1.26-20110115cvs/io.c
+--- calendar-1.26-20110115cvs/io.c.coding 2011-01-15 17:27:14.000000000 -1000
++++ calendar-1.26-20110115cvs/io.c 2011-01-15 17:27:52.000000000 -1000
+@@ -47,10 +47,17 @@
#include <string.h>
#include <unistd.h>
@@ -39,7 +39,7 @@ diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
struct iovec header[] = {
{ "From: ", 6 },
{ NULL, 0 },
-@@ -76,6 +83,39 @@
+@@ -62,6 +69,39 @@ struct iovec header[] = {
{ "Auto-Submitted: auto-generated\n\n", 32 },
};
@@ -79,7 +79,7 @@ diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
void
cal(void)
-@@ -86,6 +126,42 @@
+@@ -72,6 +112,42 @@ cal(void)
struct match *m;
FILE *fp;
@@ -122,7 +122,7 @@ diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
events = NULL;
cur_evt = NULL;
if ((fp = opencal()) == NULL)
-@@ -101,6 +177,14 @@
+@@ -87,6 +163,14 @@ cal(void)
if (buf[0] == '\0')
continue;
if (strncmp(buf, "LANG=", 5) == 0) {
@@ -137,7 +137,7 @@ diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
(void) setlocale(LC_ALL, buf + 5);
setnnames();
if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
-@@ -215,8 +299,17 @@
+@@ -201,8 +285,17 @@ cal(void)
}
tmp = events;
while (tmp) {
@@ -156,7 +156,7 @@ diff -urN calendar-1.25.orig/io.c calendar-1.25/io.c
}
tmp = events;
while (tmp) {
-@@ -226,6 +319,17 @@
+@@ -212,6 +305,17 @@ cal(void)
tmp = tmp->next;
free(events);
}
diff --git a/calendar-1.25-linux.patch b/calendar-1.26-linux.patch
similarity index 57%
rename from calendar-1.25-linux.patch
rename to calendar-1.26-linux.patch
index 9f006f4..01f8b64 100644
--- a/calendar-1.25-linux.patch
+++ b/calendar-1.26-linux.patch
@@ -1,7 +1,7 @@
-diff -up calendar-1.25-20091114cvs/calendar.c.linux calendar-1.25-20091114cvs/calendar.c
---- calendar-1.25-20091114cvs/calendar.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/calendar.c 2010-02-24 06:13:22.000000000 -1000
-@@ -49,14 +49,12 @@ static const char rcsid[] = "$OpenBSD: c
+diff -up calendar-1.26-20110115cvs/calendar.c.linux calendar-1.26-20110115cvs/calendar.c
+--- calendar-1.26-20110115cvs/calendar.c.linux 2009-10-27 13:59:36.000000000 -1000
++++ calendar-1.26-20110115cvs/calendar.c 2011-01-15 17:27:14.000000000 -1000
+@@ -35,14 +35,12 @@
#include <err.h>
#include <errno.h>
#include <locale.h>
@@ -16,7 +16,7 @@ diff -up calendar-1.25-20091114cvs/calendar.c.linux calendar-1.25-20091114cvs/ca
#include <unistd.h>
#include "pathnames.h"
-@@ -184,10 +182,6 @@ main(int argc, char *argv[])
+@@ -170,10 +168,6 @@ main(int argc, char *argv[])
continue;
case 0: /* child */
(void)setlocale(LC_ALL, "");
@@ -27,9 +27,9 @@ diff -up calendar-1.25-20091114cvs/calendar.c.linux calendar-1.25-20091114cvs/ca
if (acstat) {
if (chdir(pw->pw_dir) ||
stat(calendarFile, &sbuf) != 0 ||
-diff -up calendar-1.25-20091114cvs/calendar.h.linux calendar-1.25-20091114cvs/calendar.h
---- calendar-1.25-20091114cvs/calendar.h.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/calendar.h 2010-02-24 06:13:22.000000000 -1000
+diff -up calendar-1.26-20110115cvs/calendar.h.linux calendar-1.26-20110115cvs/calendar.h
+--- calendar-1.26-20110115cvs/calendar.h.linux 2010-04-28 08:20:15.000000000 -1000
++++ calendar-1.26-20110115cvs/calendar.h 2011-01-15 17:27:14.000000000 -1000
@@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
@@ -38,7 +38,7 @@ diff -up calendar-1.25-20091114cvs/calendar.h.linux calendar-1.25-20091114cvs/ca
extern struct passwd *pw;
extern int doall;
-@@ -111,7 +112,7 @@ extern int f_SetdayAfter; /* calendar in
+@@ -110,7 +111,7 @@ extern int f_SetdayAfter; /* calendar in
/* calendars */
extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
@@ -47,16 +47,16 @@ diff -up calendar-1.25-20091114cvs/calendar.h.linux calendar-1.25-20091114cvs/ca
#define NUMEV 3 /* Total number of such special events */
extern struct specialev spev[NUMEV];
-@@ -121,3 +122,5 @@ extern struct specialev spev[NUMEV];
+@@ -120,3 +121,5 @@ extern struct specialev spev[NUMEV];
* (e.g. by using named pipes)
*/
#define USERTIMEOUT 20
+
+#define SECSPERDAY 86400
-diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
---- calendar-1.25-20091114cvs/day.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/day.c 2010-02-24 06:13:40.000000000 -1000
-@@ -53,7 +53,6 @@ static const char rcsid[] = "$OpenBSD: d
+diff -up calendar-1.26-20110115cvs/day.c.linux calendar-1.26-20110115cvs/day.c
+--- calendar-1.26-20110115cvs/day.c.linux 2010-04-28 08:20:15.000000000 -1000
++++ calendar-1.26-20110115cvs/day.c 2011-01-15 17:27:14.000000000 -1000
+@@ -39,7 +39,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -64,7 +64,7 @@ diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
#include "pathnames.h"
#include "calendar.h"
-@@ -170,7 +169,7 @@ settime(time_t *now)
+@@ -158,7 +157,7 @@ settime(time_t *now)
tp->tm_isdst = 0;
tp->tm_hour = 12;
*now = mktime(tp);
@@ -73,7 +73,7 @@ diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
cumdays = daytab[1];
else
cumdays = daytab[0];
-@@ -300,8 +299,10 @@ isnow(char *endp, int bodun)
+@@ -288,8 +287,10 @@ isnow(char *endp, int bodun)
return (NULL);
/* adjust bodun rate */
@@ -86,7 +86,7 @@ diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
/* Easter or Easter depending days */
if (flags & F_SPECIAL)
-@@ -452,7 +453,7 @@ isnow(char *endp, int bodun)
+@@ -440,7 +441,7 @@ isnow(char *endp, int bodun)
}
v2 = day - tp->tm_yday;
if ((v2 > v1) || (v2 < 0)) {
@@ -95,7 +95,7 @@ diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
<= v1)
tmtmp.tm_year++;
else if(!bodun || (day - tp->tm_yday) != -1)
-@@ -688,7 +689,7 @@ variable_weekday(int *day, int month, in
+@@ -676,7 +677,7 @@ variable_weekday(int *day, int month, in
int *cumdays;
int day1;
@@ -104,10 +104,10 @@ diff -up calendar-1.25-20091114cvs/day.c.linux calendar-1.25-20091114cvs/day.c
cumdays = daytab[1];
else
cumdays = daytab[0];
-diff -up calendar-1.25-20091114cvs/io.c.linux calendar-1.25-20091114cvs/io.c
---- calendar-1.25-20091114cvs/io.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/io.c 2010-02-24 06:13:22.000000000 -1000
-@@ -59,7 +59,6 @@ static const char rcsid[] = "$OpenBSD: i
+diff -up calendar-1.26-20110115cvs/io.c.linux calendar-1.26-20110115cvs/io.c
+--- calendar-1.26-20110115cvs/io.c.linux 2009-10-27 13:59:36.000000000 -1000
++++ calendar-1.26-20110115cvs/io.c 2011-01-15 17:27:14.000000000 -1000
+@@ -45,7 +45,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -115,7 +115,7 @@ diff -up calendar-1.25-20091114cvs/io.c.linux calendar-1.25-20091114cvs/io.c
#include <unistd.h>
#include "pathnames.h"
-@@ -82,7 +81,7 @@ void
+@@ -68,7 +67,7 @@ void
cal(void)
{
int ch, l, i, bodun = 0, bodun_maybe = 0, var, printing;
@@ -124,10 +124,10 @@ diff -up calendar-1.25-20091114cvs/io.c.linux calendar-1.25-20091114cvs/io.c
char buf[2048 + 1], *prefix = NULL, *p;
struct match *m;
FILE *fp;
-diff -up calendar-1.25-20091114cvs/ostern.c.linux calendar-1.25-20091114cvs/ostern.c
---- calendar-1.25-20091114cvs/ostern.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/ostern.c 2010-02-24 06:13:22.000000000 -1000
-@@ -34,7 +34,6 @@ static const char rcsid[] = "$OpenBSD: o
+diff -up calendar-1.26-20110115cvs/ostern.c.linux calendar-1.26-20110115cvs/ostern.c
+--- calendar-1.26-20110115cvs/ostern.c.linux 2009-10-27 13:59:36.000000000 -1000
++++ calendar-1.26-20110115cvs/ostern.c 2011-01-15 17:27:14.000000000 -1000
+@@ -30,7 +30,6 @@
#include <stdio.h>
#include <time.h>
@@ -135,7 +135,7 @@ diff -up calendar-1.25-20091114cvs/ostern.c.linux calendar-1.25-20091114cvs/oste
#include "calendar.h"
-@@ -65,7 +64,7 @@ easter(int year) /* 0 ... abcd, NOT sinc
+@@ -61,7 +60,7 @@ easter(int year) /* 0 ... abcd, NOT sinc
e_p = e_p + 1;
e_q = 31 + 28 + e_p;
@@ -144,11 +144,11 @@ diff -up calendar-1.25-20091114cvs/ostern.c.linux calendar-1.25-20091114cvs/oste
e_q++;
if (e_n == 4)
-diff -up calendar-1.25-20091114cvs/paskha.c.linux calendar-1.25-20091114cvs/paskha.c
---- calendar-1.25-20091114cvs/paskha.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/paskha.c 2010-02-24 06:13:22.000000000 -1000
-@@ -31,7 +31,7 @@ static const char rcsid[] = "$OpenBSD: p
- #endif /* not lint */
+diff -up calendar-1.26-20110115cvs/paskha.c.linux calendar-1.26-20110115cvs/paskha.c
+--- calendar-1.26-20110115cvs/paskha.c.linux 2009-10-27 13:59:36.000000000 -1000
++++ calendar-1.26-20110115cvs/paskha.c 2011-01-15 17:27:14.000000000 -1000
+@@ -27,7 +27,7 @@
+ */
#include <stdio.h>
-#include <tzfile.h>
@@ -156,7 +156,7 @@ diff -up calendar-1.25-20091114cvs/paskha.c.linux calendar-1.25-20091114cvs/pask
#include "calendar.h"
-@@ -52,7 +52,7 @@ paskha(int R) /*year*/
+@@ -48,7 +48,7 @@ paskha(int R) /*year*/
d = (19*a + x) % 30;
e = (2*b + 4*c + 6*d + y) % 7;
cumdays = 31 + 28;
@@ -165,11 +165,11 @@ diff -up calendar-1.25-20091114cvs/paskha.c.linux calendar-1.25-20091114cvs/pask
cumdays++;
return ((cumdays + 22) + (d + e) + 13);
}
-diff -up calendar-1.25-20091114cvs/pesach.c.linux calendar-1.25-20091114cvs/pesach.c
---- calendar-1.25-20091114cvs/pesach.c.linux 2009-11-14 11:14:59.000000000 -1000
-+++ calendar-1.25-20091114cvs/pesach.c 2010-02-24 06:13:22.000000000 -1000
-@@ -22,7 +22,7 @@ static const char rcsid[] = "$OpenBSD: p
- #endif /* not lint */
+diff -up calendar-1.26-20110115cvs/pesach.c.linux calendar-1.26-20110115cvs/pesach.c
+--- calendar-1.26-20110115cvs/pesach.c.linux 2009-10-27 13:59:36.000000000 -1000
++++ calendar-1.26-20110115cvs/pesach.c 2011-01-15 17:27:14.000000000 -1000
+@@ -18,7 +18,7 @@
+ */
#include <stdio.h>
-#include <tzfile.h>
@@ -177,7 +177,7 @@ diff -up calendar-1.25-20091114cvs/pesach.c.linux calendar-1.25-20091114cvs/pesa
#include "calendar.h"
-@@ -66,5 +66,5 @@ pesach(int R)
+@@ -62,5 +62,5 @@ pesach(int R)
if (R > 1582)
cumdays += R / 100 - R /400 - 2;
diff --git a/calendar.spec b/calendar.spec
index 22dc3c9..b4905bb 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20091114cvs
+%define alphatag 20110115cvs
Summary: Reminder utility
Name: calendar
-Version: 1.25
-Release: 10.%{alphatag}%{?dist}
+Version: 1.26
+Release: 1.%{alphatag}%{?dist}
License: BSD
Group: Applications/Productivity
URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -17,8 +17,8 @@ Source0: %{name}-%{version}-%{alphatag}.tar.gz
Source1: Makefile.linux
Source2: export-calendar-source.sh
-Patch0: %{name}-1.25-linux.patch
-Patch1: %{name}-1.25-coding.patch
+Patch0: %{name}-1.26-linux.patch
+Patch1: %{name}-1.26-coding.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
%{_datadir}/calendar
%changelog
+* Sat Jan 15 2011 David Cantrell <dcantrell at redhat.com> - 1.26-1.20110115cvs
+- Upgraded to calendar source from OpenBSD 4.8
+
* Fri May 21 2010 David Cantrell <dcantrell at redhat.com> - 1.25-10.20091114cvs
- Do not use RPM macros for basic commands in the spec file
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index 6d6a816..5d65884 100644
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,10 @@
#!/bin/sh
-CWD=$(pwd)
+
#TAG=HEAD
-TAG=OPENBSD_4_6
+TAG=OPENBSD_4_8
+
+CWD=$(pwd)
+CVS_RSH=ssh ; export CVS_RSH
rm -rf calendar calendar-${VER}
mkdir calendar
cvs -d anoncvs at anoncvs.ca.openbsd.org:/cvs co \
diff --git a/sources b/sources
index 03cdbde..23c06d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c79099a7210018ab681b04b31a7e4bd calendar-1.25-20091114cvs.tar.gz
+d66aa1f867098cd178df60cd1a377700 calendar-1.26-20110115cvs.tar.gz
More information about the scm-commits
mailing list