.gitignore

@@ -4,8 +4,3 @@ 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
-/calendar-1.37-20221115cvs.tar.gz
-/calendar-1.37-20240209cvs.tar.gz
-/calendar-1.37-20240528cvs.tar.gz
-/calendar-1.37-20250303cvs.tar.gz

calendar-1.37-linux.patch

@@ -1,6 +1,6 @@
-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
+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
 @@ -35,7 +35,6 @@
  #include <err.h>
  #include <errno.h>
@@ -20,7 +20,7 @@ diff -up calendar-1.37-20221115cvs/calendar.c.orig calendar-1.37-20221115cvs/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, 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-20221115cvs/calendar.c.orig calendar-1.37-20221115cvs/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, optarg);
++				errx(1, "-B %s: %s out of range", optarg, strerror(errno));
  			if (f_dayBefore != 0)
  				f_Setday = 1;
  			break;
@@ -63,9 +63,9 @@ diff -up calendar-1.37-20221115cvs/calendar.c.orig calendar-1.37-20221115cvs/cal
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
-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
+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
 @@ -29,6 +29,7 @@
   * SUCH DAMAGE.
   */
@@ -83,9 +83,9 @@ diff -up calendar-1.37-20221115cvs/calendar.h.orig calendar-1.37-20221115cvs/cal
  
  #define NUMEV 3	/* Total number of such special events */
  extern struct specialev spev[NUMEV];
-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
+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
 @@ -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-20221115cvs/day.c.orig calendar-1.37-20221115cvs/day.c
  
  	/* Easter or Easter depending days */
  	if (flags & F_SPECIAL)
-@@ -444,7 +446,7 @@ isnow(char *endp, int bodun)
+@@ -440,7 +442,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-20221115cvs/day.c.orig calendar-1.37-20221115cvs/day.c
  				    <= v1)
  					tmtmp.tm_year++;
  				else if(!bodun || (day - tp->tm_yday) != -1)
-@@ -674,7 +676,7 @@ variable_weekday(int *day, int month, in
+@@ -670,7 +672,7 @@ variable_weekday(int *day, int month, in
  	int *cumdays;
  	int day1;
  
@@ -126,9 +126,9 @@ diff -up calendar-1.37-20221115cvs/day.c.orig calendar-1.37-20221115cvs/day.c
  		cumdays = daytab[1];
  	else
  		cumdays = daytab[0];
-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
+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
 @@ -67,7 +67,7 @@ void
  cal(void)
  {
@@ -149,9 +149,9 @@ diff -up calendar-1.37-20221115cvs/io.c.orig calendar-1.37-20221115cvs/io.c
  					return (0); /* Someone is just being silly */
  				if (*start == '-')
  					var = -var;
-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
+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
 @@ -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-20221115cvs/ostern.c.orig calendar-1.37-20221115cvs/oster
  		e_q++;
  
  	if (e_n == 4)
-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
+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
 @@ -27,6 +27,7 @@
   */
  
@@ -181,21 +181,21 @@ diff -up calendar-1.37-20221115cvs/paskha.c.orig calendar-1.37-20221115cvs/paskh
  		cumdays++;
  	return ((cumdays + 22) + (d + e) + 13);
  }
-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
+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
 @@ -33,7 +33,7 @@
  
  #include <paths.h>
  
--#define	_PATH_CPP	"/usr/libexec/cpp"
+-#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.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
+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
 @@ -18,6 +18,7 @@
   */
  

calendar.spec

@@ -1,10 +1,10 @@
-%define alphatag 20250303cvs
+%define alphatag 20200430cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 12.%{alphatag}%{?dist}
-License: BSD-3-Clause AND BSD-2-Clause AND ISC
+Release: 3.%{alphatag}%{?dist}
+License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
 # The source archive is generated with the export-calendar-source.sh
@@ -30,7 +30,8 @@ tomorrow's.  The output of the command shows upcoming events for the
 week.
 
 %prep
-%autosetup -n %{name}-%{version}-%{alphatag}
+%setup -q -n %{name}-%{version}-%{alphatag}
+%patch0 -p1 -b .orig
 cp %{SOURCE1} Makefile
 
 for c in calendars/*.*/* ; do
@@ -42,10 +43,10 @@ for c in calendars/*.*/* ; do
 done
 
 %build
-%make_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 
 %files
 %attr(755,root,root) %{_bindir}/calendar
@@ -53,56 +54,6 @@ 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3.20200430cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

export-calendar-source.sh

@@ -1,33 +1,19 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_7_6
-SERVER=anoncvs4.usa.openbsd.org
+TAG=OPENBSD_6_6
 
-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 :ext:anoncvs@${SERVER}:/cvs co -d calendar -r ${TAG} src/usr.bin/calendar
-
+cvs -d anoncvs@anoncvs.ca.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; }')"
 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}

sources

@@ -1 +1 @@
-SHA512 (calendar-1.37-20250303cvs.tar.gz) = e5f15b6c4efc11ee6c7041535ba5e8f2d0cc3ed22a3944bf2f499fabcfae9ae45290b59a564641bf0355fa402674890694054790a9ee64304a8214752b6b4edf
+SHA512 (calendar-1.37-20200430cvs.tar.gz) = 3589eb08fb07aa56eb68d3b4f30b89c1edaf058ffd05c1310d676428ebf40788f1a64f8e9d7a05bc5c44200bd24a7e07c73c466bd62bfaa68b42ef8fb8e47a12