From 6e82d99ef80b57010993d5f5608d1cebe6da8e2d Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:40 +0100
Subject: [PATCH 01/32] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 calendar.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 0dd8fd7..bb0b942 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -5,7 +5,6 @@ Name:    calendar
 Version: 1.35
 Release: 1.%{alphatag}%{?dist}
 License: BSD
-Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
 # The source archive is generated with the export-calendar-source.sh

From 6a23e9e9ae96f943ca1882fb3350f238c77568c6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 15:12:05 +0000
Subject: [PATCH 02/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index bb0b942..b9c2b5f 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.35
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-2.20180719cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Jul 19 2018 David Cantrell <dcantrell@redhat.com> - 1.35-1.20180719cvs
 - Upgrade to calendar-1.35 from OpenBSD 6.3
 

From b7dc1aaeed01488fdcc4b46916cd3121c234263e Mon Sep 17 00:00:00 2001
From: David Cantrell <david.l.cantrell@gmail.com>
Date: Wed, 27 Feb 2019 15:04:04 -0500
Subject: [PATCH 03/32] Upgrade to calendar-1.35 from OpenBSD 6.4 Fix path to
 'cpp' in pathnames.h (#1653311)

---
 .gitignore                |  1 +
 calendar-1.35-linux.patch | 54 ++++++++++++++++++++++++---------------
 calendar.spec             |  9 ++++---
 export-calendar-source.sh |  2 +-
 sources                   |  2 +-
 5 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13f966d..0ead00e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 calendar-1.26-20110531cvs.tar.gz
 /calendar-1.28-20140613cvs.tar.gz
 /calendar-1.35-20180719cvs.tar.gz
+/calendar-1.35-20190227cvs.tar.gz
diff --git a/calendar-1.35-linux.patch b/calendar-1.35-linux.patch
index bf1fd6f..7fcad94 100644
--- a/calendar-1.35-linux.patch
+++ b/calendar-1.35-linux.patch
@@ -1,6 +1,6 @@
-diff -up calendar-1.35-20180719cvs/calendar.c.orig calendar-1.35-20180719cvs/calendar.c
---- calendar-1.35-20180719cvs/calendar.c.orig	2015-12-07 13:46:35.000000000 -0500
-+++ calendar-1.35-20180719cvs/calendar.c	2018-07-19 17:03:48.564840708 -0400
+diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/calendar.c
+--- calendar-1.35-20190227cvs/calendar.c.orig	2015-12-07 13:46:35.000000000 -0500
++++ calendar-1.35-20190227cvs/calendar.c	2019-02-27 15:02:36.384637931 -0500
 @@ -35,7 +35,6 @@
  #include <err.h>
  #include <errno.h>
@@ -63,9 +63,9 @@ diff -up calendar-1.35-20180719cvs/calendar.c.orig calendar-1.35-20180719cvs/cal
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
-diff -up calendar-1.35-20180719cvs/calendar.h.orig calendar-1.35-20180719cvs/calendar.h
---- calendar-1.35-20180719cvs/calendar.h.orig	2015-12-07 13:46:35.000000000 -0500
-+++ calendar-1.35-20180719cvs/calendar.h	2018-07-19 16:51:12.156275891 -0400
+diff -up calendar-1.35-20190227cvs/calendar.h.orig calendar-1.35-20190227cvs/calendar.h
+--- calendar-1.35-20190227cvs/calendar.h.orig	2015-12-07 13:46:35.000000000 -0500
++++ calendar-1.35-20190227cvs/calendar.h	2019-02-27 15:02:36.384637931 -0500
 @@ -29,6 +29,7 @@
   * SUCH DAMAGE.
   */
@@ -83,9 +83,9 @@ diff -up calendar-1.35-20180719cvs/calendar.h.orig calendar-1.35-20180719cvs/cal
  
  #define NUMEV 3	/* Total number of such special events */
  extern struct specialev spev[NUMEV];
-diff -up calendar-1.35-20180719cvs/day.c.orig calendar-1.35-20180719cvs/day.c
---- calendar-1.35-20180719cvs/day.c.orig	2016-09-14 11:09:46.000000000 -0400
-+++ calendar-1.35-20180719cvs/day.c	2018-07-19 16:51:00.669312872 -0400
+diff -up calendar-1.35-20190227cvs/day.c.orig calendar-1.35-20190227cvs/day.c
+--- calendar-1.35-20190227cvs/day.c.orig	2016-09-14 11:09:46.000000000 -0400
++++ calendar-1.35-20190227cvs/day.c	2019-02-27 15:02:36.384637931 -0500
 @@ -160,7 +160,7 @@ settime(time_t *now)
  	tp->tm_isdst = 0;
  	tp->tm_hour = 12;
@@ -126,9 +126,9 @@ diff -up calendar-1.35-20180719cvs/day.c.orig calendar-1.35-20180719cvs/day.c
  		cumdays = daytab[1];
  	else
  		cumdays = daytab[0];
-diff -up calendar-1.35-20180719cvs/io.c.orig calendar-1.35-20180719cvs/io.c
---- calendar-1.35-20180719cvs/io.c.orig	2017-09-25 15:13:56.000000000 -0400
-+++ calendar-1.35-20180719cvs/io.c	2018-07-19 16:58:19.641899643 -0400
+diff -up calendar-1.35-20190227cvs/io.c.orig calendar-1.35-20190227cvs/io.c
+--- calendar-1.35-20190227cvs/io.c.orig	2017-09-25 15:13:56.000000000 -0400
++++ calendar-1.35-20190227cvs/io.c	2019-02-27 15:02:36.384637931 -0500
 @@ -67,7 +67,7 @@ void
  cal(void)
  {
@@ -150,9 +150,9 @@ diff -up calendar-1.35-20180719cvs/io.c.orig calendar-1.35-20180719cvs/io.c
  					return (0); /* Someone is just being silly */
  				if (*start == '-')
  					var = -var;
-diff -up calendar-1.35-20180719cvs/ostern.c.orig calendar-1.35-20180719cvs/ostern.c
---- calendar-1.35-20180719cvs/ostern.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20180719cvs/ostern.c	2018-07-19 16:51:00.670312869 -0400
+diff -up calendar-1.35-20190227cvs/ostern.c.orig calendar-1.35-20190227cvs/ostern.c
+--- calendar-1.35-20190227cvs/ostern.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.35-20190227cvs/ostern.c	2019-02-27 15:02:36.384637931 -0500
 @@ -60,7 +60,7 @@ easter(int year)	/* 0 ... abcd, NOT sinc
  	e_p = e_p + 1;
  
@@ -162,9 +162,9 @@ diff -up calendar-1.35-20180719cvs/ostern.c.orig calendar-1.35-20180719cvs/oster
  		e_q++;
  
  	if (e_n == 4)
-diff -up calendar-1.35-20180719cvs/paskha.c.orig calendar-1.35-20180719cvs/paskha.c
---- calendar-1.35-20180719cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20180719cvs/paskha.c	2018-07-19 16:51:00.670312869 -0400
+diff -up calendar-1.35-20190227cvs/paskha.c.orig calendar-1.35-20190227cvs/paskha.c
+--- calendar-1.35-20190227cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.35-20190227cvs/paskha.c	2019-02-27 15:02:36.384637931 -0500
 @@ -27,6 +27,7 @@
   */
  
@@ -182,9 +182,21 @@ diff -up calendar-1.35-20180719cvs/paskha.c.orig calendar-1.35-20180719cvs/paskh
  		cumdays++;
  	return ((cumdays + 22) + (d + e) + 13);
  }
-diff -up calendar-1.35-20180719cvs/pesach.c.orig calendar-1.35-20180719cvs/pesach.c
---- calendar-1.35-20180719cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20180719cvs/pesach.c	2018-07-19 16:51:00.670312869 -0400
+diff -up calendar-1.35-20190227cvs/pathnames.h.orig calendar-1.35-20190227cvs/pathnames.h
+--- calendar-1.35-20190227cvs/pathnames.h.orig	2014-07-30 12:46:17.000000000 -0400
++++ calendar-1.35-20190227cvs/pathnames.h	2019-02-27 15:02:57.883547022 -0500
+@@ -33,7 +33,7 @@
+ 
+ #include <paths.h>
+ 
+-#define	_PATH_CPP	"/usr/libexec/tradcpp"
++#define	_PATH_CPP	"/usr/bin/cpp"
+ 
+ 			/* XXX -- fix when cpp parses arguments rationally */
+ #define	_PATH_INCLUDE	"-I/usr/share/calendar"
+diff -up calendar-1.35-20190227cvs/pesach.c.orig calendar-1.35-20190227cvs/pesach.c
+--- calendar-1.35-20190227cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.35-20190227cvs/pesach.c	2019-02-27 15:02:36.384637931 -0500
 @@ -18,6 +18,7 @@
   */
  
diff --git a/calendar.spec b/calendar.spec
index b9c2b5f..f62e2ab 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20180719cvs
+%define alphatag 20190227cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.35
-Release: 2.%{alphatag}%{?dist}
+Release: 1.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -45,7 +45,6 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 %files
@@ -54,6 +53,10 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Feb 27 2019 David Cantrell <dcantrell@redhat.com> - 1.35-1.20190227cvs
+- Upgrade to calendar-1.35 from OpenBSD 6.4
+- Fix path to 'cpp' in pathnames.h (#1653311)
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-2.20180719cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index 160b3a0..d1c6b5f 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_6_3
+TAG=OPENBSD_6_4
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index fd3b310..8e4eb29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.35-20180719cvs.tar.gz) = 6ef957a887e1ce1ae7efb0526a7bd86dc91cb179ed1748e49ebe2cdf7b4b133858e352b6f35676f29d5b2ad4bba484e280e1db34cc090175b7ff33029dc55792
+SHA512 (calendar-1.35-20190227cvs.tar.gz) = cc51f558e82094fabe04a785d1ec796204e6c00f015f70cb6b9a248dc8337fb090ba45468ee4cca4303c23ff24c0ff58d0ffe656a871693fec7b9b6f82b09938

From 495132b98cd9afdcd089986870cd8b5359702232 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Thu, 7 Mar 2019 14:12:57 +0100
Subject: [PATCH 04/32] Fix downgradepath

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index f62e2ab..bf502bc 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.35
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Thu Mar 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.35-2.20190227cvs
+- Fix downgradepath
+
 * Wed Feb 27 2019 David Cantrell <dcantrell@redhat.com> - 1.35-1.20190227cvs
 - Upgrade to calendar-1.35 from OpenBSD 6.4
 - Fix path to 'cpp' in pathnames.h (#1653311)

From bf4d3ccaba372358a19877dd8ce9d7b05af3defe Mon Sep 17 00:00:00 2001
From: Dominique Corbex <dominique@corbex.org>
Date: Wed, 17 Jul 2019 08:39:00 +0000
Subject: [PATCH 05/32] Update calendar.spec

---
 calendar.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index bf502bc..a77c5b7 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.35
-Release: 2.%{alphatag}%{?dist}
+Release: 3.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 

From a3d78e7dda5dc978783a3813f56c103e707508d3 Mon Sep 17 00:00:00 2001
From: Dominique Corbex <dominique@corbex.org>
Date: Wed, 17 Jul 2019 08:44:44 +0000
Subject: [PATCH 06/32] Update calendar.spec

---
 calendar.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/calendar.spec b/calendar.spec
index a77c5b7..a8f7934 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -53,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 17 2019 Dominique Corbex <dominique@corbex.org> - 1.35-2.20190227cvs
+- Fix output in de_DE, fr_FR, hr_HR, ru_RU locales
+
 * Thu Mar 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.35-2.20190227cvs
 - Fix downgradepath
 

From a8bb517841e28426557f2e2b5e8fe195858da0f3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 19:50:59 +0000
Subject: [PATCH 07/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index a8f7934..2b9907e 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.35
-Release: 3.%{alphatag}%{?dist}
+Release: 4.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-4.20190227cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jul 17 2019 Dominique Corbex <dominique@corbex.org> - 1.35-2.20190227cvs
 - Fix output in de_DE, fr_FR, hr_HR, ru_RU locales
 

From 83f591b36a43895a59873722201751e026456f73 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 27 Aug 2019 15:26:44 -0400
Subject: [PATCH 08/32] Upgrade to calendar(1) from OpenBSD 6.5 Correct
 translation filenames in Makefile.linux

---
 .gitignore                |  1 +
 Makefile.linux            |  2 +-
 calendar.spec             | 13 +++++++------
 export-calendar-source.sh |  2 +-
 sources                   |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ead00e..55156e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.28-20140613cvs.tar.gz
 /calendar-1.35-20180719cvs.tar.gz
 /calendar-1.35-20190227cvs.tar.gz
+/calendar-1.37-20190827cvs.tar.gz
diff --git a/Makefile.linux b/Makefile.linux
index 4a076fa..92854ef 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -8,7 +8,7 @@ CFLAGS  = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900
 
 SRCS    = calendar.c io.c day.c pesach.c ostern.c paskha.c
 OBJS    = $(SRCS:.c=.o)
-INTER   = de_DE.ISO_8859-1 hr_HR.ISO_8859-2 ru_RU.KOI8-R fr_FR.ISO8859-1
+INTER   = de_DE.UTF-8 hr_HR.UTF-8 ru_RU.UTF-8 fr_FR.UTF-8
 
 all: calendar
 
diff --git a/calendar.spec b/calendar.spec
index 2b9907e..60537dc 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20190227cvs
+%define alphatag 20190827cvs
 
 Summary: Reminder utility
 Name:    calendar
-Version: 1.35
-Release: 4.%{alphatag}%{?dist}
+Version: 1.37
+Release: 1.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,12 +53,13 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue Aug 27 2019 David Cantrell <dcantrell@redhat.com> - 1.37-1.20190827cvs
+- Upgrade to calendar(1) from OpenBSD 6.5
+- Correct translation filenames in Makefile.linux
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-4.20190227cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Wed Jul 17 2019 Dominique Corbex <dominique@corbex.org> - 1.35-2.20190227cvs
-- Fix output in de_DE, fr_FR, hr_HR, ru_RU locales
-
 * Thu Mar 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.35-2.20190227cvs
 - Fix downgradepath
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index d1c6b5f..2d8c762 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_6_4
+TAG=OPENBSD_6_5
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index 8e4eb29..58f44c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.35-20190227cvs.tar.gz) = cc51f558e82094fabe04a785d1ec796204e6c00f015f70cb6b9a248dc8337fb090ba45468ee4cca4303c23ff24c0ff58d0ffe656a871693fec7b9b6f82b09938
+SHA512 (calendar-1.37-20190827cvs.tar.gz) = 34976ba929f36cec606b3f78672f16efd22d5f066e6a03ca38d193ff9404afb5df4eae8c81e528ed8875e6fa4ca67652c7c3397f5a21bb3cf97d3fee92f2b149

From c3a71855b7fc66965434d84800251c237e1189a0 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 27 Aug 2019 15:35:26 -0400
Subject: [PATCH 09/32] Upgrade to calendar(1) from OpenBSD 6.5 Correct
 translation filenames in Makefile.linux

---
 ...5-linux.patch => calendar-1.37-linux.patch | 69 +++++++++----------
 calendar.spec                                 |  2 +-
 2 files changed, 35 insertions(+), 36 deletions(-)
 rename calendar-1.35-linux.patch => calendar-1.37-linux.patch (67%)

diff --git a/calendar-1.35-linux.patch b/calendar-1.37-linux.patch
similarity index 67%
rename from calendar-1.35-linux.patch
rename to calendar-1.37-linux.patch
index 7fcad94..d4cb38c 100644
--- a/calendar-1.35-linux.patch
+++ b/calendar-1.37-linux.patch
@@ -1,6 +1,6 @@
-diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/calendar.c
---- calendar-1.35-20190227cvs/calendar.c.orig	2015-12-07 13:46:35.000000000 -0500
-+++ calendar-1.35-20190227cvs/calendar.c	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/calendar.c
+--- calendar-1.37-20190827cvs/calendar.c.orig	2019-02-01 11:22:53.000000000 -0500
++++ calendar-1.37-20190827cvs/calendar.c	2019-08-27 15:30:04.978737297 -0400
 @@ -35,7 +35,6 @@
  #include <err.h>
  #include <errno.h>
@@ -21,7 +21,7 @@ diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/cal
 +				errx(1, "-A %s: %s", optarg, strerror(errno));
 +			else if (f_dayAfter < 0 || f_dayAfter > INT_MAX)
 +				errx(1, "-A %s: %s out of range", optarg);
- 			f_SetdayAfter = 1;
+ 			f_Setday = 1;
  			break;
  
  		case 'B': /* days before current date */
@@ -33,10 +33,10 @@ diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/cal
 +				errx(1, "-B %s: %s", optarg, strerror(errno));
 +			else if (f_dayBefore < 0 || f_dayBefore > INT_MAX)
 +				errx(1, "-B %s: %s out of range", optarg);
+ 			if (f_dayBefore != 0)
+ 				f_Setday = 1;
  			break;
- 
- 		case 'w':
-@@ -123,15 +126,6 @@ main(int argc, char *argv[])
+@@ -125,15 +128,6 @@ main(int argc, char *argv[])
  	if (argc)
  		usage();
  
@@ -52,7 +52,7 @@ diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/cal
  	/* use current time */
  	if (f_time <= 0)
  	    (void)time(&f_time);
-@@ -190,10 +184,6 @@ main(int argc, char *argv[])
+@@ -192,10 +186,6 @@ main(int argc, char *argv[])
  			case 0:	/* child */
  				(void)setpgid(getpid(), getpid());
  				(void)setlocale(LC_ALL, "");
@@ -63,9 +63,9 @@ diff -up calendar-1.35-20190227cvs/calendar.c.orig calendar-1.35-20190227cvs/cal
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
-diff -up calendar-1.35-20190227cvs/calendar.h.orig calendar-1.35-20190227cvs/calendar.h
---- calendar-1.35-20190227cvs/calendar.h.orig	2015-12-07 13:46:35.000000000 -0500
-+++ calendar-1.35-20190227cvs/calendar.h	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/calendar.h.orig calendar-1.37-20190827cvs/calendar.h
+--- calendar-1.37-20190827cvs/calendar.h.orig	2019-02-01 11:22:53.000000000 -0500
++++ calendar-1.37-20190827cvs/calendar.h	2019-08-27 15:30:52.457582474 -0400
 @@ -29,6 +29,7 @@
   * SUCH DAMAGE.
   */
@@ -74,7 +74,7 @@ diff -up calendar-1.35-20190227cvs/calendar.h.orig calendar-1.35-20190227cvs/cal
  
  extern struct passwd *pw;
  extern int doall;
-@@ -116,7 +117,7 @@ extern int f_SetdayAfter; /* calendar in
+@@ -116,7 +117,7 @@ extern int f_Setday;	/* calendar invoked
  
  /* calendars */
  extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
@@ -83,9 +83,9 @@ diff -up calendar-1.35-20190227cvs/calendar.h.orig calendar-1.35-20190227cvs/cal
  
  #define NUMEV 3	/* Total number of such special events */
  extern struct specialev spev[NUMEV];
-diff -up calendar-1.35-20190227cvs/day.c.orig calendar-1.35-20190227cvs/day.c
---- calendar-1.35-20190227cvs/day.c.orig	2016-09-14 11:09:46.000000000 -0400
-+++ calendar-1.35-20190227cvs/day.c	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
+--- calendar-1.37-20190827cvs/day.c.orig	2019-02-01 11:22:53.000000000 -0500
++++ calendar-1.37-20190827cvs/day.c	2019-08-27 15:32:21.138293294 -0400
 @@ -160,7 +160,7 @@ settime(time_t *now)
  	tp->tm_isdst = 0;
  	tp->tm_hour = 12;
@@ -103,7 +103,7 @@ diff -up calendar-1.35-20190227cvs/day.c.orig calendar-1.35-20190227cvs/day.c
 -		bodun = !arc4random_uniform(3);
 +	if (bodun && !bodun_always) {
 +		srandom(3);
-+		bodun = random();
++		bodum = random();
 +	}
  
  	/* Easter or Easter depending days */
@@ -126,9 +126,9 @@ diff -up calendar-1.35-20190227cvs/day.c.orig calendar-1.35-20190227cvs/day.c
  		cumdays = daytab[1];
  	else
  		cumdays = daytab[0];
-diff -up calendar-1.35-20190227cvs/io.c.orig calendar-1.35-20190227cvs/io.c
---- calendar-1.35-20190227cvs/io.c.orig	2017-09-25 15:13:56.000000000 -0400
-+++ calendar-1.35-20190227cvs/io.c	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/io.c.orig calendar-1.37-20190827cvs/io.c
+--- calendar-1.37-20190827cvs/io.c.orig	2019-01-29 17:28:30.000000000 -0500
++++ calendar-1.37-20190827cvs/io.c	2019-08-27 15:33:12.306126442 -0400
 @@ -67,7 +67,7 @@ void
  cal(void)
  {
@@ -138,22 +138,21 @@ diff -up calendar-1.35-20190227cvs/io.c.orig calendar-1.35-20190227cvs/io.c
  	char buf[2048 + 1], *prefix = NULL, *p;
  	struct match *m;
  	FILE *fp;
-@@ -282,8 +282,9 @@ getfield(char *p, char **endp, int *flag
+@@ -282,8 +282,8 @@ getfield(char *p, char **endp, int *flag
  			switch (*start) {
  			case '-':
  			case '+':
 -				var = strtonum(start + 1, 0, 365, &errstr);
 -				if (errstr)
 +				var = strtoll(start + 1, NULL, 10);
-+				if ((errno == ERANGE && (var == LLONG_MIN || var == LLONG_MAX)) ||
-+				    (var < 0 || var > 365))
++				if ((errno == ERANGE && (var == LLONG_MIN || var == LLONG_MAX)) || (var < 0 || var > 365))
  					return (0); /* Someone is just being silly */
  				if (*start == '-')
  					var = -var;
-diff -up calendar-1.35-20190227cvs/ostern.c.orig calendar-1.35-20190227cvs/ostern.c
---- calendar-1.35-20190227cvs/ostern.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20190227cvs/ostern.c	2019-02-27 15:02:36.384637931 -0500
-@@ -60,7 +60,7 @@ easter(int year)	/* 0 ... abcd, NOT sinc
+diff -up calendar-1.37-20190827cvs/ostern.c.orig calendar-1.37-20190827cvs/ostern.c
+--- calendar-1.37-20190827cvs/ostern.c.orig	2019-01-17 01:15:44.000000000 -0500
++++ calendar-1.37-20190827cvs/ostern.c	2019-08-27 15:33:24.378087076 -0400
+@@ -58,7 +58,7 @@ easter(int year)	/* 0 ... abcd, NOT sinc
  	e_p = e_p + 1;
  
  	e_q = 31 + 28 + e_p;
@@ -162,9 +161,9 @@ diff -up calendar-1.35-20190227cvs/ostern.c.orig calendar-1.35-20190227cvs/oster
  		e_q++;
  
  	if (e_n == 4)
-diff -up calendar-1.35-20190227cvs/paskha.c.orig calendar-1.35-20190227cvs/paskha.c
---- calendar-1.35-20190227cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20190227cvs/paskha.c	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/paskha.c.orig calendar-1.37-20190827cvs/paskha.c
+--- calendar-1.37-20190827cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.37-20190827cvs/paskha.c	2019-08-27 15:33:49.946003702 -0400
 @@ -27,6 +27,7 @@
   */
  
@@ -182,9 +181,9 @@ diff -up calendar-1.35-20190227cvs/paskha.c.orig calendar-1.35-20190227cvs/paskh
  		cumdays++;
  	return ((cumdays + 22) + (d + e) + 13);
  }
-diff -up calendar-1.35-20190227cvs/pathnames.h.orig calendar-1.35-20190227cvs/pathnames.h
---- calendar-1.35-20190227cvs/pathnames.h.orig	2014-07-30 12:46:17.000000000 -0400
-+++ calendar-1.35-20190227cvs/pathnames.h	2019-02-27 15:02:57.883547022 -0500
+diff -up calendar-1.37-20190827cvs/pathnames.h.orig calendar-1.37-20190827cvs/pathnames.h
+--- calendar-1.37-20190827cvs/pathnames.h.orig	2014-07-30 12:46:17.000000000 -0400
++++ calendar-1.37-20190827cvs/pathnames.h	2019-08-27 15:34:09.585939657 -0400
 @@ -33,7 +33,7 @@
  
  #include <paths.h>
@@ -194,9 +193,9 @@ diff -up calendar-1.35-20190227cvs/pathnames.h.orig calendar-1.35-20190227cvs/pa
  
  			/* XXX -- fix when cpp parses arguments rationally */
  #define	_PATH_INCLUDE	"-I/usr/share/calendar"
-diff -up calendar-1.35-20190227cvs/pesach.c.orig calendar-1.35-20190227cvs/pesach.c
---- calendar-1.35-20190227cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.35-20190227cvs/pesach.c	2019-02-27 15:02:36.384637931 -0500
+diff -up calendar-1.37-20190827cvs/pesach.c.orig calendar-1.37-20190827cvs/pesach.c
+--- calendar-1.37-20190827cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.37-20190827cvs/pesach.c	2019-08-27 15:34:32.905863614 -0400
 @@ -18,6 +18,7 @@
   */
  
diff --git a/calendar.spec b/calendar.spec
index 60537dc..be7287b 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -16,7 +16,7 @@ Source0: %{name}-%{version}-%{alphatag}.tar.gz
 Source1: Makefile.linux
 Source2: export-calendar-source.sh
 
-Patch0:  %{name}-1.35-linux.patch
+Patch0:  %{name}-1.37-linux.patch
 
 BuildRequires: gcc
 Requires: cpp

From b8f50333954bbb06de16cd57aaf7132226aed673 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 27 Aug 2019 15:51:23 -0400
Subject: [PATCH 10/32] Upgrade to calendar(1) from OpenBSD 6.5 Correct
 translation filenames in Makefile.linux

---
 calendar-1.37-linux.patch | 22 +++++++++++-----------
 calendar.spec             |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/calendar-1.37-linux.patch b/calendar-1.37-linux.patch
index d4cb38c..eb49d6d 100644
--- a/calendar-1.37-linux.patch
+++ b/calendar-1.37-linux.patch
@@ -1,6 +1,6 @@
 diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/calendar.c
 --- calendar-1.37-20190827cvs/calendar.c.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/calendar.c	2019-08-27 15:30:04.978737297 -0400
++++ calendar-1.37-20190827cvs/calendar.c	2019-08-27 15:50:25.766758389 -0400
 @@ -35,7 +35,6 @@
  #include <err.h>
  #include <errno.h>
@@ -20,7 +20,7 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
 +			if (errno == ERANGE && (f_dayAfter == LLONG_MIN || f_dayBefore == LLONG_MAX))
 +				errx(1, "-A %s: %s", optarg, strerror(errno));
 +			else if (f_dayAfter < 0 || f_dayAfter > INT_MAX)
-+				errx(1, "-A %s: %s out of range", optarg);
++				errx(1, "-A %s: %s out of range", optarg, strerror(errno));
  			f_Setday = 1;
  			break;
  
@@ -32,7 +32,7 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
 +			if (errno == ERANGE && (f_dayBefore == LLONG_MIN || f_dayBefore == LLONG_MAX))
 +				errx(1, "-B %s: %s", optarg, strerror(errno));
 +			else if (f_dayBefore < 0 || f_dayBefore > INT_MAX)
-+				errx(1, "-B %s: %s out of range", optarg);
++				errx(1, "-B %s: %s out of range", optarg, strerror(errno));
  			if (f_dayBefore != 0)
  				f_Setday = 1;
  			break;
@@ -65,7 +65,7 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
  					    stat(calendarFile, &sbuf) != 0 ||
 diff -up calendar-1.37-20190827cvs/calendar.h.orig calendar-1.37-20190827cvs/calendar.h
 --- calendar-1.37-20190827cvs/calendar.h.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/calendar.h	2019-08-27 15:30:52.457582474 -0400
++++ calendar-1.37-20190827cvs/calendar.h	2019-08-27 15:49:16.082984894 -0400
 @@ -29,6 +29,7 @@
   * SUCH DAMAGE.
   */
@@ -85,7 +85,7 @@ diff -up calendar-1.37-20190827cvs/calendar.h.orig calendar-1.37-20190827cvs/cal
  extern struct specialev spev[NUMEV];
 diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
 --- calendar-1.37-20190827cvs/day.c.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/day.c	2019-08-27 15:32:21.138293294 -0400
++++ calendar-1.37-20190827cvs/day.c	2019-08-27 15:49:31.774933887 -0400
 @@ -160,7 +160,7 @@ settime(time_t *now)
  	tp->tm_isdst = 0;
  	tp->tm_hour = 12;
@@ -103,7 +103,7 @@ diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
 -		bodun = !arc4random_uniform(3);
 +	if (bodun && !bodun_always) {
 +		srandom(3);
-+		bodum = random();
++		bodun = random();
 +	}
  
  	/* Easter or Easter depending days */
@@ -128,7 +128,7 @@ diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
  		cumdays = daytab[0];
 diff -up calendar-1.37-20190827cvs/io.c.orig calendar-1.37-20190827cvs/io.c
 --- calendar-1.37-20190827cvs/io.c.orig	2019-01-29 17:28:30.000000000 -0500
-+++ calendar-1.37-20190827cvs/io.c	2019-08-27 15:33:12.306126442 -0400
++++ calendar-1.37-20190827cvs/io.c	2019-08-27 15:50:56.117659733 -0400
 @@ -67,7 +67,7 @@ void
  cal(void)
  {
@@ -151,7 +151,7 @@ diff -up calendar-1.37-20190827cvs/io.c.orig calendar-1.37-20190827cvs/io.c
  					var = -var;
 diff -up calendar-1.37-20190827cvs/ostern.c.orig calendar-1.37-20190827cvs/ostern.c
 --- calendar-1.37-20190827cvs/ostern.c.orig	2019-01-17 01:15:44.000000000 -0500
-+++ calendar-1.37-20190827cvs/ostern.c	2019-08-27 15:33:24.378087076 -0400
++++ calendar-1.37-20190827cvs/ostern.c	2019-08-27 15:49:16.082984894 -0400
 @@ -58,7 +58,7 @@ easter(int year)	/* 0 ... abcd, NOT sinc
  	e_p = e_p + 1;
  
@@ -163,7 +163,7 @@ diff -up calendar-1.37-20190827cvs/ostern.c.orig calendar-1.37-20190827cvs/oster
  	if (e_n == 4)
 diff -up calendar-1.37-20190827cvs/paskha.c.orig calendar-1.37-20190827cvs/paskha.c
 --- calendar-1.37-20190827cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.37-20190827cvs/paskha.c	2019-08-27 15:33:49.946003702 -0400
++++ calendar-1.37-20190827cvs/paskha.c	2019-08-27 15:49:16.082984894 -0400
 @@ -27,6 +27,7 @@
   */
  
@@ -183,7 +183,7 @@ diff -up calendar-1.37-20190827cvs/paskha.c.orig calendar-1.37-20190827cvs/paskh
  }
 diff -up calendar-1.37-20190827cvs/pathnames.h.orig calendar-1.37-20190827cvs/pathnames.h
 --- calendar-1.37-20190827cvs/pathnames.h.orig	2014-07-30 12:46:17.000000000 -0400
-+++ calendar-1.37-20190827cvs/pathnames.h	2019-08-27 15:34:09.585939657 -0400
++++ calendar-1.37-20190827cvs/pathnames.h	2019-08-27 15:49:16.082984894 -0400
 @@ -33,7 +33,7 @@
  
  #include <paths.h>
@@ -195,7 +195,7 @@ diff -up calendar-1.37-20190827cvs/pathnames.h.orig calendar-1.37-20190827cvs/pa
  #define	_PATH_INCLUDE	"-I/usr/share/calendar"
 diff -up calendar-1.37-20190827cvs/pesach.c.orig calendar-1.37-20190827cvs/pesach.c
 --- calendar-1.37-20190827cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.37-20190827cvs/pesach.c	2019-08-27 15:34:32.905863614 -0400
++++ calendar-1.37-20190827cvs/pesach.c	2019-08-27 15:49:16.083984890 -0400
 @@ -18,6 +18,7 @@
   */
  
diff --git a/calendar.spec b/calendar.spec
index be7287b..fdf1786 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -30,7 +30,7 @@ week.
 
 %prep
 %setup -q -n %{name}-%{version}-%{alphatag}
-%patch0 -p1
+%patch0 -p1 -b .orig
 cp %{SOURCE1} Makefile
 
 for c in calendars/*.*/* ; do

From 008d3899226bbd55d4623faff5e5f500197bb372 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 13:35:34 +0000
Subject: [PATCH 11/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index fdf1786..f7cd501 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20190827cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Aug 27 2019 David Cantrell <dcantrell@redhat.com> - 1.37-1.20190827cvs
 - Upgrade to calendar(1) from OpenBSD 6.5
 - Correct translation filenames in Makefile.linux

From fa93c9a986b44956aa3f30dcf0473e2a6a7f5098 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Thu, 30 Apr 2020 11:18:46 -0400
Subject: [PATCH 12/32] Upgrade to calendar(1) from OpenBSD 6.6 Include missing
 calendar data files (#1809218)

Signed-off-by: David Cantrell <dcantrell@redhat.com>
---
 .gitignore                | 1 +
 calendar.spec             | 8 ++++++--
 export-calendar-source.sh | 2 +-
 sources                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55156e2..4fa6455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.35-20180719cvs.tar.gz
 /calendar-1.35-20190227cvs.tar.gz
 /calendar-1.37-20190827cvs.tar.gz
+/calendar-1.37-20200430cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index f7cd501..01e5b93 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20190827cvs
+%define alphatag 20200430cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 2.%{alphatag}%{?dist}
+Release: 1.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,10 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 30 2020 David Cantrell <dcantrell@redhat.com> - 1.37-1.20200430cvs
+- Upgrade to calendar(1) from OpenBSD 6.6
+- Include missing calendar data files (#1809218)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20190827cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index 2d8c762..e635975 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_6_5
+TAG=OPENBSD_6_6
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index 58f44c8..0538e3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20190827cvs.tar.gz) = 34976ba929f36cec606b3f78672f16efd22d5f066e6a03ca38d193ff9404afb5df4eae8c81e528ed8875e6fa4ca67652c7c3397f5a21bb3cf97d3fee92f2b149
+SHA512 (calendar-1.37-20200430cvs.tar.gz) = 3589eb08fb07aa56eb68d3b4f30b89c1edaf058ffd05c1310d676428ebf40788f1a64f8e9d7a05bc5c44200bd24a7e07c73c466bd62bfaa68b42ef8fb8e47a12

From d7023a6df215ae34494e94d2ce97ae95e6d66061 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 13:37:31 +0000
Subject: [PATCH 13/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 01e5b93..1b6f505 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20200430cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Apr 30 2020 David Cantrell <dcantrell@redhat.com> - 1.37-1.20200430cvs
 - Upgrade to calendar(1) from OpenBSD 6.6
 - Include missing calendar data files (#1809218)

From 0877276ab7ac7470d3da1e515c9564fe785e4d1b Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 17 Dec 2020 03:18:09 +0000
Subject: [PATCH 14/32] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 calendar.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/calendar.spec b/calendar.spec
index 1b6f505..61605e1 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -19,6 +19,7 @@ Source2: export-calendar-source.sh
 Patch0:  %{name}-1.37-linux.patch
 
 BuildRequires: gcc
+BuildRequires: make
 Requires: cpp
 
 %description

From e0ffa3a6eb560c536be35696634a1a50c56f4a3d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 01:37:31 +0000
Subject: [PATCH 15/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 61605e1..e9dda61 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 2.%{alphatag}%{?dist}
+Release: 3.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3.20200430cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20200430cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From e27aaf983821175ff790275029e4b5962d198cbd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 14:09:24 +0000
Subject: [PATCH 16/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 59ba3ba13bcad60ee9492c5f57abf4d4e518209b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 19:06:50 +0000
Subject: [PATCH 17/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index e9dda61..20156f8 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 3.%{alphatag}%{?dist}
+Release: 4.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-4.20200430cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3.20200430cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 3a67d1b4eea095be90b170a389c7987e6ca6bdf3 Mon Sep 17 00:00:00 2001
From: David Cantrell <david.l.cantrell@gmail.com>
Date: Mon, 20 Dec 2021 10:59:58 -0500
Subject: [PATCH 18/32] Upgrade to calendar(1) from OpenBSD 7.0

Signed-off-by: David Cantrell <david.l.cantrell@gmail.com>
---
 .gitignore                | 1 +
 calendar.spec             | 7 +++++--
 export-calendar-source.sh | 4 ++--
 sources                   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fa6455..fc06188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.35-20190227cvs.tar.gz
 /calendar-1.37-20190827cvs.tar.gz
 /calendar-1.37-20200430cvs.tar.gz
+/calendar-1.37-20211220cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index 20156f8..69974ad 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20200430cvs
+%define alphatag 20211220cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 4.%{alphatag}%{?dist}
+Release: 5.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Mon Dec 20 2021 David Cantrell <dcantrell@redhat.com> - 1.37-20211220cvs
+- Upgrade to calendar(1) from OpenBSD 7.0
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-4.20200430cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index e635975..fc92b8b 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_6_6
+TAG=OPENBSD_7_0
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
 rm -rf calendar calendar-${VER}
 mkdir calendar
-cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs co \
+cvs -d anoncvs@anoncvs.usa.openbsd.org:/cvs co \
     -d calendar -r ${TAG} src/usr.bin/calendar
 cd calendar
 VER="$(cvs status calendar.c | grep 'Working revision:' | awk '{ print $3; }')"
diff --git a/sources b/sources
index 0538e3e..4859e30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20200430cvs.tar.gz) = 3589eb08fb07aa56eb68d3b4f30b89c1edaf058ffd05c1310d676428ebf40788f1a64f8e9d7a05bc5c44200bd24a7e07c73c466bd62bfaa68b42ef8fb8e47a12
+SHA512 (calendar-1.37-20211220cvs.tar.gz) = ed1be6c1af2e4c9ae87f4bc02f73605663d42fd9b99ebdf9176e70bdc7e1c1bc1208661bafd341650c0a915f3546ca02f9ed3b46b6c2fe9c80d8a9e336b7d3e5

From c6c2691faf751a0e21f89f1563be0671b3ec4582 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 22:51:14 +0000
Subject: [PATCH 19/32] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 69974ad..a1f2100 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 5.%{alphatag}%{?dist}
+Release: 6.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-6.20211220cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Dec 20 2021 David Cantrell <dcantrell@redhat.com> - 1.37-20211220cvs
 - Upgrade to calendar(1) from OpenBSD 7.0
 

From 1b0701f233936ea6f651dcfd148e373e8e4c3738 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 22:31:58 +0000
Subject: [PATCH 20/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index a1f2100..8472efb 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 6.%{alphatag}%{?dist}
+Release: 7.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-7.20211220cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-6.20211220cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From bd0533188e478249846a49da44d80d9eba325b6c Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 15 Nov 2022 14:52:10 -0500
Subject: [PATCH 21/32] Upgrade to calendar(1) from OpenBSD 7.2

Use SPDX license expression in the License tag

Signed-off-by: David Cantrell <dcantrell@redhat.com>
---
 .gitignore                |  1 +
 calendar-1.37-linux.patch | 58 +++++++++++++++++++--------------------
 calendar.spec             | 10 +++++--
 export-calendar-source.sh |  2 +-
 sources                   |  2 +-
 5 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc06188..f103589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.37-20190827cvs.tar.gz
 /calendar-1.37-20200430cvs.tar.gz
 /calendar-1.37-20211220cvs.tar.gz
+/calendar-1.37-20221115cvs.tar.gz
diff --git a/calendar-1.37-linux.patch b/calendar-1.37-linux.patch
index eb49d6d..4154d5d 100644
--- a/calendar-1.37-linux.patch
+++ b/calendar-1.37-linux.patch
@@ -1,6 +1,6 @@
-diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/calendar.c
---- calendar-1.37-20190827cvs/calendar.c.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/calendar.c	2019-08-27 15:50:25.766758389 -0400
+diff -up calendar-1.37-20221115cvs/calendar.c.orig calendar-1.37-20221115cvs/calendar.c
+--- calendar-1.37-20221115cvs/calendar.c.orig	2019-02-01 11:22:53.000000000 -0500
++++ calendar-1.37-20221115cvs/calendar.c	2022-11-15 14:33:05.908157513 -0500
 @@ -35,7 +35,6 @@
  #include <err.h>
  #include <errno.h>
@@ -20,7 +20,7 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
 +			if (errno == ERANGE && (f_dayAfter == LLONG_MIN || f_dayBefore == LLONG_MAX))
 +				errx(1, "-A %s: %s", optarg, strerror(errno));
 +			else if (f_dayAfter < 0 || f_dayAfter > INT_MAX)
-+				errx(1, "-A %s: %s out of range", optarg, strerror(errno));
++				errx(1, "-A %s: %s out of range", optarg, optarg);
  			f_Setday = 1;
  			break;
  
@@ -32,7 +32,7 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
 +			if (errno == ERANGE && (f_dayBefore == LLONG_MIN || f_dayBefore == LLONG_MAX))
 +				errx(1, "-B %s: %s", optarg, strerror(errno));
 +			else if (f_dayBefore < 0 || f_dayBefore > INT_MAX)
-+				errx(1, "-B %s: %s out of range", optarg, strerror(errno));
++				errx(1, "-B %s: %s out of range", optarg, optarg);
  			if (f_dayBefore != 0)
  				f_Setday = 1;
  			break;
@@ -63,9 +63,9 @@ diff -up calendar-1.37-20190827cvs/calendar.c.orig calendar-1.37-20190827cvs/cal
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
-diff -up calendar-1.37-20190827cvs/calendar.h.orig calendar-1.37-20190827cvs/calendar.h
---- calendar-1.37-20190827cvs/calendar.h.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/calendar.h	2019-08-27 15:49:16.082984894 -0400
+diff -up calendar-1.37-20221115cvs/calendar.h.orig calendar-1.37-20221115cvs/calendar.h
+--- calendar-1.37-20221115cvs/calendar.h.orig	2019-02-01 11:22:53.000000000 -0500
++++ calendar-1.37-20221115cvs/calendar.h	2022-11-15 14:33:44.201071607 -0500
 @@ -29,6 +29,7 @@
   * SUCH DAMAGE.
   */
@@ -83,9 +83,9 @@ diff -up calendar-1.37-20190827cvs/calendar.h.orig calendar-1.37-20190827cvs/cal
  
  #define NUMEV 3	/* Total number of such special events */
  extern struct specialev spev[NUMEV];
-diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
---- calendar-1.37-20190827cvs/day.c.orig	2019-02-01 11:22:53.000000000 -0500
-+++ calendar-1.37-20190827cvs/day.c	2019-08-27 15:49:31.774933887 -0400
+diff -up calendar-1.37-20221115cvs/day.c.orig calendar-1.37-20221115cvs/day.c
+--- calendar-1.37-20221115cvs/day.c.orig	2019-08-12 16:03:28.000000000 -0400
++++ calendar-1.37-20221115cvs/day.c	2022-11-15 14:35:03.925892751 -0500
 @@ -160,7 +160,7 @@ settime(time_t *now)
  	tp->tm_isdst = 0;
  	tp->tm_hour = 12;
@@ -108,7 +108,7 @@ diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
  
  	/* Easter or Easter depending days */
  	if (flags & F_SPECIAL)
-@@ -440,7 +442,7 @@ isnow(char *endp, int bodun)
+@@ -444,7 +446,7 @@ isnow(char *endp, int bodun)
  			}
  			v2 = day - tp->tm_yday;
  			if ((v2 > v1) || (v2 < 0)) {
@@ -117,7 +117,7 @@ diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
  				    <= v1)
  					tmtmp.tm_year++;
  				else if(!bodun || (day - tp->tm_yday) != -1)
-@@ -670,7 +672,7 @@ variable_weekday(int *day, int month, in
+@@ -674,7 +676,7 @@ variable_weekday(int *day, int month, in
  	int *cumdays;
  	int day1;
  
@@ -126,9 +126,9 @@ diff -up calendar-1.37-20190827cvs/day.c.orig calendar-1.37-20190827cvs/day.c
  		cumdays = daytab[1];
  	else
  		cumdays = daytab[0];
-diff -up calendar-1.37-20190827cvs/io.c.orig calendar-1.37-20190827cvs/io.c
---- calendar-1.37-20190827cvs/io.c.orig	2019-01-29 17:28:30.000000000 -0500
-+++ calendar-1.37-20190827cvs/io.c	2019-08-27 15:50:56.117659733 -0400
+diff -up calendar-1.37-20221115cvs/io.c.orig calendar-1.37-20221115cvs/io.c
+--- calendar-1.37-20221115cvs/io.c.orig	2021-12-07 09:00:33.000000000 -0500
++++ calendar-1.37-20221115cvs/io.c	2022-11-15 14:36:05.933753650 -0500
 @@ -67,7 +67,7 @@ void
  cal(void)
  {
@@ -149,9 +149,9 @@ diff -up calendar-1.37-20190827cvs/io.c.orig calendar-1.37-20190827cvs/io.c
  					return (0); /* Someone is just being silly */
  				if (*start == '-')
  					var = -var;
-diff -up calendar-1.37-20190827cvs/ostern.c.orig calendar-1.37-20190827cvs/ostern.c
---- calendar-1.37-20190827cvs/ostern.c.orig	2019-01-17 01:15:44.000000000 -0500
-+++ calendar-1.37-20190827cvs/ostern.c	2019-08-27 15:49:16.082984894 -0400
+diff -up calendar-1.37-20221115cvs/ostern.c.orig calendar-1.37-20221115cvs/ostern.c
+--- calendar-1.37-20221115cvs/ostern.c.orig	2019-01-17 01:15:44.000000000 -0500
++++ calendar-1.37-20221115cvs/ostern.c	2022-11-15 14:36:20.564720831 -0500
 @@ -58,7 +58,7 @@ easter(int year)	/* 0 ... abcd, NOT sinc
  	e_p = e_p + 1;
  
@@ -161,9 +161,9 @@ diff -up calendar-1.37-20190827cvs/ostern.c.orig calendar-1.37-20190827cvs/oster
  		e_q++;
  
  	if (e_n == 4)
-diff -up calendar-1.37-20190827cvs/paskha.c.orig calendar-1.37-20190827cvs/paskha.c
---- calendar-1.37-20190827cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.37-20190827cvs/paskha.c	2019-08-27 15:49:16.082984894 -0400
+diff -up calendar-1.37-20221115cvs/paskha.c.orig calendar-1.37-20221115cvs/paskha.c
+--- calendar-1.37-20221115cvs/paskha.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.37-20221115cvs/paskha.c	2022-11-15 14:36:48.138658978 -0500
 @@ -27,6 +27,7 @@
   */
  
@@ -181,21 +181,21 @@ diff -up calendar-1.37-20190827cvs/paskha.c.orig calendar-1.37-20190827cvs/paskh
  		cumdays++;
  	return ((cumdays + 22) + (d + e) + 13);
  }
-diff -up calendar-1.37-20190827cvs/pathnames.h.orig calendar-1.37-20190827cvs/pathnames.h
---- calendar-1.37-20190827cvs/pathnames.h.orig	2014-07-30 12:46:17.000000000 -0400
-+++ calendar-1.37-20190827cvs/pathnames.h	2019-08-27 15:49:16.082984894 -0400
+diff -up calendar-1.37-20221115cvs/pathnames.h.orig calendar-1.37-20221115cvs/pathnames.h
+--- calendar-1.37-20221115cvs/pathnames.h.orig	2021-12-07 09:00:33.000000000 -0500
++++ calendar-1.37-20221115cvs/pathnames.h	2022-11-15 14:37:06.633617492 -0500
 @@ -33,7 +33,7 @@
  
  #include <paths.h>
  
--#define	_PATH_CPP	"/usr/libexec/tradcpp"
+-#define	_PATH_CPP	"/usr/libexec/cpp"
 +#define	_PATH_CPP	"/usr/bin/cpp"
  
  			/* XXX -- fix when cpp parses arguments rationally */
  #define	_PATH_INCLUDE	"-I/usr/share/calendar"
-diff -up calendar-1.37-20190827cvs/pesach.c.orig calendar-1.37-20190827cvs/pesach.c
---- calendar-1.37-20190827cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
-+++ calendar-1.37-20190827cvs/pesach.c	2019-08-27 15:49:16.083984890 -0400
+diff -up calendar-1.37-20221115cvs/pesach.c.orig calendar-1.37-20221115cvs/pesach.c
+--- calendar-1.37-20221115cvs/pesach.c.orig	2015-03-14 20:41:28.000000000 -0400
++++ calendar-1.37-20221115cvs/pesach.c	2022-11-15 14:37:31.728561201 -0500
 @@ -18,6 +18,7 @@
   */
  
diff --git a/calendar.spec b/calendar.spec
index 8472efb..e5fb519 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,10 +1,10 @@
-%define alphatag 20211220cvs
+%define alphatag 20221115cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 7.%{alphatag}%{?dist}
-License: BSD
+Release: 1.%{alphatag}%{?dist}
+License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
 # The source archive is generated with the export-calendar-source.sh
@@ -54,6 +54,10 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue Nov 15 2022 David Cantrell <dcantrell@redhat.com> - 1.37-20221115cvs
+- Upgrade to calendar(1) from OpenBSD 7.2
+- Use SPDX license expression in the License tag
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-7.20211220cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index fc92b8b..e6e6897 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_7_0
+TAG=OPENBSD_7_2
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index 4859e30..e5e3b69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20211220cvs.tar.gz) = ed1be6c1af2e4c9ae87f4bc02f73605663d42fd9b99ebdf9176e70bdc7e1c1bc1208661bafd341650c0a915f3546ca02f9ed3b46b6c2fe9c80d8a9e336b7d3e5
+SHA512 (calendar-1.37-20221115cvs.tar.gz) = a8f8df6d28395e0d4e7e773a85d1ca08008be9969bd95a2be253a5dc22619c1ad5c15e7a9fe841b8f49da27ecd97c1c395ae753503c18ad419ebd78f7eac9d4d

From f5ce23d2ae622ec494ac0d9d435f811bdc7b4aef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 23:27:05 +0000
Subject: [PATCH 22/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index e5fb519..3126394 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20221115cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Nov 15 2022 David Cantrell <dcantrell@redhat.com> - 1.37-20221115cvs
 - Upgrade to calendar(1) from OpenBSD 7.2
 - Use SPDX license expression in the License tag

From ede8e3ab78349ff621db9bc9ab4ee9fd6c1efc65 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 15:12:00 +0000
Subject: [PATCH 23/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 3126394..e472fc4 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 2.%{alphatag}%{?dist}
+Release: 3.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3.20221115cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20221115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 657a0071184eb22f5efe96c2034aa6f8a4c8638d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 15:00:18 +0000
Subject: [PATCH 24/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index e472fc4..b9be047 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 3.%{alphatag}%{?dist}
+Release: 4.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-4.20221115cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3.20221115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 03886615a76d71701c096806c8d9cff8a8dd7cd9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 23 Jan 2024 01:09:22 +0000
Subject: [PATCH 25/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index b9be047..da7b2a1 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 4.%{alphatag}%{?dist}
+Release: 5.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-5.20221115cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-4.20221115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 0327816edb5dbad006cf7c069a811e6a4a7c3483 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@burdell.org>
Date: Fri, 9 Feb 2024 11:05:00 -0500
Subject: [PATCH 26/32] Upgrade to calendar(1) from OpenBSD 7.4

Use non-deprecated syntax for the %patch macro

Signed-off-by: David Cantrell <dcantrell@burdell.org>
---
 .gitignore                |  1 +
 calendar.spec             | 10 +++++++---
 export-calendar-source.sh |  2 +-
 sources                   |  2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f103589..7b04320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.37-20200430cvs.tar.gz
 /calendar-1.37-20211220cvs.tar.gz
 /calendar-1.37-20221115cvs.tar.gz
+/calendar-1.37-20240209cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index da7b2a1..976ab34 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20221115cvs
+%define alphatag 20240209cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 5.%{alphatag}%{?dist}
+Release: 6.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -31,7 +31,7 @@ week.
 
 %prep
 %setup -q -n %{name}-%{version}-%{alphatag}
-%patch0 -p1 -b .orig
+%patch -P 0 -p1 -b .orig
 cp %{SOURCE1} Makefile
 
 for c in calendars/*.*/* ; do
@@ -54,6 +54,10 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Fri Feb 09 2024 David Cantrell <dcantrell@redhat.com> - 1.37-6.20240209cvs
+- Upgrade to calendar(1) from OpenBSD 7.4
+- Use non-deprecated syntax for the %%patch macro
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-5.20221115cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index e6e6897..c4bc056 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_7_2
+TAG=OPENBSD_7_4
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index e5e3b69..314c394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20221115cvs.tar.gz) = a8f8df6d28395e0d4e7e773a85d1ca08008be9969bd95a2be253a5dc22619c1ad5c15e7a9fe841b8f49da27ecd97c1c395ae753503c18ad419ebd78f7eac9d4d
+SHA512 (calendar-1.37-20240209cvs.tar.gz) = 2e9be9d79b9b05ecc50ebc125ad942ea2fa0a4d850b9ebe585147fc06a1eba93b02636b6e48667f84c6f79178f8078d4c8b2693a739a48009308e41c81d70551

From 1e26f175fb943ad62243152e05177b57abb56374 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Thu, 28 Mar 2024 16:11:42 +0000
Subject: [PATCH 27/32] Bump release to -7 to stay newer than Fedora 37 package

Signed-off-by: Evan Goode <mail@evangoo.de>
---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 976ab34..0799625 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 6.%{alphatag}%{?dist}
+Release: 7.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Thu Mar 28 2024 Evan Goode <egoode@redhat.com> - 1.37-7.20240209cvs
+- Bump release to stay newer than Fedora 37 package
+
 * Fri Feb 09 2024 David Cantrell <dcantrell@redhat.com> - 1.37-6.20240209cvs
 - Upgrade to calendar(1) from OpenBSD 7.4
 - Use non-deprecated syntax for the %%patch macro

From 8bacc1c6f0b207a75520eb00ffb8451b174fe6fd Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@burdell.org>
Date: Tue, 28 May 2024 12:25:40 -0400
Subject: [PATCH 28/32] Upgrade to calendar(1) from OpenBSD 7.5

Signed-off-by: David Cantrell <dcantrell@burdell.org>
---
 .gitignore                |  1 +
 calendar.spec             | 14 ++++++++------
 export-calendar-source.sh | 20 +++++++++++++++++---
 sources                   |  2 +-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b04320..7bfbbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.37-20211220cvs.tar.gz
 /calendar-1.37-20221115cvs.tar.gz
 /calendar-1.37-20240209cvs.tar.gz
+/calendar-1.37-20240528cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index 0799625..1e5e976 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20240209cvs
+%define alphatag 20240528cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 7.%{alphatag}%{?dist}
+Release: 8.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -30,8 +30,7 @@ tomorrow's.  The output of the command shows upcoming events for the
 week.
 
 %prep
-%setup -q -n %{name}-%{version}-%{alphatag}
-%patch -P 0 -p1 -b .orig
+%autosetup -n %{name}-%{version}-%{alphatag}
 cp %{SOURCE1} Makefile
 
 for c in calendars/*.*/* ; do
@@ -43,10 +42,10 @@ for c in calendars/*.*/* ; do
 done
 
 %build
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 %files
 %attr(755,root,root) %{_bindir}/calendar
@@ -54,6 +53,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Tue May 28 2024 David Cantrell <dcantrell@redhat.com> - 1.37-8.20240528cvs
+- Upgrade to calendar(1) from OpenBSD 7.5
+
 * Thu Mar 28 2024 Evan Goode <egoode@redhat.com> - 1.37-7.20240209cvs
 - Bump release to stay newer than Fedora 37 package
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index c4bc056..cd583a2 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,19 +1,33 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_7_4
+TAG=OPENBSD_7_5
+SERVER=anoncvs4.usa.openbsd.org
 
+PATH=/usr/bin
 CWD=$(pwd)
+
+if ! grep "${SERVER}" ~/.ssh/config ; then
+    echo "*** Configuration block for ${SERVER} not found in ~/.ssh/config" >&2
+    echo "*** Make sure this block exists in ~/.ssh/config:" >&2
+    echo >&2
+    echo "Host ${SERVER}" >&2
+    echo "    Port 2022" >&2
+    exit 1
+fi
+
 CVS_RSH=ssh ; export CVS_RSH
+
 rm -rf calendar calendar-${VER}
 mkdir calendar
-cvs -d anoncvs@anoncvs.usa.openbsd.org:/cvs co \
-    -d calendar -r ${TAG} src/usr.bin/calendar
+cvs -d :ext:anoncvs@${SERVER}:/cvs co -d calendar -r ${TAG} src/usr.bin/calendar
+
 cd calendar
 VER="$(cvs status calendar.c | grep 'Working revision:' | awk '{ print $3; }')"
 SNAPSHOT="$(date +%Y%m%d)cvs"
 cd ..
 find calendar -type d -name CVS | xargs rm -rf
+
 mv calendar calendar-${VER}-${SNAPSHOT}
 tar -cvf - calendar-${VER}-${SNAPSHOT} | gzip -9c > calendar-${VER}-${SNAPSHOT}.tar.gz
 rm -rf calendar-${VER}-${SNAPSHOT}
diff --git a/sources b/sources
index 314c394..328cc2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20240209cvs.tar.gz) = 2e9be9d79b9b05ecc50ebc125ad942ea2fa0a4d850b9ebe585147fc06a1eba93b02636b6e48667f84c6f79178f8078d4c8b2693a739a48009308e41c81d70551
+SHA512 (calendar-1.37-20240528cvs.tar.gz) = a38d0d71c6645bb141291d989dc69b6e74c8d561f760004bb97713a8b6a5c8bb26bf71b040cdf70602a7dcdc2b95b53609a552981c125dc843343feb3cbde34a

From df2eae7e4e38dbbad61d5b3c93f28b9977221019 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 18:54:04 +0000
Subject: [PATCH 29/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 1e5e976..b2b0acb 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 8.%{alphatag}%{?dist}
+Release: 9.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ done
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-9.20240528cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue May 28 2024 David Cantrell <dcantrell@redhat.com> - 1.37-8.20240528cvs
 - Upgrade to calendar(1) from OpenBSD 7.5
 

From 8f27d6726971727c950d61eae5ba998d2994cc21 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 13:14:23 +0000
Subject: [PATCH 30/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index b2b0acb..cca5504 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 9.%{alphatag}%{?dist}
+Release: 10.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ done
 %{_datadir}/calendar
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-10.20240528cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-9.20240528cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From ccd217463b281324ad1964dc537ea238042840f2 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@burdell.org>
Date: Mon, 3 Mar 2025 10:53:25 -0500
Subject: [PATCH 31/32] Upgrade to calendar(1) from OpenBSD 7.6

Signed-off-by: David Cantrell <dcantrell@burdell.org>
---
 .gitignore                | 1 +
 calendar.spec             | 7 +++++--
 export-calendar-source.sh | 2 +-
 sources                   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bfbbd3..469c469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.37-20221115cvs.tar.gz
 /calendar-1.37-20240209cvs.tar.gz
 /calendar-1.37-20240528cvs.tar.gz
+/calendar-1.37-20250303cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index cca5504..128a138 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20240528cvs
+%define alphatag 20250303cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 10.%{alphatag}%{?dist}
+Release: 11.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ done
 %{_datadir}/calendar
 
 %changelog
+* Mon Mar 03 2025 David Cantrell <dcantrell@redhat.com> - 1.37-11.20250303cvs
+- Upgrade to calendar(1) from OpenBSD 7.6
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-10.20240528cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index cd583a2..5f51484 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_7_5
+TAG=OPENBSD_7_6
 SERVER=anoncvs4.usa.openbsd.org
 
 PATH=/usr/bin
diff --git a/sources b/sources
index 328cc2a..8d59208 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20240528cvs.tar.gz) = a38d0d71c6645bb141291d989dc69b6e74c8d561f760004bb97713a8b6a5c8bb26bf71b040cdf70602a7dcdc2b95b53609a552981c125dc843343feb3cbde34a
+SHA512 (calendar-1.37-20250303cvs.tar.gz) = e5f15b6c4efc11ee6c7041535ba5e8f2d0cc3ed22a3944bf2f499fabcfae9ae45290b59a564641bf0355fa402674890694054790a9ee64304a8214752b6b4edf

From a0ce0d4ff51a584dbe40ea6bf8b3147a8d79c79c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 18:03:46 +0000
Subject: [PATCH 32/32] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 calendar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calendar.spec b/calendar.spec
index 128a138..21bcc2e 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -3,7 +3,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 11.%{alphatag}%{?dist}
+Release: 12.%{alphatag}%{?dist}
 License: BSD-3-Clause AND BSD-2-Clause AND ISC
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,9 @@ done
 %{_datadir}/calendar
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-12.20250303cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Mon Mar 03 2025 David Cantrell <dcantrell@redhat.com> - 1.37-11.20250303cvs
 - Upgrade to calendar(1) from OpenBSD 7.6