[calendar] Rebase to the version of 'calendar' from OpenBSD 5.5
David Cantrell
dcantrel at fedoraproject.org
Fri Jun 13 13:20:49 UTC 2014
commit 161ed15f7241f671731fa7a84c1458d40e9e2bd1
Author: David Cantrell <dcantrell at redhat.com>
Date: Fri Jun 13 09:20:32 2014 -0400
Rebase to the version of 'calendar' from OpenBSD 5.5
.gitignore | 1 +
calendar-1.26-coding.patch | 176 --------------------
...r-1.26-linux.patch => calendar-1.28-linux.patch | 70 ++++-----
calendar.spec | 15 +-
export-calendar-source.sh | 2 +-
sources | 2 +-
6 files changed, 41 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eda4caf..68ec361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
calendar-1.26-20110531cvs.tar.gz
+/calendar-1.28-20140613cvs.tar.gz
diff --git a/calendar-1.26-linux.patch b/calendar-1.28-linux.patch
similarity index 60%
rename from calendar-1.26-linux.patch
rename to calendar-1.28-linux.patch
index 01f8b64..7d681c5 100644
--- a/calendar-1.26-linux.patch
+++ b/calendar-1.28-linux.patch
@@ -1,6 +1,6 @@
-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
+diff -up calendar-1.28-20140613cvs/calendar.c.linux calendar-1.28-20140613cvs/calendar.c
+--- calendar-1.28-20140613cvs/calendar.c.linux 2012-01-31 03:29:25.000000000 -0500
++++ calendar-1.28-20140613cvs/calendar.c 2014-06-13 09:10:21.083747232 -0400
@@ -35,14 +35,12 @@
#include <err.h>
#include <errno.h>
@@ -16,9 +16,9 @@ diff -up calendar-1.26-20110115cvs/calendar.c.linux calendar-1.26-20110115cvs/ca
#include <unistd.h>
#include "pathnames.h"
-@@ -170,10 +168,6 @@ main(int argc, char *argv[])
- continue;
+@@ -171,10 +169,6 @@ main(int argc, char *argv[])
case 0: /* child */
+ (void)setpgid(getpid(), getpid());
(void)setlocale(LC_ALL, "");
- if (setusercontext(NULL, pw, pw->pw_uid,
- LOGIN_SETALL ^ LOGIN_SETLOGIN))
@@ -27,18 +27,10 @@ diff -up calendar-1.26-20110115cvs/calendar.c.linux calendar-1.26-20110115cvs/ca
if (acstat) {
if (chdir(pw->pw_dir) ||
stat(calendarFile, &sbuf) != 0 ||
-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.
- */
-
-+#include <sys/uio.h>
-
- extern struct passwd *pw;
- extern int doall;
-@@ -110,7 +111,7 @@ extern int f_SetdayAfter; /* calendar in
+diff -up calendar-1.28-20140613cvs/calendar.h.linux calendar-1.28-20140613cvs/calendar.h
+--- calendar-1.28-20140613cvs/calendar.h.linux 2010-04-28 14:20:15.000000000 -0400
++++ calendar-1.28-20140613cvs/calendar.h 2014-06-13 09:11:26.447747232 -0400
+@@ -110,7 +110,7 @@ extern int f_SetdayAfter; /* calendar in
/* calendars */
extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
@@ -47,15 +39,15 @@ diff -up calendar-1.26-20110115cvs/calendar.h.linux calendar-1.26-20110115cvs/ca
#define NUMEV 3 /* Total number of such special events */
extern struct specialev spev[NUMEV];
-@@ -120,3 +121,5 @@ extern struct specialev spev[NUMEV];
+@@ -120,3 +120,5 @@ extern struct specialev spev[NUMEV];
* (e.g. by using named pipes)
*/
#define USERTIMEOUT 20
+
+#define SECSPERDAY 86400
-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
+diff -up calendar-1.28-20140613cvs/day.c.linux calendar-1.28-20140613cvs/day.c
+--- calendar-1.28-20140613cvs/day.c.linux 2013-11-26 08:18:53.000000000 -0500
++++ calendar-1.28-20140613cvs/day.c 2014-06-13 09:12:57.023747232 -0400
@@ -39,7 +39,6 @@
#include <stdlib.h>
#include <string.h>
@@ -64,7 +56,7 @@ diff -up calendar-1.26-20110115cvs/day.c.linux calendar-1.26-20110115cvs/day.c
#include "pathnames.h"
#include "calendar.h"
-@@ -158,7 +157,7 @@ settime(time_t *now)
+@@ -157,7 +156,7 @@ settime(time_t *now)
tp->tm_isdst = 0;
tp->tm_hour = 12;
*now = mktime(tp);
@@ -104,9 +96,9 @@ diff -up calendar-1.26-20110115cvs/day.c.linux calendar-1.26-20110115cvs/day.c
cumdays = daytab[1];
else
cumdays = daytab[0];
-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
+diff -up calendar-1.28-20140613cvs/io.c.linux calendar-1.28-20140613cvs/io.c
+--- calendar-1.28-20140613cvs/io.c.linux 2013-11-26 08:18:53.000000000 -0500
++++ calendar-1.28-20140613cvs/io.c 2014-06-13 09:13:48.874747232 -0400
@@ -45,7 +45,6 @@
#include <stdio.h>
#include <stdlib.h>
@@ -124,9 +116,9 @@ diff -up calendar-1.26-20110115cvs/io.c.linux calendar-1.26-20110115cvs/io.c
char buf[2048 + 1], *prefix = NULL, *p;
struct match *m;
FILE *fp;
-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
+diff -up calendar-1.28-20140613cvs/ostern.c.linux calendar-1.28-20140613cvs/ostern.c
+--- calendar-1.28-20140613cvs/ostern.c.linux 2009-10-27 19:59:36.000000000 -0400
++++ calendar-1.28-20140613cvs/ostern.c 2014-06-13 09:14:04.746747232 -0400
@@ -30,7 +30,6 @@
#include <stdio.h>
@@ -144,19 +136,18 @@ diff -up calendar-1.26-20110115cvs/ostern.c.linux calendar-1.26-20110115cvs/oste
e_q++;
if (e_n == 4)
-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 @@
+diff -up calendar-1.28-20140613cvs/paskha.c.linux calendar-1.28-20140613cvs/paskha.c
+--- calendar-1.28-20140613cvs/paskha.c.linux 2009-10-27 19:59:36.000000000 -0400
++++ calendar-1.28-20140613cvs/paskha.c 2014-06-13 09:14:28.434747232 -0400
+@@ -27,7 +27,6 @@
*/
#include <stdio.h>
-#include <tzfile.h>
-+#include <time.h>
#include "calendar.h"
-@@ -48,7 +48,7 @@ paskha(int R) /*year*/
+@@ -48,7 +47,7 @@ paskha(int R) /*year*/
d = (19*a + x) % 30;
e = (2*b + 4*c + 6*d + y) % 7;
cumdays = 31 + 28;
@@ -165,19 +156,18 @@ diff -up calendar-1.26-20110115cvs/paskha.c.linux calendar-1.26-20110115cvs/pask
cumdays++;
return ((cumdays + 22) + (d + e) + 13);
}
-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 @@
+diff -up calendar-1.28-20140613cvs/pesach.c.linux calendar-1.28-20140613cvs/pesach.c
+--- calendar-1.28-20140613cvs/pesach.c.linux 2009-10-27 19:59:36.000000000 -0400
++++ calendar-1.28-20140613cvs/pesach.c 2014-06-13 09:14:50.290747232 -0400
+@@ -18,7 +18,6 @@
*/
#include <stdio.h>
-#include <tzfile.h>
-+#include <time.h>
#include "calendar.h"
-@@ -62,5 +62,5 @@ pesach(int R)
+@@ -62,5 +61,5 @@ pesach(int R)
if (R > 1582)
cumdays += R / 100 - R /400 - 2;
diff --git a/calendar.spec b/calendar.spec
index 965deab..d431917 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20110531cvs
+%define alphatag 20140613cvs
Summary: Reminder utility
Name: calendar
-Version: 1.26
-Release: 8.%{alphatag}%{?dist}
+Version: 1.28
+Release: 1.%{alphatag}%{?dist}
License: BSD
Group: Applications/Productivity
URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -17,8 +17,7 @@ Source0: %{name}-%{version}-%{alphatag}.tar.gz
Source1: Makefile.linux
Source2: export-calendar-source.sh
-Patch0: %{name}-1.26-linux.patch
-Patch1: %{name}-1.26-coding.patch
+Patch0: %{name}-1.28-linux.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
@@ -34,7 +33,6 @@ week.
%prep
%setup -q -n %{name}-%{version}-%{alphatag}
%patch0 -p1
-%patch1 -p1
cp %{SOURCE1} Makefile
for c in calendars/*.*/* ; do
@@ -62,6 +60,9 @@ rm -rf %{buildroot}
%{_datadir}/calendar
%changelog
+* Fri Jun 13 2014 David Cantrell <dcantrell at redhat.com> - 1.28-1.20140613cvs
+- Rebase to the version of 'calendar' from OpenBSD 5.5
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-8.20110531cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -77,7 +78,7 @@ rm -rf %{buildroot}
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-4.20110531cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Fri Jun 02 2011 David Cantrell <dcantrell at redhat.com> - 1.26-3.20110531cvs
+* Thu Jun 02 2011 David Cantrell <dcantrell at redhat.com> - 1.26-3.20110531cvs
- Must increment release number regardless of cvstag
* Tue May 31 2011 David Cantrell <dcantrell at redhat.com> - 1.26-1.20110531cvs
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index 7552116..7e547e9 100644
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#TAG=HEAD
-TAG=OPENBSD_4_9
+TAG=OPENBSD_5_5
CWD=$(pwd)
CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index d9444b3..9f9c144 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1e54e4430c34bfecc7a86bec5786e48 calendar-1.26-20110531cvs.tar.gz
+016045f29b283c4267e525de6d5cc1fd calendar-1.28-20140613cvs.tar.gz
More information about the scm-commits
mailing list