diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 47e26cf..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xlockmore-5.25.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aed7e79 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +xlockmore-5.28.tar.bz2 +/xlockmore-5.31.tar.bz2 +/xlockmore-5.34.tar.bz2 +/xlockmore-5.38.tar.bz2 +/xlockmore-5.40.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/Makefile b/Makefile deleted file mode 100644 index 2a18cb7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xlockmore -# $Id$ -NAME := xlockmore -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 65e12ec..73fe2eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d25b656e11b90f2e2d4244883d639fb xlockmore-5.25.tar.bz2 +SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3 diff --git a/xlockmore-ignore-void.patch b/xlockmore-ignore-void.patch new file mode 100644 index 0000000..5705837 --- /dev/null +++ b/xlockmore-ignore-void.patch @@ -0,0 +1,56 @@ +--- 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 5efa179..878b3aa 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,23 +1,29 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.25 -Release: 1%{?dist} -License: BSD -Group: Amusements/Graphics -URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.25.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pam-devel esound-devel +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++ +BuildRequires: pam-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel -BuildRequires: lesstif-devel gtk2-devel +BuildRequires: motif-devel gtk2-devel BuildRequires: libXau-devel +Patch0: xlockmore-ignore-void.patch +%if 0%{?rhel} +Requires: gnome-icon-theme +%else +Requires: gnome-icon-theme-legacy +%endif %description 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} @@ -25,7 +31,6 @@ Requires: %{name} = %{version}-%{release} Motif based frontend for xlockmore. %package gtk -Group: Amusements/Graphics Summary: GTK based frontend for xlockmore Requires: %{name} = %{version}-%{release} @@ -34,22 +39,35 @@ GTK based frontend for xlockmore. %prep %setup -q +%patch -P 0 -p 1 -%{__sed} -i -e "s,/lib,/%{_lib},g" configure +%{__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 +%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 -%{__rm} -rf %{buildroot} %{__install} -D -m0755 xlock/xlock %{buildroot}%{_bindir}/xlock %{__install} -D -m0755 xmlock/xmlock %{buildroot}%{_bindir}/xmlock %{__install} -D -m0755 xglock/xglock %{buildroot}%{_bindir}/xglock %{__install} -p -D -m0644 xlock/xlock.man %{buildroot}%{_mandir}/man1/xlock.1 %{__install} -p -D -m0644 xlock/XLock.ad %{buildroot}%{_libdir}/X11/app-defaults/XLock %{__install} -p -D -m0644 xmlock/XmLock.ad %{buildroot}%{_libdir}/X11/app-defaults/XmLock +%{__chmod} 644 README +%{__chmod} 644 docs/Revisions %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d @@ -68,26 +86,21 @@ cat >> %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF Name=Xlock Comment=Screen Saver Encoding=UTF-8 -Icon=gnome-lockscreen.png +Icon=gnome-lockscreen Exec=xlock Terminal=false Type=Application EOF desktop-file-install \ - --vendor=fedora \ --dir %{buildroot}%{_datadir}/applications \ --delete-original \ --add-category X-Fedora \ --add-category Application \ --add-category Graphics \ - %{buildroot}%{_datadir}/applications/%{name}.desktop - -%clean -%{__rm} -rf %{buildroot} + %{buildroot}%{_datadir}/applications/%{name}.desktop %files -%defattr(-, root, root, 0755) %doc README docs/* %doc %{_mandir}/man1/xlock.1* %{_bindir}/xlock @@ -96,22 +109,265 @@ desktop-file-install \ %{_datadir}/applications/* %files motif -%defattr(-, root, root, 0755) %{_bindir}/xmlock %{_libdir}/X11/app-defaults/XmLock %files gtk -%defattr(-, root, root, 0755) %{_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 +- updated to 5.45 + +* Mon Aug 18 2014 Fedora Release Engineering - 5.43-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 5.43-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Dec 22 2013 Sebastien Lugan <1698DA98@dynmail.crt1.net> - 5.43-4 +- Fixed locale support "xlock need to enter password twice" (#991010) + +* Thu Dec 05 2013 Adrian Reber - 5.43-3 +- fixed "xlockmore FTBFS if "-Werror=format-security" flag is used" (#1037397) + +* Sun Aug 04 2013 Fedora Release Engineering - 5.43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 18 2013 Adrian Reber - 5.43-1 +- updated to 5.43 +- fixed "NULL pointer dereference leads to crash and bypass of screen lock" (#985542) + +* Sun Feb 10 2013 Parag Nemade - 5.41-2 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 +- Cleanup spec as per recently changed packaging guidelines + +* Tue Nov 20 2012 Adrian Reber - 5.41-1 +- updated to 5.41 +- dropped upstreamed patch for CVE-2012-4524 +- fixed "xlock exits on segfault, unlocking the screen" (#874484) + +* Mon Oct 22 2012 Adrian Reber - 5.40-4 +- conditionalize icon BR + +* Thu Oct 18 2012 Adrian Reber - 5.40-3 +- fixed "CVE-2012-4524 xlockmore: Screensaver crash (screen lock bypass) when 'dclock' mode used" (#867908) + +* Thu Oct 18 2012 Adrian Reber - 5.40-2 +- removed esound-devel BR + +* Sun Oct 14 2012 Adrian Reber - 5.40-1 +- updated to 5.40 + +* Sun Jul 22 2012 Fedora Release Engineering - 5.38-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Mar 25 2012 Adrian Reber - 5.38-1 +- updated to 5.38 +- removed buildroot and clean section + +* Sat Jan 14 2012 Fedora Release Engineering - 5.34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 5.34-2 +- Rebuild for new libpng + +* Tue Jun 07 2011 Adrian Reber - 5.34-1 +- updated to 5.34 +- fixed "Desktop file should not include extension..." (#701699) +- fixed "...missing Requires" (#701699); added R: gnome-icon-theme-legacy + +* Mon Feb 07 2011 Fedora Release Engineering - 5.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 08 2010 Adrian Reber - 5.31-1 +- updated to 5.31 +- removed xlockmore-fix_petri.patch + +* Sat May 08 2010 Adrian Reber - 5.28-2 +- fixed "FTBFS xlockmore-5.28-1.fc12: ImplicitDSOLinking" (#564929) + +* Sun Aug 30 2009 Adrian Reber - 5.28-1 +- updated to 5.28 +- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379) + +* Mon Jul 27 2009 Fedora Release Engineering - 5.26.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 5.26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Aug 09 2008 Adrian Reber - 5.26.1-1 +- updated to 5.26.1 + * Mon Feb 18 2008 Adrian Reber - 5.25-1 - updated to 5.25 * Sat Oct 13 2007 Adrian Reber - 5.24-1 - updated to 5.24 -* Tue Feb 08 2007 Adrian Reber - 5.23-1 +* Tue Feb 06 2007 Adrian Reber - 5.23-1 - updated to 5.23 * Tue Sep 12 2006 Adrian Reber - 5.22-3 @@ -147,7 +403,7 @@ desktop-file-install \ * Wed Apr 13 2005 Adrian Reber - 5.16-1 - update to 5.16 -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Thu Feb 24 2005 Adrian Reber - 5.15-1