Automatic import for version 5.30

2025-02-22 16:32:48 +00:00 · 2012-02-01 14:36:19 +04:00 · 2012-02-01 14:36:19 +04:00 · 4278f4bfed
commit 4278f4bfed
6 changed files with 314 additions and 0 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -0,0 +1,2 @@
+sources:
+  "xlockmore-5.30.tar.bz2": 960f711a75d9f0a2e30873443386a9d3cd46c3c6
--- a/xlock.pamd
+++ b/xlock.pamd
@ -0,0 +1,2 @@
+#%PAM-1.0
+auth       include system-auth
--- a/xlockmore-5.25-drop_setgid.patch
+++ b/xlockmore-5.25-drop_setgid.patch
@ -0,0 +1,18 @@
+--- xlock/xlock.c.setgid	2008-05-22 10:50:43.000000000 -0600
+++ xlock/xlock.c	2008-05-22 10:53:50.000000000 -0600
+@@ -3343,6 +3343,7 @@ main(int argc, char **argv)
+ /* that needs root rights (pam_unix e.g.) */
+ #else
+ 
+#if 0
+ #ifdef USE_VTLOCK
+ 	/* In order to lock VT switch we must issue an ioctl on console */
+ 	/* (VT_LOCKSWITCH). This ioctl MUST be issued by root. */
+@@ -3357,6 +3358,7 @@ main(int argc, char **argv)
+ 	}
+ #endif
+ #endif
+#endif
+ 
+ #ifdef SYNCHRONIZE
+ 	/* synchronize -- so I am aware of errors immediately */
--- a/xlockmore-5.30-include_ftgl_path.patch
+++ b/xlockmore-5.30-include_ftgl_path.patch
@ -0,0 +1,14 @@
+diff -Naur xlockmore-5.30/modes/glx/text3d2.cc xlockmore-5.30.tpg//modes/glx/text3d2.cc
+--- xlockmore-5.30/modes/glx/text3d2.cc	2010-02-02 20:44:28.000000000 +0000
+++ xlockmore-5.30.tpg//modes/glx/text3d2.cc	2011-06-19 11:58:52.000000000 +0000
+@@ -82,8 +82,8 @@
+   #include "FTGL/FTGLExtrdFont.h"
+   #include "FTGL/FTGLOutlineFont.h"
+ #else
+-  #include "FTGLExtrdFont.h"
+-  #include "FTGLOutlineFont.h"
+  #include "FTGL/FTGLExtrdFont.h"
+  #include "FTGL/FTGLOutlineFont.h"
+ #endif
+ #endif
+ 
--- a/xlockmore-5.30-soundpath.patch
+++ b/xlockmore-5.30-soundpath.patch
@ -0,0 +1,33 @@
+diff -Naur xlockmore-5.30/configure.in xlockmore-5.30.tpg//configure.in
+--- xlockmore-5.30/configure.in	2010-01-27 23:30:40.000000000 +0000
+++ xlockmore-5.30.tpg//configure.in	2011-06-19 12:19:55.000000000 +0000
+@@ -3456,9 +3456,9 @@
+       AC_DEFINE(USE_ESOUND)
+       AC_DEFINE(HAVE_LIBESD)
+       if test "x$prefix" = "xNONE"; then
+-	AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DIR, "/usr/lib/X11/xlock/sounds/")
+	AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DIR, "/usr/share/sounds/xlockmore/")
+       else
+-	AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DIR, "${prefix}/lib/X11/xlock/sounds/")
+	AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DIR, "${prefix}/share/sounds/xlockmore/")
+       fi
+       test "x$esound_config" = xNONE && esound_config=$ac_esound_config
+       test "x$esound_prefix" = xNONE && esound_prefix=$ac_esound_prefix
+diff -Naur xlockmore-5.30/xlock/XLock.ad xlockmore-5.30.tpg//xlock/XLock.ad
+--- xlockmore-5.30/xlock/XLock.ad	2009-08-27 20:42:04.000000000 +0000
+++ xlockmore-5.30.tpg//xlock/XLock.ad	2011-06-19 12:18:05.000000000 +0000
+@@ -45,10 +45,10 @@
+ !XLock.icongeometry: 256x256
+ 
+ ! For sound
+-XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
+-XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
+-XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
+-XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
+XLock.locksound: /usr/share/sounds/xlockmore/complete.au
+XLock.infosound: /usr/share/sounds/xlockmore/identify-please.au
+XLock.validsound: /usr/share/sounds/xlockmore/thank-you.au
+XLock.invalidsound: /usr/share/sounds/xlockmore/not-programmed.au
+ !XLock.locksound: complete.au
+ !XLock.infosound: identify-please.au
+ !XLock.validsound: thank-you.au
--- a/xlockmore.spec
+++ b/xlockmore.spec
@ -0,0 +1,245 @@
+Name:		xlockmore
+Summary:	An X terminal locking program
+Version:	5.30
+Release:	%mkrel 1
+License:	BSD
+Group:		Graphical desktop/Other
+Url:		http://www.tux.org/~bagleyd/xlockmore.html
+Source:		http://www.tux.org/~bagleyd/xlock/%name-%version/%name-%version.tar.bz2
+Source1:	xlock.pamd
+Patch0:		xlockmore-5.30-soundpath.patch
+Patch1:		xlockmore-5.25-drop_setgid.patch
+Patch3:		xlockmore-5.30-include_ftgl_path.patch
+Requires:	pam >= 0.59
+Requires:	fortune-mod
+Requires:	pam
+#fhimpe: needed for chkpwd group
+Requires:	setup >= 2.7.12-2
+BuildRequires:	esound-devel 
+BuildRequires:	gtk+2-devel
+BuildRequires:	mesa-common-devel 
+BuildRequires:	pam-devel 
+BuildRequires:	libx11-devel
+BuildRequires:	libxext-devel
+BuildRequires:	xpm-devel 
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+The xlockmore utility is an enhanced version of the standard xlock
+program, which allows you to lock an X session so that other users
+can't access it.  Xlockmore runs a provided screensaver until you type
+in your password.
+
+Install the xlockmore package if you need a locking program to secure
+X sessions.
+
+%package gtk2
+Summary:	A GTK2 front-end to xlockmore
+Url:		http://www.tux.org/~bagleyd/xlockmore.html
+Group:		Graphical desktop/Other
+License:	BSD
+Requires:	xlockmore
+
+%description gtk2
+A GTK2 front-end to xlockmore.
+
+%prep
+%setup -q
+%patch0 -p1 -b .soundpath
+#%patch1 -p0 -b .drop_setgid
+%patch3 -p1 -b .include_ftgl_path
+
+%{__sed} -i -e "s,/lib,/%{_lib},g" configure
+
+%build
+autoconf
+
+%configure2_5x \
+	--without-motif \
+	--with-gtk2 \
+	--without-gtk \
+	--enable-pam \
+	--enable-syslog \
+	--disable-setuid \
+	--with-crypt \
+	--without-rplay \
+	--enable-appdefaultdir=%{_datadir}/X11/app-defaults
+make
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/sounds/xlockmore
+
+perl -p -i -e 's/-o root//g' Makefile */Makefile
+%makeinstall
+
+install -m644 xlock/xlock.man -D %{buildroot}%{_mandir}/man1/xlock.1
+install -m644 xlock/XLock.ad -D %{buildroot}%{_datadir}/X11/app-defaults/XLock
+install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/pam.d/xlock
+
+cp sounds/*.au %{buildroot}%{_datadir}/sounds/xlockmore
+rm -rf %{buildroot}%{_mandir}/xlock.1*
+chmod 755 %{buildroot}%{_bindir}/xlock
+
+
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+
+cat >> %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
+[Desktop Entry]
+Name=Xlock
+Comment=X11 screen saver
+Icon=gnome-lockscreen.png
+Exec=xlock
+Terminal=false
+Type=Application
+Category=System;
+EOF
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%attr(2755,root,chkpwd) %{_bindir}/xlock
+%{_mandir}/man1/xlock.1*
+%config(noreplace) %{_datadir}/X11/app-defaults/XLock
+%{_datadir}/sounds/xlockmore
+%{_datadir}/applications/%{name}.desktop
+%config(noreplace) %{_sysconfdir}/pam.d/*
+
+%files gtk2
+%defattr(-,root,root)
+%{_bindir}/xglock
+%{_datadir}/xlock
+
+
+%changelog
+* Sun Jun 19 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 5.30-1mdv2011.0
+ Revision: 686027
+- update to new version 5.30
+- rediff patch 0 and 3
+
+* Sat May 07 2011 Oden Eriksson <oeriksson@mandriva.com> 5.28-4
+ Revision: 671335
+- mass rebuild
+
+* Thu Jul 22 2010 Paulo Ricardo Zanoni <pzanoni@mandriva.com> 5.28-3mdv2011.0
+ Revision: 556942
+- Replace X11-devel BR to save time
+
+* Wed Mar 17 2010 Oden Eriksson <oeriksson@mandriva.com> 5.28-2mdv2010.1
+ Revision: 524451
+- rebuilt for 2010.1
+
+* Wed Aug 19 2009 Funda Wang <fwang@mandriva.org> 5.28-1mdv2010.0
+ Revision: 418045
+- New version 5.28
+
+* Sat Mar 07 2009 Antoine Ginies <aginies@mandriva.com> 5.26.1-4mdv2009.1
+ Revision: 350994
+- rebuild
+
+* Mon Aug 25 2008 Vincent Danen <vdanen@mandriva.com> 5.26.1-3mdv2009.0
+ Revision: 275957
+- disable the drop_setgid patch for now
+
+* Mon Aug 25 2008 Vincent Danen <vdanen@mandriva.com> 5.26.1-2mdv2009.0
+ Revision: 275954
+- make xlock readable, maybe it will help with the inexplicable problems some are seeing with authentication issues
+
+* Mon Aug 11 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 5.26.1-1mdv2009.0
+ Revision: 270627
+- update to new version 5.26.1
+
+* Thu Aug 07 2008 Thierry Vignaud <tv@mandriva.org> 5.25-6mdv2009.0
+ Revision: 266095
+- rebuild early 2009.0 package (before pixel changes)
+
+* Mon Jun 02 2008 Frederik Himpe <fhimpe@mandriva.org> 5.25-5mdv2009.0
+ Revision: 214356
+- Add Requires: setup >= 2.7.12-2, to make sure the chkpwd group exists when installing xlockmore
+
+* Fri May 23 2008 Vincent Danen <vdanen@mandriva.com> 5.25-4mdv2009.0
+ Revision: 210183
+- make it sgid chkpwd
+
+* Thu May 22 2008 Vincent Danen <vdanen@mandriva.com> 5.25-3mdv2009.0
+ Revision: 210090
+- add a patch to drop sgid calls and make xlock sgid shadow so that it will work again with both shadow and tcb passwording
+
+* Fri May 16 2008 Paulo Andrade <pcpa@mandriva.com.br> 5.25-2mdv2009.0
+ Revision: 208015
+- Fix remaining of an alternative correction, that would require adding
+  librplay to the distro being commited.
+- By default, don't build with rplay, if it is available in the
+  "Build System". This should be only an issue for people building
+  rpms from source. And should address #38171
+  ("xlockmore for build needs librplay-devel if librplay installed")
+
+* Sat Feb 23 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 5.25-1mdv2008.1
+ Revision: 174085
+- new license policy
+- drop patch 0
+- add desktop entry for xflock
+- enable syslog logging
+- spec file clean
+- new version 5.25
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Thu Jun 21 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 5.23-1mdv2008.0
+ Revision: 42343
+- New upstream release: 5.23
+
+
+* Tue Mar 06 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 5.22-5mdv2007.0
+ Revision: 133664
+- fix the path to look for app-defaults (#23242)
+- fix the path to look for sounds (#17792)
+
+* Sat Feb 10 2007 Michael Scherer <misc@mandriva.org> 5.22-4mdv2007.1
+ Revision: 118678
+- do not use pam_stack
+- bunzip patchs
+
+* Fri Dec 22 2006 Christiaan Welvaart <cjw@daneel.dyndns.org> 5.22-3mdv2007.1
+ Revision: 101842
+- fix build
+
+* Thu Aug 31 2006 Antonio Hobmeir Neto <neto@mandriva.com> 5.22-2mdv2007.0
+ Revision: 58917
+- Add a symlink to /usr/lib/X11/app-default/XLock (#23242)
+- Add missing build requires for gtk+2-devel
+
+  + Gustavo Pichorim Boiko <boiko@mandriva.com>
+    - Import xlockmore
+
+* Wed Jun 28 2006 Eskild Hustvedt <eskild@mandriva.org> 5.22-1mdv
+- New version 5.22
+- Dropped patch2 - merged upstream
+- Rediffed patch1
+- Now compiles the gtk2 front-end, found in the -gtk2 subpackage
+
+* Sun Jan 01 2006 Mandriva Linux Team <http://www.mandrivaexpert.com/> 5.19-3mdk
+- Rebuild
+
+* Wed Aug 17 2005 Samir Bellabes <sbellabes@mandriva.com> 5.19-2mdk
+- Use workaround for pam problem (same as for Gentoo) (bug #17504)
+- fix bad path for including FTGL's header
+- And it should be a good idea to test package before uploading, next time
+
+* Fri Aug 12 2005 Nicolas Lécureuil <neoclust@mandriva.org> 5.19-1mdk
+- new release
+
+* Fri Aug 12 2005 Nicolas Lécureuil <neoclust@mandriva.org> 5.18-1mdk
+- new release from Crispin Boylan
+- %%mkrel
+
+* Thu Jun 10 2004 Götz Waschk <waschk@linux-mandrake.com> 5.11-2mdk
+- rebuild for new g++
+