Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Fedora Release Engineering
d9c25c9dfa dist-git conversion 2010-07-29 15:13:59 +00:00
Jesse Keating
1f2d574044 kill with fire 2009-07-30 01:55:03 +00:00
Jesse Keating
58365bfc28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-27 07:07:29 +00:00
Jesse Keating
28c636cbc8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-25 18:19:00 +00:00
pertusus
be8ce39a0f bump release 2008-03-02 23:25:15 +00:00
pertusus
dd8cb6a50c - all the images are now in desktop-backgrounds-basic 2008-03-02 23:23:51 +00:00
Jesse Keating
4ad3a60527 - Autorebuild for GCC 4.3 2008-02-19 18:31:33 +00:00
pertusus
ce3e9b6462 - require system-logos instead of fedora-logos (#250366)
- build requires WINGs-devel instead of WindowMaker-devel
2007-08-01 07:33:51 +00:00
12 changed files with 1 additions and 5047 deletions

View file

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: wdm
# $Id$
NAME := wdm
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)

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphan clean up

View file

@ -1 +0,0 @@
4da8ffe3af233305786d9b6aab78b838 wdm-1.28.tar.bz2

View file

@ -1,53 +0,0 @@
--- wdm-1.28/configs/Xsession.in.failsafe_tmp 2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/Xsession.in 2006-11-29 10:21:25.000000000 +0100
@@ -16,22 +16,30 @@
1)
case $1 in
failsafe)
- exec @FAILSAFE@ -geometry 80x24-0-0
+ exec @FAILSAFE_PATH@ -geometry 80x24-0-0
;;
esac
echo $1 >$HOME/.wm_style
esac
# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
- if ( cp /dev/null "$errfile" 2> /dev/null )
- then
- chmod 600 "$errfile"
- exec > "$errfile" 2>&1
- break
- fi
-done
+errfile="$HOME/.xsession-errors"
+if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+then
+ exec > "$errfile" 2>&1
+else
+
+ mktemp=/bin/mktemp
+ for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+ do
+ if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+ then
+ exec > "$ef" 2>&1
+ mv "$ef" "$errfile" 2> /dev/null
+ break
+ fi
+ done
+fi
# clean up after xbanner
# (RedHat code: need freetemp executed IF xbanner is run by Xsetup_0)
--- wdm-1.28/configs/Xclients.in.failsafe_tmp 2006-11-29 10:23:02.000000000 +0100
+++ wdm-1.28/configs/Xclients.in 2006-11-29 10:24:04.000000000 +0100
@@ -36,7 +36,6 @@
# these files are left sitting around by TheNextLevel.
rm -f $HOME/Xrootenv.0
-rm -f /tmp/fvwmrc* 2>/dev/null
# check for and set x-resources
if [ -f $HOME/.Xresources ] ; then

View file

@ -1,36 +0,0 @@
--- wdm-1.28/configs/wdm-config.in.fedora 2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdm-config.in 2006-10-20 11:50:48.000000000 +0200
@@ -2,8 +2,8 @@
!
! wdm configuration file input (sed in Makefile)
!
-DisplayManager.errorLogFile: @LOGDIR@/xdm-errors.log
-DisplayManager.pidFile: @RUNDIR@/xdm-pid
+DisplayManager.errorLogFile: @LOGDIR@/wdm-errors.log
+DisplayManager.pidFile: @RUNDIR@/wdm.pid
DisplayManager.keyFile: @DMDIR@/xdm-keys
DisplayManager.servers: @DMDIR@/Xservers
DisplayManager.accessFile: @DMDIR@/Xaccess
@@ -25,11 +25,12 @@
! display screen background--if not set or set to none, then the
! background is not set by wdm.
! DisplayManager*wdmBg: none
-DisplayManager*wdmBg: solid:RoyalBlue
+! DisplayManager*wdmBg: solid:RoyalBlue
! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black
! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black
! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black
! DisplayManager*wdmBg: pixmap:@GFXDIR@/Stars.jpg
+DisplayManager*wdmBg: pixmap:@GFXDIR@/../../backgrounds/images/default.jpg
!
! optional pixmap for logo
@PIXMAPCOMMENT@DisplayManager*wdmLogo: @GFXDIR@/@PIXMAPFILE@
@@ -65,7 +66,7 @@
! DisplayManager*wdmHalt: @SHUTDOWN@ -t3 -h now
!
! true/false to require valid username/passwd to reboot,halt, or exit
-DisplayManager*wdmVerify: true
+DisplayManager*wdmVerify: false
! true/false to require root as valid username/passwd to reboot,halt, or exit
DisplayManager*wdmRoot: false
! true=enable, false=disable shake and rollup animations

View file

@ -1,19 +0,0 @@
--- wdm-1.28/configs/wdmReconfig.in.reconf 2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdmReconfig.in 2006-11-29 18:14:42.000000000 +0100
@@ -87,6 +87,7 @@
-e "s:@SHUTDOWN\@:@SHUTDOWN@:" \
-e "s:@LOGDIR\@:@LOGDIR@:" \
-e "s:@RUNDIR\@:@RUNDIR@:" \
+ -e "s:@GFXDIR\@:@GFXDIR@:" \
-e "s:@PIXMAPFILE\@:@PIXMAPFILE@:" \
-e "s:@PIXMAPCOMMENT\@:@PIXMAPCOMMENT@:" \
-e "s:@exec_prefix\@:@exec_prefix@:" \
@@ -99,6 +100,8 @@
configfile=@DMDIR@/Xclients
rm -f $configfile
sed -e "s:@XRDB_PATH\@:@XRDB_PATH@:" \
+ -e "s:@SHELL_LOGIN\@:@SHELL_LOGIN@:" \
+ -e "s:@configure_input\@:configs/Xclients. Generated from Xclients.in by wdmReconfig:" \
-e "s'@WMAKER_PATH\@'$WMAKER_PATH'" \
-e "s'@AFTERSTEP_PATH\@'$AFTERSTEP_PATH'" \
-e "s'@BLACKBOX_PATH\@'$BLACKBOX_PATH'" \

View file

@ -1,23 +0,0 @@
#! /bin/sh
wm=
case $# in
1)
wm=$1
case $wm in
failsafe|custom)
;;
*)
echo $wm >$HOME/.wm_style
;;
esac
;;
0)
if [ -f $HOME/.wm_style ] ; then
wm=`cat $HOME/.wm_style`
fi
;;
esac
exec /etc/X11/xinit/Xsession $wm

View file

@ -1,75 +0,0 @@
#!/usr/bin/perl -w
#
# update_wdm_wmlist, (c) 1998 Marcelo Magallón <mmagallo@debian.org>
# rewriten to use the x-window-manager alternative
# modified to also use the x-session-manager alternative by Arthur Korn
# Copyright 2000 Wichert Akkerman <wakkerma@debian.org>
# Modified to use the freedesktop.org .desktop like kdm and gdm
#
# This script will read the list of installed window managers from
# the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/:
# <share>/xsessions/
# and update the DisplayManager*wdmWm resource in /etc/X11/wdm/wdm-config.
# BEWARE: It doesn't ask any questions about this. It just does it. It
# takes an optional list of window managers.
use strict;
use File::DesktopEntry;
my $wm_list='';
my %desktop_files;
unless (@ARGV) {
#my @wm_list = ('default');
my @wm_list;
foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') {
next unless (opendir DIR, $dir);
my @files;
@files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR);
foreach my $file (@files) {
push @{$desktop_files{$file}}, "$dir/$file";
}
}
DESKTOP: foreach my $desktop_file (keys(%desktop_files)) {
foreach my $file (@{$desktop_files{$desktop_file}}) {
my $entry = File::DesktopEntry->new_from_file($file);
next DESKTOP if (defined($entry->get_value('Hidden'))
and $entry->get_value('Hidden') eq 'true');
if ($entry->get_value('Name') =~ /^gnome$/i) {
push (@wm_list, 'gnome');
}
elsif ($entry->get_value('Name') =~ /^kde$/i) {
push (@wm_list, 'kde');
}
elsif (defined($entry->get_value('Exec'))) {
push (@wm_list, $entry->get_value('Exec'));
}
else { # not found, go to next file
next;
}
# found, proceed to next destop file
next DESKTOP;
}
}
$wm_list = join (':', sort @wm_list) . ':custom';
} else {
$wm_list = join (':', sort @ARGV);
}
open (WDM_CONFIG_FILE, '</etc/wdm/wdm-config')
or die "Can't open /etc/wdm/wdm-config for reading: $!";
open (NEW_WDM_CONFIG_FILE, '>/etc/wdm/wdm-config.new')
or die "Can't open /etc/wdm/wdm-config.new for writing: $!";
while (<WDM_CONFIG_FILE>) {
s|^(!?\s*.*wdmWm:\s*).*|$1$wm_list|;
print NEW_WDM_CONFIG_FILE;
}
close(WDM_CONFIG_FILE);
close(NEW_WDM_CONFIG_FILE);
rename '/etc/wdm/wdm-config.new', '/etc/wdm/wdm-config'
or die "Can't rename /etc/wdm/wdw-config.new: $!";
exit 0;

10
wdm.pam
View file

@ -1,10 +0,0 @@
#%PAM-1.0
auth required pam_env.so
auth include system-auth
account required pam_nologin.so
account include system-auth
password include system-auth
session optional pam_keyinit.so force revoke
session include system-auth
session required pam_loginuid.so
session optional pam_console.so

195
wdm.spec
View file

@ -1,195 +0,0 @@
Name: wdm
Version: 1.28
Release: 7%{?dist}
Summary: WINGs Display Manager
Group: User Interface/X
License: GPL
URL: http://voins.program.ru/wdm/
Source0: http://voins.program.ru/wdm/wdm-%{version}.tar.bz2
# stolen from xdm
Source1: %{name}.pam
# adapted from debian to use freedesktop
Source2: wdm-update_wdm_wmlist
# record and reuse previous session before launching generic Xsession
Source3: wdm-Xsession
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# debian patch modified to remove the configure patching
#Patch0: http://ftp.debian.org/debian/pool/main/w/wdm/wdm_1.28-2.1.diff.gz
Patch0: wdm_1.28-2.1.diff
# use fedora background/icon and match gdm default config
Patch1: wdm-1.28-fedora.patch
# fix failsafe path and insecure use of /tmp
Patch2: wdm-1.28-failsafe_tmp.patch
# fix reconfiguration script
Patch3: wdm-1.28-reconf.patch
BuildRequires: WindowMaker-devel gettext libselinux-devel pam-devel
BuildRequires: libXt-devel libXmu-devel
BuildRequires: xrdb xterm /sbin/shutdown
Requires: xrdb xterm /sbin/shutdown
Requires: %{_sysconfdir}/pam.d
# we don't want to have new files, we reuse the kdm/xdm files
Requires: xdm xorg-x11-xinit
# we use 'include' in the pam file, so
Requires: pam >= 0.80
# reuse the images
Requires: desktop-backgrounds-basic fedora-logos
%description
wdm combines the functions of a graphical display manager identifying
and authenticating a user on a system with some of the functions of a
session manager in selecting and starting a window manager. Optionally,
wdm can shutdown (reboot or halt) the system.
wdm is a modification of XFree86's xdm package for graphically handling
authentication and system login. Most of xdm has been preserved
(XFree86 4.2.1.1) with the Login interface based on a WINGs. Tom
Rothamel's "external greet" interface (see AUTHORS) was used to
communicate wdm with wdmLogin.
In fedora, wdm may be called through a wrapper, wdm-dynwm, which determines
the available window managers using the freedesktop information and modifies
the wdm-config configuration file accordingly, before launching wdm.
%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .fedora
%patch2 -p1 -b .failsafe_tmp
%patch3 -p1 -b .reconf
%build
export DEF_SERVER='%{_bindir}/X -nolisten tcp'
export INSTALL='install -p'
%configure \
--with-pamdir=%{_sysconfdir}/pam.d \
--with-logdir=%{_localstatedir}/log \
--with-runlockdir=%{_localstatedir}/run \
--with-wdmdir=%{_sysconfdir}/wdm \
--with-nlsdir=%{_datadir}/locale \
--with-fakehome=%{_localstatedir}/run/wdm \
--with-gfxdir=%{_datadir}/pixmaps/wdm \
--with-Logo=../../backgrounds/tiles/default_blue.jpg \
--with-defuserpath='/bin:%{_bindir}' \
--with-defsystempath='/sbin:%{_sbindir}:/bin:%{_bindir}' \
--enable-selinux \
--enable-aafont
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_wdm_wmlist
# do a wdm wrapper which updates the window manager list before
# launching wdm
cat > $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm << EOF
#!/bin/sh
update_wdm_wmlist
wdm "\$@"
EOF
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm
# move the reconfiguration script to _bindir
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdmReconfig $RPM_BUILD_ROOT%{_bindir}
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdm-config
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wdm
# remove old X session script, and old XFree86 session script
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.orig
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.XFree86
# use xdm/kdm files
# first rename wdm files
for file in Xaccess Xsession Xsetup_0 GiveConsole TakeConsole; do
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file.wdm
done
# then use symlinks or wrapper
# calls /etc/X11xinit/Xsession
install -p -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession
ln -s ../X11/xdm/Xaccess $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xaccess
ln -s ../X11/xdm/Xsetup_0 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsetup_0
ln -s ../X11/xdm/GiveConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/GiveConsole
ln -s ../X11/xdm/TakeConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/TakeConsole
ln -s ../X11/xdm/Xsession $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.xorg
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog* NEWS README* TODO NASA_image_guideline.html
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pam.d/wdm
%dir %{_sysconfdir}/wdm/
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config.in
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xresources
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xservers
%config %{_sysconfdir}/wdm/GiveConsole.wdm
%config %{_sysconfdir}/wdm/TakeConsole.wdm
%config %{_sysconfdir}/wdm/Xaccess.wdm
%config %{_sysconfdir}/wdm/Xclients
%config %{_sysconfdir}/wdm/Xclients.in
%config %{_sysconfdir}/wdm/Xservers.fs
%config %{_sysconfdir}/wdm/Xservers.ws
%config %{_sysconfdir}/wdm/Xsession
%config %{_sysconfdir}/wdm/Xsession.wdm
%config %{_sysconfdir}/wdm/Xsetup_0.wdm
# links
%config %{_sysconfdir}/wdm/GiveConsole
%config %{_sysconfdir}/wdm/TakeConsole
%config %{_sysconfdir}/wdm/Xaccess
%config %{_sysconfdir}/wdm/Xsession.xorg
%config %{_sysconfdir}/wdm/Xsetup_0
%{_bindir}/wdm*
%{_bindir}/update_wdm_wmlist
%{_mandir}/man1/wdm*.1*
%{_datadir}/pixmaps/wdm/
%dir %{_localstatedir}/run/wdm
%changelog
* Thu Nov 30 2006 Patrice Dumas <pertusus@free.fr> 1.28-7
- keep timestamps for shipped files
- enable aa fonts
* Wed Nov 29 2006 Patrice Dumas <pertusus@free.fr> 1.28-6
- fix reconfiguration script
- requires pam recent enough
- don't set noreplace for scripts and example config files
* Wed Nov 29 2006 Patrice Dumas <pertusus@free.fr> 1.28-5
- fix insecure use of /tmp in original wdm script
- remove obsolete session scripts
* Sun Nov 12 2006 Patrice Dumas <pertusus@free.fr> 1.28-4
- add BR libXt-devel and libXmu-devel
* Fri Oct 20 2006 Patrice Dumas <pertusus@free.fr> 1.28-3
- correct wdm-dynwm
* Fri Oct 20 2006 Patrice Dumas <pertusus@free.fr> 1.28-2
- use images from desktop-backgrounds-basic fedora-logos
- record session style before calling the generic Xsession, and add
previous session and custom session handling.
- ship the original config files
- fix a bug in the default config files
* Thu Oct 19 2006 Patrice Dumas <pertusus@free.fr> 1.28-1
- initial packaging

File diff suppressed because it is too large Load diff