From e27aaf983821175ff790275029e4b5962d198cbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:09:24 +0000 Subject: [PATCH 01/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 59ba3ba13bcad60ee9492c5f57abf4d4e518209b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:06:50 +0000 Subject: [PATCH 02/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.37-4.20200430cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 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 Date: Mon, 20 Dec 2021 10:59:58 -0500 Subject: [PATCH 03/17] Upgrade to calendar(1) from OpenBSD 7.0 Signed-off-by: David Cantrell --- .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 - 1.37-20211220cvs +- Upgrade to calendar(1) from OpenBSD 7.0 + * Wed Jul 21 2021 Fedora Release Engineering - 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 Date: Wed, 19 Jan 2022 22:51:14 +0000 Subject: [PATCH 04/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.37-6.20211220cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 20 2021 David Cantrell - 1.37-20211220cvs - Upgrade to calendar(1) from OpenBSD 7.0 From 1b0701f233936ea6f651dcfd148e373e8e4c3738 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:31:58 +0000 Subject: [PATCH 05/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.37-7.20211220cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 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 Date: Tue, 15 Nov 2022 14:52:10 -0500 Subject: [PATCH 06/17] Upgrade to calendar(1) from OpenBSD 7.2 Use SPDX license expression in the License tag Signed-off-by: David Cantrell --- .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 #include @@ -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 --#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 - 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 - 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 Date: Wed, 18 Jan 2023 23:27:05 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.37-2.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 15 2022 David Cantrell - 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 Date: Wed, 19 Jul 2023 15:12:00 +0000 Subject: [PATCH 08/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 1.37-3.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 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 Date: Fri, 19 Jan 2024 15:00:18 +0000 Subject: [PATCH 09/17] 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 - 1.37-4.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 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 Date: Tue, 23 Jan 2024 01:09:22 +0000 Subject: [PATCH 10/17] 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 - 1.37-5.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 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 Date: Fri, 9 Feb 2024 11:05:00 -0500 Subject: [PATCH 11/17] Upgrade to calendar(1) from OpenBSD 7.4 Use non-deprecated syntax for the %patch macro Signed-off-by: David Cantrell --- .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 - 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 - 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 Date: Thu, 28 Mar 2024 16:11:42 +0000 Subject: [PATCH 12/17] Bump release to -7 to stay newer than Fedora 37 package Signed-off-by: Evan Goode --- 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 - 1.37-7.20240209cvs +- Bump release to stay newer than Fedora 37 package + * Fri Feb 09 2024 David Cantrell - 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 Date: Tue, 28 May 2024 12:25:40 -0400 Subject: [PATCH 13/17] Upgrade to calendar(1) from OpenBSD 7.5 Signed-off-by: David Cantrell --- .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 - 1.37-8.20240528cvs +- Upgrade to calendar(1) from OpenBSD 7.5 + * Thu Mar 28 2024 Evan Goode - 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 Date: Wed, 17 Jul 2024 18:54:04 +0000 Subject: [PATCH 14/17] 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 - 1.37-9.20240528cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 28 2024 David Cantrell - 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 Date: Thu, 16 Jan 2025 13:14:23 +0000 Subject: [PATCH 15/17] 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 - 1.37-10.20240528cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 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 Date: Mon, 3 Mar 2025 10:53:25 -0500 Subject: [PATCH 16/17] Upgrade to calendar(1) from OpenBSD 7.6 Signed-off-by: David Cantrell --- .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 - 1.37-11.20250303cvs +- Upgrade to calendar(1) from OpenBSD 7.6 + * Thu Jan 16 2025 Fedora Release Engineering - 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 Date: Wed, 23 Jul 2025 18:03:46 +0000 Subject: [PATCH 17/17] 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 - 1.37-12.20250303cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 03 2025 David Cantrell - 1.37-11.20250303cvs - Upgrade to calendar(1) from OpenBSD 7.6