~ubuntu-branches/ubuntu/wily/wdm/wily-proposed : revision 13

1

Description: Upstream changes introduced in version 1.28-7

2

This patch has been created by dpkg-source during the package build.

3

Here's the last changelog entry, hopefully it gives details on why

4

those changes were made:

5

.

6

wdm (1.28-7) unstable; urgency=low

7

.

8

* QA upload

9

* Changed build-dependency on libjpeg62-dev to libjpeg-dev (closes: #634642)

10

* Migrate to source format 3.0 (quilt):

11

- add debian/source/format

12

- drop build-dependency on dpatch

13

- drop all patching/unpatching from debian/rules

14

- drop touching of configure since quilt patching now does it for us

15

.

16

The person named in the Author field signed this changelog entry.

17

Author: Ralf Treinen <treinen@debian.org>

18

Bug-Debian: http://bugs.debian.org/634642

19

20

---

21

The information above should follow the Patch Tagging Guidelines, please

22

checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here

23

are templates for supplementary fields that you might want to add:

24

25

Origin: <vendor|upstream|other>, <url of original patch>

26

Bug: <url in upstream bugtracker>

27

Bug-Debian: http://bugs.debian.org/<bugnumber>

28

Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>

29

Forwarded: <no|not-needed|url proving that it has been forwarded>

30

Reviewed-By: <name and email of someone who approved the patch>

31

Last-Update: <YYYY-MM-DD>

32

33

--- wdm-1.28.orig/configure.ac

34

+++ wdm-1.28/configure.ac

35

@@ -140,7 +140,7 @@ AC_ARG_ENABLE(debug,

36

AC_PATH_XTRA

37

XCFLAGS="$X_CFLAGS"

38

XLDFLAGS="$X_LIBS"

39

-XLIBS="$X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS"

40

+XLIBS="$X_PRE_LIBS -lXext -lX11 -lXft -lm $X_EXTRA_LIBS"

41

42

AC_ARG_ENABLE(xinerama,

43

AC_HELP_STRING([--disable-xinerama],[explicit disable use of libXinerama]))

44

--- wdm-1.28.orig/configure

45

+++ wdm-1.28/configure

46

@@ -6226,7 +6226,7 @@ fi

47

48

XCFLAGS="$X_CFLAGS"

49

XLDFLAGS="$X_LIBS"

50

-XLIBS="$X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS"

51

+XLIBS="$X_PRE_LIBS -lXext -lX11 -lXft -lm $X_EXTRA_LIBS"

52

53

# Check whether --enable-xinerama or --disable-xinerama was given.

54

if test "${enable_xinerama+set}" = set; then

55

--- wdm-1.28.orig/Makefile.in

56

+++ wdm-1.28/Makefile.in

57

@@ -14,7 +14,7 @@ XLDFLAGS = @XLDFLAGS@

58

XLIBS = @XLIBS@

59

WCFLAGS = @WCFLAGS@

60

WLDFLAGS = @WLDFLAGS@

61

-WLIBS = @WLIBS@

62

+WLIBS = @WLIBS@ -lfontconfig

63

SELINUX_CFLAGS = @SELINUX_CFLAGS@

64

SELINUX_LIBS = @SELINUX_LIBS@

65

PASSWDLIB = @PASSWDLIB@

66

@@ -35,23 +35,23 @@ libs = $(LIBS) -lwdm

67

68

wdmLogin_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS)

69

wdmLogin_ldflags = $(ldflags) $(XLDFLAGS) $(WLDFLAGS)

70

-wdmLogin_libs = $(libs) $(XLIBS) $(WLIBS)

71

+wdmLogin_libs = $(WLIBS) $(libs) $(XLIBS)

72

73

wdmPrefs_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS)

74

wdmPrefs_ldflags = $(ldflags) $(XLDFLAGS) $(WLDFLAGS)

75

-wdmPrefs_libs = $(libs) $(XLIBS) $(WLIBS)

76

+wdmPrefs_libs = $(WLIBS) $(libs) $(XLIBS)

77

78

wdmChooser_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS)

79

wdmChooser_ldflags = $(ldflags) $(XLDFLAGS) $(WLDFLAGS)

80

-wdmChooser_libs = $(libs) $(XLIBS) $(WLIBS)

81

+wdmChooser_libs = $(WLIBS) $(libs) $(XLIBS)

82

83

TestLogin_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS)

84

TestLogin_ldflags = $(ldflags) $(XLDFLAGS) $(WLDFLAGS)

85

-TestLogin_libs = $(libs) $(XLIBS) $(WLIBS)

86

+TestLogin_libs = $(WLIBS) $(libs) $(XLIBS)

87

88

wdm_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS) $(SELINUX_CFLAGS)

89

wdm_ldflags = $(ldflags) $(XLDFLAGS) $(WLDFLAGS)

90

-wdm_libs = $(libs) $(XLIBS) $(WLIBS) $(PASSWDLIB) $(SELINUX_LIBS) \

91

+wdm_libs = $(WLIBS) $(libs) $(XLIBS) $(PASSWDLIB) $(SELINUX_LIBS) \

92

-lXmu -lXau -lXdmcp

93

94

libwdm_cflags = $(cflags) $(XCFLAGS) $(WCFLAGS)

95

@@ -94,7 +94,7 @@ $(DESTDIR)$(DMDIR)/authdir:

96

97

all-doc: doc/wdm.man

98

99

-all-nls-yes: po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo

100

+all-nls-yes: po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo

101

102

all-nls-no:

103

104

@@ -102,7 +102,7 @@ install-doc: $(DESTDIR)$(MANDIR)/man1/wd

105

106

install-gfx: $(DESTDIR)$(GFXDIR)/Eagle.xpm $(DESTDIR)$(GFXDIR)/Earth.jpg $(DESTDIR)$(GFXDIR)/Earth200x130.xpm $(DESTDIR)$(GFXDIR)/GnuLinux-logo.jpg $(DESTDIR)$(GFXDIR)/Stars.jpg $(DESTDIR)$(GFXDIR)/StarsLogo.jpg $(DESTDIR)$(GFXDIR)/gnuLogo.xpm

107

108

-install-nls-yes: $(DESTDIR)$(NLSDIR)/cs/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/cy/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/en/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/es/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/fr_FR/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo

109

+install-nls-yes: $(DESTDIR)$(NLSDIR)/cs/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/cy/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/de/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/en/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/es/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/fr/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo

110

111

install-nls-no:

112

113

@@ -327,12 +327,12 @@ $(DESTDIR)$(NLSDIR)/es/LC_MESSAGES/wdm.m

114

$(INSTALL) -d $(@D)

115

$(INSTALL_DATA) po/es.mo $@

116

117

-po/fr_FR.mo: po/fr_FR.po

118

- $(msgfmt) -o $@ po/fr_FR.po

119

+po/fr.mo: po/fr.po

120

+ $(msgfmt) -o $@ po/fr.po

121

122

-$(DESTDIR)$(NLSDIR)/fr_FR/LC_MESSAGES/wdm.mo: po/fr_FR.mo

123

+$(DESTDIR)$(NLSDIR)/fr/LC_MESSAGES/wdm.mo: po/fr.mo

124

$(INSTALL) -d $(@D)

125

- $(INSTALL_DATA) po/fr_FR.mo $@

126

+ $(INSTALL_DATA) po/fr.mo $@

127

128

po/ja.mo: po/ja.po

129

$(msgfmt) -o $@ po/ja.po

130

@@ -456,10 +456,10 @@ $(DESTDIR)$(DMDIR)/Xclients.in: configs/

131

132

133

clean:

134

- rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a

135

+ rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a

136

137

distclean:

138

- rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr_FR.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs config.status config.log include/config.h include/gnuLogo.xpm Makefile

139

+ rm -f src/TestLogin/TestLogin.o src/chooser.o src/libwdm/debug.o src/libwdm/environment.o src/libwdm/names.o src/libwdm/plcheckers.o src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/file.o src/wdm/genauth.o src/wdm/loghelpers.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o src/wdmChooser/chooser.o src/wdmLogin/Login.o src/wdmLogin/config.o src/wdmPrefs/prefs.o src/wdmPrefs/testPanel.o src/wdmPrefs/testPanel2.o configs/Xclients configs/Xservers configs/Xservers.ws configs/Xsession configs/Xsetup_0 configs/wdm-config configs/wdmReconfig po/cs.mo po/cy.mo po/de.mo po/en.mo po/es.mo po/fr.mo po/ja.mo po/ru.mo doc/wdm.man bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs bin/libwdm.a bin/TestLogin bin/wdm bin/wdmChooser bin/wdmLogin bin/wdmPrefs config.status config.log include/config.h include/gnuLogo.xpm Makefile

140

if test -e bin; then rmdir bin; fi

141

142

po/wdm.pot: src/TestLogin/TestLogin.c src/chooser.c src/libwdm/debug.c src/libwdm/environment.c src/libwdm/names.c src/libwdm/plcheckers.c src/wdm/Greet.c src/wdm/access.c src/wdm/auth.c src/wdm/choose.c src/wdm/daemon.c src/wdm/dm.c src/wdm/dpylist.c src/wdm/file.c src/wdm/genauth.c src/wdm/loghelpers.c src/wdm/mitauth.c src/wdm/netaddr.c src/wdm/policy.c src/wdm/protodpy.c src/wdm/reset.c src/wdm/resource.c src/wdm/server.c src/wdm/session.c src/wdm/socket.c src/wdm/util.c src/wdm/verify.c src/wdm/xdmcp.c src/wdmChooser/chooser.c src/wdmLogin/Login.c src/wdmLogin/config.c src/wdmPrefs/prefs.c src/wdmPrefs/testPanel.c src/wdmPrefs/testPanel2.c

143

--- /dev/null

144

+++ wdm-1.28/po/fr.po

145

@@ -0,0 +1,180 @@

146

147

+#

148

+# This program is free software; you can redistribute it and/or

149

+# modify it under the terms of the GNU General Public License

150

+# as published by the Free Software Foundation; either version 2

151

+# of the License, or (at your option) any later version.

152

+#

153

+# This program is distributed in the hope that it will be useful,

154

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

155

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

156

+# GNU General Public License for more details.

157

+#

158

+# You should have received a copy of the GNU General Public License

159

+# along with this program; if not, write to the Free Software

160

+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

161

+msgid ""

162

+msgstr ""

163

+"Project-Id-Version: wdm 1.25\n"

164

+"POT-Creation-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"

165

+"PO-Revision-Date: Fri, 14 Nov 2003 09:03:15 +0100\n"

166

+"Last-Translator: Mathieu Roy\n"

167

+"MIME-Version: 1.0\n"

168

+"Content-Type: text/plain; charset=iso-8859-1\n"

169

+"Content-Transfer-Encoding: 8bit\n"

170

+

171

+#: src/wdmLogin/Login.c:70

172

+msgid "no help available."

173

+msgstr ""

174

+"wdm is a graphical interface used to authenticate a user to the system and "

175

+"perform the login process.\n"

176

+"\n"

177

+"\n"

178

+"Enter your user name (userid) at the prompt and press <enter>. The panel "

179

+"will then present a prompt to enter your password. Enter the password and "

180

+"press <enter>.\n"

181

+"\n"

182

+"\n"

183

+"The login will then be performed and your window manager started.\n"

184

+"\n"

185

+"\n"

186

+"The Start WM PopUp selection specifies the parameter to pass to Xsession to "

187

+"start the window manager.\n"

188

+"\n"

189

+"\n"

190

+"NoChange will start the same window manager the user used for their last "

191

+"session.\n"

192

+"\n"

193

+"\n"

194

+"failsafe is a simple xterm session and the other listed options will start "

195

+"the indicated (installation specific) window manager.\n"

196

+"\n"

197

+"\n"

198

+"The Options PopUp selection specifies:\n"

199

+"\n"

200

+" Login - logon to the system\n"

201

+"\n"

202

+" Reboot - shutdown and reboot the system\n"

203

+"\n"

204

+" Halt - shutdown the system and halt\n"

205

+"\n"

206

+" ExitLogin - exit the display manager\n"

207

+"\n"

208

+"\n"

209

+"The installation may require a valid username and password or username=root "

210

+"and root's password to perform Reboot, Halt or Exit.\n"

211

+"\n"

212

+"\n"

213

+"NOTE: ExitLogin (or, as it is sometimes refered to: exit) is intended for "

214

+"use primarily in wdm testing. It will shut down the x-server but the wdm "

215

+"must be terminated by other means. Starting wdm as a detached process will "

216

+"result that it will be very difficult to terminate.\n"

217

+"\n"

218

+"\n"

219

+"ExitLogin performs the same operation as ctrl-r does for xdm.\n"

220

+"\n"

221

+"\n"

222

+"1. The StartOver button will erase the current login Information and begin "

223

+"the login process again.\n"

224

+"\n"

225

+"\n"

226

+"2. See the man page for additional information on configuring this package. "

227

+"There are numerous options for setting the background color or pixmap, the "

228

+"LoginPanel logo, the selection of window managers to start, and the login "

229

+"verification for Reboot, halt and exit."

230

+

231

+#: src/wdmLogin/Login.c:114

232

+msgid "Login"

233

+msgstr "Ouvrir une session"

234

+

235

+#: src/wdmLogin/Login.c:114

236

+msgid "Reboot"

237

+msgstr "Red�marrer"

238

+

239

+#: src/wdmLogin/Login.c:114

240

+msgid "Halt"

241

+msgstr "Arr�ter le syst�me"

242

+

243

+#: src/wdmLogin/Login.c:115

244

+msgid "ExitLogin"

245

+msgstr ""

246

+

247

+#: src/wdmLogin/Login.c:118

248

+msgid "Login failed"

249

+msgstr "�chec de l'ouverture de session"

250

+

251

+#: src/wdmLogin/Login.c:118

252

+msgid "Reboot failed"

253

+msgstr "�chec du red�marrage"

254

+

255

+#: src/wdmLogin/Login.c:119

256

+msgid "Halt failed"

257

+msgstr "�chec de l'arr�t"

258

+

259

+#: src/wdmLogin/Login.c:119

260

+msgid "ExitLogin failed"

261

+msgstr ""

262

+

263

+#: src/wdmLogin/Login.c:279

264

+msgid "NoChange"

265

+msgstr "Habituel"

266

+

267

+#: src/wdmLogin/Login.c:298

268

+msgid "failsafe"

269

+msgstr "Sans �chec"

270

+

271

+#: src/wdmLogin/Login.c:376

272

+msgid "ERROR"

273

+msgstr "Erreur"

274

+

275

+#: src/wdmLogin/Login.c:435

276

+msgid "Password:"

277

+msgstr "Mot-de-passe :"

278

+

279

+#: src/wdmLogin/Login.c:443 src/wdmLogin/Login.c:772

280

+msgid "Login name:"

281

+msgstr "Nom d'utilisateur :"

282

+

283

+#: src/wdmLogin/Login.c:474

284

+msgid "invalid name"

285

+msgstr "nom invalide"

286

+

287

+#: src/wdmLogin/Login.c:496

288

+msgid "validating"

289

+msgstr "validation"

290

+

291

+#: src/wdmLogin/Login.c:498 src/wdmLogin/Login.c:529

292

+msgid "exiting"

293

+msgstr "exit"

294

+

295

+#: src/wdmLogin/Login.c:547

296

+msgid "Close Help"

297

+msgstr "Sans aide"

298

+

299

+#: src/wdmLogin/Login.c:554 src/wdmLogin/Login.c:866

300

+msgid "Help"

301

+msgstr "Aide"

302

+

303

+#: src/wdmLogin/Login.c:720

304

+msgid "Login Authentication"

305

+msgstr "Authentification"

306

+

307

+#: src/wdmLogin/Login.c:729

308

+msgid "Welcome to"

309

+msgstr "Bienvenue sur"

310

+

311

+#: src/wdmLogin/Login.c:816

312

+msgid "Start WM"

313

+msgstr "D�marre l'environement"

314

+

315

+#: src/wdmLogin/Login.c:834

316

+msgid "Options"

317

+msgstr "Options"

318

+

319

+#: src/wdmLogin/Login.c:874

320

+msgid "Start Over"

321

+msgstr "Annuler"

322

+

323

+#: src/wdmLogin/Login.c:881

324

+msgid "Go!"

325

+msgstr "Hop !"

326

--- wdm-1.28.orig/etc/Howto.conf.in

327

+++ wdm-1.28/etc/Howto.conf.in

328

@@ -14,7 +14,7 @@ XLDFLAGS = @XLDFLAGS@;

329

XLIBS = @XLIBS@;

330

WCFLAGS = @WCFLAGS@;

331

WLDFLAGS = @WLDFLAGS@;

332

-WLIBS = @WLIBS@;

333

+WLIBS = @WLIBS@ -lfontconfig;

334

SELINUX_CFLAGS = @SELINUX_CFLAGS@;

335

SELINUX_LIBS = @SELINUX_LIBS@;

336

PASSWDLIB = @PASSWDLIB@;

337

@@ -35,23 +35,23 @@ libs = [LIBS] -lwdm;

338

339

wdmLogin_cflags = [cflags] [XCFLAGS] [WCFLAGS];

340

wdmLogin_ldflags = [ldflags] [XLDFLAGS] [WLDFLAGS];

341

-wdmLogin_libs = [libs] [XLIBS] [WLIBS];

342

+wdmLogin_libs = [WLIBS] [libs] [XLIBS];

343

344

wdmPrefs_cflags = [cflags] [XCFLAGS] [WCFLAGS];

345

wdmPrefs_ldflags = [ldflags] [XLDFLAGS] [WLDFLAGS];

346

-wdmPrefs_libs = [libs] [XLIBS] [WLIBS];

347

+wdmPrefs_libs = [WLIBS] [libs] [XLIBS];

348

349

wdmChooser_cflags = [cflags] [XCFLAGS] [WCFLAGS];

350

wdmChooser_ldflags = [ldflags] [XLDFLAGS] [WLDFLAGS];

351

-wdmChooser_libs = [libs] [XLIBS] [WLIBS];

352

+wdmChooser_libs = [WLIBS] [libs] [XLIBS] -lfontconfig;

353

354

TestLogin_cflags = [cflags] [XCFLAGS] [WCFLAGS];

355

TestLogin_ldflags = [ldflags] [XLDFLAGS] [WLDFLAGS];

356

-TestLogin_libs = [libs] [XLIBS] [WLIBS];

357

+TestLogin_libs = [WLIBS] [libs] [XLIBS];

358

359

wdm_cflags = [cflags] [XCFLAGS] [WCFLAGS] [SELINUX_CFLAGS];

360

wdm_ldflags = [ldflags] [XLDFLAGS] [WLDFLAGS];

361

-wdm_libs = [libs] [XLIBS] [WLIBS] [PASSWDLIB] [SELINUX_LIBS] \

362

+wdm_libs = [WLIBS] [libs] [XLIBS] [PASSWDLIB] [SELINUX_LIBS] \

363

-lXmu -lXau -lXdmcp;

364

365

libwdm_cflags = [cflags] [XCFLAGS] [WCFLAGS];

366

--- wdm-1.28.orig/src/wdmLogin/Login.c

367

+++ wdm-1.28/src/wdmLogin/Login.c

368

@@ -1190,6 +1190,9 @@ setBG(WMScreen * scr)

369

rattr.render_mode = render_mode;

370

rattr.colors_per_channel = cpc;

371

/* use of scr->screen is temporary hack */

372

+ rattr.flags |= RC_VisualID;

373

+ rattr.visualid = DefaultVisual(WMScreenDisplay(scr), scr->screen)->visualid;

374

+

375

rcontext = RCreateContext(WMScreenDisplay(scr), scr->screen, &rattr);

376

if(rcontext == NULL)

377

{

378

--- wdm-1.28.orig/src/wdm/Greet.c

379

+++ wdm-1.28/src/wdm/Greet.c

380

@@ -134,7 +134,8 @@ extern char *wdmCursorTheme;

381

extern int wdmXineramaHead;

382

383

static int pipe_filedes[2];

384

-static char name[128], password[128];

385

+#define CREDENTIAL_LEN 258

386

+static char name[CREDENTIAL_LEN], password[CREDENTIAL_LEN];

387

static char xsessionArg[256], exitArg[256];

388

389

struct display *Save_d=NULL;

390

@@ -280,6 +281,8 @@ static int Greet (struct display *d, str

391

{

392

int code = 0, done = 0, extension_code=0;

393

394

+ memset(name, 0, CREDENTIAL_LEN );

395

+ memset(password, 0, CREDENTIAL_LEN);

396

readstring(pipe_filedes[0], name); /* username */

397

readstring(pipe_filedes[0], password);

398

399

--- wdm-1.28.orig/src/wdm/daemon.c

400

+++ wdm-1.28/src/wdm/daemon.c

401

@@ -41,7 +41,7 @@ from The Open Group.

402

#include <sys/ioctl.h>

403

#endif

404

#if defined(__osf__) || defined(linux) || defined(__GNU__) || defined(__CYGWIN__) \

405

- || (defined(IRIX) && !defined(_IRIX4))

406

+ || (defined(IRIX) && !defined(_IRIX4)) || defined(__GLIBC__)

407

#define setpgrp setpgid

408

#endif

409

#ifdef hpux

410

--- wdm-1.28.orig/doc/wdm.man.in

411

+++ wdm-1.28/doc/wdm.man.in

412

@@ -7,7 +7,7 @@ wdm \- WINGs Display Manager

413

\fBwdm\fP is an X display manager based on the original X11

414

X Display Manager (xdm).

415

It features numerous functionality improvements, including the ability

416

- to reboot or halt the machine (once

417

+to reboot or halt the machine (once

418

the proper password has been supplied) and to select from a list of available

419

X sessions to start. The look of the login panel is

420

somewhat configurable, too.

421

@@ -42,11 +42,11 @@ Specifies the value for the \fBDisplayMa

422

resource. This is factility to use with all messages if log is

423

redirected to syslog.

424

.IP "\fB\-usesyslog\fP"

425

-Specifies ``true'' as the value for the \fBDisplayManager.useSyslog\dP

426

+Specifies ``true'' as the value for the \fBDisplayManager.useSyslog\fP

427

resource. This will force all messages go to syslog with facility

428

specified by \fBDisplayManager.syslogFacility\fP resource.

429

.IP "\fB\-useerrfile\fP"

430

-Specifies ``false'' as the value for the \fBDisplayManager.useSyslog\dP

431

+Specifies ``false'' as the value for the \fBDisplayManager.useSyslog\fP

432

resource. This will force all messages go to log file

433

specified by \fBDisplayManager.errorLogFile\fP resource.

434

.IP "\fB\-resources\fP \fIresource_file\fP"