diff --git a/.gitignore b/.gitignore index aed7e79..c14d9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -6,24 +6,3 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.41.tar.bz2 /xlockmore-5.43.tar.bz2 /xlockmore-5.45.tar.bz2 -/xlockmore-5.46.tar.xz -/xlockmore-5.47.tar.xz -/xlockmore-5.49.tar.xz -/xlockmore-5.51.tar.xz -/xlockmore-5.53.tar.xz -/xlockmore-5.55.tar.xz -/xlockmore-5.56.tar.xz -/xlockmore-5.59.tar.xz -/xlockmore-5.60.tar.xz -/xlockmore-5.61.tar.xz -/xlockmore-5.63.tar.xz -/xlockmore-5.64.tar.xz -/xlockmore-5.66.tar.xz -/xlockmore-5.67.tar.xz -/xlockmore-5.70.tar.xz -/xlockmore-5.74.tar.xz -/xlockmore-5.77.tar.xz -/xlockmore-5.81.tar.xz -/xlockmore-5.86.tar.xz -/xlockmore-5.87.tar.xz -/xlockmore-5.88.tar.xz diff --git a/patch-modes_dclock.patch b/patch-modes_dclock.patch new file mode 100644 index 0000000..e4fa9a4 --- /dev/null +++ b/patch-modes_dclock.patch @@ -0,0 +1,53 @@ +--- modes/dclock.c.orig 2012-01-23 13:19:21.000000000 +0000 ++++ modes/dclock.c +@@ -376,11 +376,11 @@ static dclockstruct *dclocks = (dclockst + extern char *message; + + static unsigned long +-timeAtLastNewYear(long timeNow) ++timeAtLastNewYear(time_t timeNow) + { + struct tm *t; + +- t = localtime((const time_t *) &timeNow); ++ t = localtime(&timeNow); + return (unsigned long)(t->tm_year); + } + +@@ -420,7 +420,7 @@ convert(double x, char *string) + } + + static void +-dayhrminsec(long timeCount, int tzoffset, char *string) ++dayhrminsec(time_t timeCount, int tzoffset, char *string) + { + int days, hours, minutes, secs; + int bufsize, i; +@@ -675,7 +675,7 @@ drawDclock(ModeInfo * mi) + "%a %b %d %Y", localtime(&(dp->timeold))); + } + } else { +- long timeNow, timeLocal; ++ time_t timeNow, timeLocal; + timeNow = seconds(); + timeLocal = timeNow + dp->tzoffset; + +@@ -950,7 +950,7 @@ init_dclock(ModeInfo * mi) + { + Display *display = MI_DISPLAY(mi); + dclockstruct *dp; +- long timeNow, timeLocal; ++ time_t timeNow, timeLocal; + int i, j; + + if (dclocks == NULL) { +@@ -1252,7 +1252,7 @@ defined(MODE_dclock_mayan) + dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]); + dp->strpta[1] = dp->strnew[1]; + } else { +- struct tm *t = localtime((const time_t *) &timeLocal); ++ struct tm *t = localtime(&timeLocal); + + if (dp->time24) + (void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t); + diff --git a/sources b/sources index 73fe2eb..ef8fa76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3 +bd4d98d4ce2b836cf930a68c9146522b xlockmore-5.45.tar.bz2 diff --git a/xlockmore-5.40-fix_exitcode.patch b/xlockmore-5.40-fix_exitcode.patch new file mode 100644 index 0000000..75337cf --- /dev/null +++ b/xlockmore-5.40-fix_exitcode.patch @@ -0,0 +1,34 @@ +--- xlock/xlock.c 2011-05-24 03:53:46.000000000 +0200 ++++ xlock/xlock.c 2012-11-19 12:47:42.592261929 +0100 +@@ -1052,6 +1052,7 @@ syslogStop(char *displayName) + #endif + + char error_buf[ERROR_BUF]; ++static int error_exitcode = 1; + + void + error(const char *buf) +@@ -1068,7 +1069,14 @@ error(const char *buf) + #else + (void) fprintf(stderr, "%s", buf); + #endif +- exit(1); ++ if (error_exitcode < 0) { ++ int sig = -error_exitcode; ++ signal(sig, SIG_DFL); ++ raise(sig); ++ /* We are still alive?? */ ++ error_exitcode = sig + 128; ++ } ++ exit(error_exitcode); + } + + /* Server access control support. */ +@@ -2946,6 +2954,7 @@ sigcatch(int signum) + ProgramName: DEFAULT_NAME, signum, + (strlen(ProgramName) + strlen(name) < + ERROR_BUF - 2 * ERROR_LINE) ? name: "?", (long) getuid()); ++ error_exitcode = -signum; + error(error_buf); + #endif /* !WIN32 */ + } diff --git a/xlockmore-ignore-void.patch b/xlockmore-ignore-void.patch deleted file mode 100644 index 5705837..0000000 --- a/xlockmore-ignore-void.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/xglock/xglock.c.orig 2026-02-04 14:55:58.908881606 +0100 -+++ b/xglock/xglock.c 2026-02-04 14:56:41.293020943 +0100 -@@ -714,7 +714,7 @@ - struct_option_fntcol_callback *cbs_ptr =(struct_option_fntcol_callback *)udata; - gtk_widget_hide(cbs_ptr->fntcol_dialog); - gtk_widget_destroy(cbs_ptr->fntcol_dialog); -- (void) g_free(udata); -+ g_free(udata); - } - - /* -@@ -777,7 +777,7 @@ - gtk_entry_set_text( GTK_ENTRY(cbs_ptr->entry), colorstr ); - gtk_widget_hide( cbs_ptr->fntcol_dialog ); - gtk_widget_destroy(cbs_ptr->fntcol_dialog); -- (void) g_free(udata); -+ g_free(udata); - } - - /* -@@ -910,7 +910,7 @@ - struct_option_fntcol_callback *cbs_ptr = (struct_option_fntcol_callback *)udata; - gtk_widget_hide(cbs_ptr->fntcol_dialog); - gtk_widget_destroy(cbs_ptr->fntcol_dialog); -- (void) g_free(udata); -+ g_free(udata); - } - - /* -@@ -927,7 +927,7 @@ - gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), - gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(cbs_ptr->fntcol_dialog))); - gtk_widget_destroy(cbs_ptr->fntcol_dialog); -- (void) g_free(udata); -+ g_free(udata); - } - - /* -@@ -979,7 +979,7 @@ - struct_option_fntcol_callback *cbs_ptr= (struct_option_fntcol_callback *)udata; - gtk_widget_hide( cbs_ptr->fntcol_dialog ); - gtk_widget_destroy( cbs_ptr->fntcol_dialog ); -- (void) g_free(udata); -+ g_free(udata); - } - - /* -@@ -1002,7 +1002,7 @@ - gtk_widget_hide(cbs_ptr->fntcol_dialog); - gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), filename); - gtk_widget_destroy(cbs_ptr->fntcol_dialog); -- (void) g_free(udata); -+ g_free(udata); - } - } - diff --git a/xlockmore.spec b/xlockmore.spec index 878b3aa..c732192 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,19 +1,17 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.88 -Release: 2%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD -URL: http://sillycycle.com/xlockmore.html -Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz -BuildRequires: make -BuildRequires: gcc gcc-c++ +Version: 5.45 +Release: 1%{?dist} +License: BSD +Group: Amusements/Graphics +URL: http://www.tux.org/~bagleyd/xlockmore.html +Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-%{version}/xlockmore-%{version}.tar.bz2 +Patch0: xlockmore-5.40-fix_exitcode.patch BuildRequires: pam-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel -BuildRequires: motif-devel gtk2-devel +BuildRequires: lesstif-devel gtk2-devel BuildRequires: libXau-devel -Patch0: xlockmore-ignore-void.patch %if 0%{?rhel} Requires: gnome-icon-theme %else @@ -24,6 +22,7 @@ Requires: gnome-icon-theme-legacy Locks the local X display until a password is entered. %package motif +Group: Amusements/Graphics Summary: Motif based frontend for xlockmore Requires: %{name} = %{version}-%{release} @@ -31,6 +30,7 @@ Requires: %{name} = %{version}-%{release} Motif based frontend for xlockmore. %package gtk +Group: Amusements/Graphics Summary: GTK based frontend for xlockmore Requires: %{name} = %{version}-%{release} @@ -39,24 +39,12 @@ GTK based frontend for xlockmore. %prep %setup -q -%patch -P 0 -p 1 +%patch0 %{__sed} -i -e "s,/lib,/%{_lib},g;s,-Wno-format,,g;" configure -# See README for X(M)LOCKLDFLAGS explanation -%{__sed} -i "/^XLOCKLDFLAGS$/d" configure -%{__sed} -i "/^XMLOCKLDFLAGS$/d" configure - %build %configure --with-crypt --enable-pam --enable-syslog --disable-setuid --disable-mb - -# Work around BZ#2341574 -sed -i 's/^CC =.*/\0 -std=c17/' xglock/Makefile - -# See README for X(M)LOCKLDFLAGS explanation -sed -i 's/@XLOCKLDFLAGS@//' modes/Makefile -sed -i 's/@XMLOCKLDFLAGS@//' xmlock/Makefile - %{__make} %{?_smp_mflags} %install @@ -116,168 +104,7 @@ desktop-file-install \ %{_bindir}/xglock %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 5.88-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Mon Feb 09 2026 Adrian Reber - 5.88-1 -- Updated to 5.88 (#2425617) - -* Wed Feb 04 2026 Adrian Reber - 5.87-2 -- Updated to 5.87 (#2435197) - -* Sat Jan 17 2026 Fedora Release Engineering - 5.86-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Dec 15 2025 Adrian Reber - 5.86-1 -- Updated to 5.86 (#2361972) - -* Fri Jul 25 2025 Fedora Release Engineering - 5.81-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed Feb 19 2025 Martin Cermak - 5.81-1 -- Updated to 5.81 (#1837169) - -* Tue Feb 18 2025 Martin Cermak - 5.77-5 -- Updated for FTBFS (#2341574) - -* Sun Jan 19 2025 Fedora Release Engineering - 5.77-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 5.77-3 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 5.77-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu May 02 2024 Adrian Reber - 5.77-1 -- Updated to 5.77 (#1837169) - -* Sat Jan 27 2024 Fedora Release Engineering - 5.74-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 12 2023 Adrian Reber - 5.74-1 -- Updated to 5.74 (#1837169) - -* Sat Jul 22 2023 Fedora Release Engineering - 5.70-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 5.70-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 5.70-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 13 2022 Adrian Reber - 5.70-1 -- Updated to 5.70 (#1837169) - -* Sat Jan 22 2022 Fedora Release Engineering - 5.67-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Aug 30 2021 Adrian Reber - 5.67-1 -- Updated to 5.67 (#1837169) - -* Fri Jul 23 2021 Fedora Release Engineering - 5.66-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 5.66-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 29 2020 Adrian Reber - 5.66-1 -- Updated to 5.66 (#1837169) - -* Wed Jul 29 2020 Fedora Release Engineering - 5.64-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 30 2020 Adrian Reber - 5.64-2 -- Applied patch from Jan Kratochvil (#1852546) - -* Sun Jun 14 2020 Adrian Reber - 5.64-1 -- Updated to 5.64 - -* Mon May 11 2020 Adrian Reber - 5.63-1 -- Updated to 5.63 (#1795091) - -* Fri Jan 31 2020 Fedora Release Engineering - 5.61-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Dec 17 2019 Adrian Reber - 5.61-1 -- Updated to 5.61 (#1762984) -- All patches have been upstreamed - -* Thu Dec 05 2019 Adrian Reber - 5.60-1 -- Updated to 5.60 (#1762984) - -* Sat Oct 05 2019 Adrian Reber - 5.59-1 -- Updated to 5.59 - -* Sat Jul 27 2019 Fedora Release Engineering - 5.56-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 5.56-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 15 2019 Adrian Reber - 5.56-1 -- Updated to 5.56 - -* Mon Jan 14 2019 Björn Esser - 5.55-6 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Wed Jul 18 2018 Adrian Reber - 5.55-5 -- Added BR: gcc-c++ - -* Sat Jul 14 2018 Fedora Release Engineering - 5.55-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 5.55-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 5.55-2 -- Rebuilt for switch to libxcrypt - -* Thu Aug 10 2017 Adrian Reber - 5.55-1 -- updated to 5.55 - -* Thu Aug 03 2017 Fedora Release Engineering - 5.53-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 5.53-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Apr 25 2017 Adrian Reber - 5.53-1 -- updated to 5.53 - -* Thu Mar 16 2017 Adrian Reber - 5.51-1 -- updated to 5.51 - -* Sat Feb 11 2017 Fedora Release Engineering - 5.49-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 12 2016 Adrian Reber - 5.49-2 -- rebuilt - -* Sun Dec 11 2016 Adrian Reber - 5.49-1 -- updated to 5.49 - -* Mon May 23 2016 Adrian Reber - 5.47-1 -- updated to 5.47 - -* Fri Feb 05 2016 Fedora Release Engineering - 5.46-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 06 2015 Adrian Reber - 5.46-4 -- link against openmotif instead of lesstif -- fixed a changelog date - -* Fri Jun 19 2015 Fedora Release Engineering - 5.46-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 5.46-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Sat Mar 21 2015 Adrian Reber - 5.46-1 -- updated to 5.46 - -* Thu Jan 15 2015 Adrian Reber - 5.45-1 +* Wed Jan 15 2015 Adrian Reber - 5.45-1 - updated to 5.45 * Mon Aug 18 2014 Fedora Release Engineering - 5.43-6