/mandos/trunk : revision 442

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

Committer: Teddy Hogeborn
Date: 2010-09-26 17:36:30 UTC
Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7

* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

files added:
mandos-ctl.xml

mandos-monitor.xml

plugins.d/plymouth.xml

files modified:
DBUS-API

Makefile

TODO

debian/mandos.dirs

debian/watch

mandos

mandos-clients.conf.xml

mandos-ctl

mandos-keygen

mandos-monitor

mandos.lsm

mandos.xml

plugins.d/mandos-client.c

plugins.d/plymouth.c

plugins.d/usplash.c

Show diffs side-by-side

added added

removed removed

Makefile

plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \

plugins.d/plymouth

CPROGS=plugin-runner $(PLUGINS)

PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)

DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \

PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)

DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \

mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \

plugins.d/mandos-client.8mandos \

plugins.d/password-prompt.8mandos mandos.conf.5 \

plugins.d/usplash.8mandos plugins.d/splashy.8mandos \

plugins.d/askpass-fifo.8mandos mandos-clients.conf.5

plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \

plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \

plugins.d/plymouth.8mandos

htmldocs=$(addsuffix .xhtml,$(DOCS))

132

133

legalnotice.xml

133

134

$(DOCBOOKTOHTML)

134

135

136

mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \

137

legalnotice.xml

138

$(DOCBOOKTOMAN)

139

mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \

140

legalnotice.xml

141

$(DOCBOOKTOHTML)

142

143

mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \

144

legalnotice.xml

145

$(DOCBOOKTOMAN)

146

mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \

147

legalnotice.xml

148

$(DOCBOOKTOHTML)

149

135

150

mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \

136

151

legalnotice.xml

137

152

$(DOCBOOKTOMAN)

178

193

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

179

194

$@)

180

195

196

mandos-monitor: Makefile

197

$(strip $(SED) --in-place \

198

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

199

$@)

200

181

201

mandos.lsm: Makefile

182

202

$(strip $(SED) --in-place \

183

203

--expression='s/^$Version:$.*/\1\t$(version)/' \

234

254

# Run the server with a local config

235

255

run-server: confdir/mandos.conf confdir/clients.conf

236

256

@echo "#################################################################"

237

@echo "# NOTE: Please IGNORE errors about \"No permission to bind to #"

238

@echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" - #"

239

@echo "# they are harmless and are caused by the server not running as #"

240

@echo "# root. Do NOT run \"make run-server\" server as root if you did #"

241

@echo "# not also unpack and compile it as root. #"

257

@echo "# NOTE: Please IGNORE the error about \"Could not open file #"

258

@echo "# u'/var/run/mandos.pid'\" - it is harmless and is caused by #"

259

@echo "# the server not running as root. Do NOT run \"make run-server\" #"

260

@echo "# server as root if you didn't also unpack and compile it thus. #"

242

261

@echo "#################################################################"

243

262

./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)

244

263

262

281

install-server: doc

263

282

install --directory $(CONFDIR)

264

283

install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos

284

install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \

285

mandos-ctl

286

install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \

287

mandos-monitor

265

288

install --mode=u=rw,go=r --target-directory=$(CONFDIR) \

266

289

mandos.conf

267

290

install --mode=u=rw --target-directory=$(CONFDIR) \

268

291

clients.conf

292

install --mode=u=rw,go=r dbus-mandos.conf \

293

$(DESTDIR)/etc/dbus-1/system.d/mandos.conf

269

294

install --mode=u=rwx,go=rx init.d-mandos \

270

295

$(DESTDIR)/etc/init.d/mandos

271

296

install --mode=u=rw,go=r default-mandos \

275

300

276

301

gzip --best --to-stdout mandos.8 \

277

302

> $(MANDIR)/man8/mandos.8.gz

303

gzip --best --to-stdout mandos-monitor.8 \

304

> $(MANDIR)/man8/mandos-monitor.8.gz

305

gzip --best --to-stdout mandos-ctl.8 \

306

> $(MANDIR)/man8/mandos-ctl.8.gz

278

307

gzip --best --to-stdout mandos.conf.5 \

279

308

> $(MANDIR)/man5/mandos.conf.5.gz

280

309

gzip --best --to-stdout mandos-clients.conf.5 \

321

350

> $(MANDIR)/man8/mandos-keygen.8.gz

322

351

gzip --best --to-stdout plugin-runner.8mandos \

323

352

> $(MANDIR)/man8/plugin-runner.8mandos.gz

353

gzip --best --to-stdout plugins.d/mandos-client.8mandos \

354

> $(MANDIR)/man8/mandos-client.8mandos.gz

324

355

gzip --best --to-stdout plugins.d/password-prompt.8mandos \

325

356

> $(MANDIR)/man8/password-prompt.8mandos.gz

326

gzip --best --to-stdout plugins.d/mandos-client.8mandos \

327

> $(MANDIR)/man8/mandos-client.8mandos.gz

328

357

gzip --best --to-stdout plugins.d/usplash.8mandos \

329

358

> $(MANDIR)/man8/usplash.8mandos.gz

330

359

gzip --best --to-stdout plugins.d/splashy.8mandos \

331

360

> $(MANDIR)/man8/splashy.8mandos.gz

332

361

gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \

333

362

> $(MANDIR)/man8/askpass-fifo.8mandos.gz

363

gzip --best --to-stdout plugins.d/plymouth.8mandos \

364

> $(MANDIR)/man8/plymouth.8mandos.gz

334

365

335

366

install-client: install-client-nokey

336

367

# Post-installation stuff

342

373

343

374

uninstall-server:

344

375

-rm --force $(PREFIX)/sbin/mandos \

376

$(PREFIX)/sbin/mandos-ctl \

377

$(PREFIX)/sbin/mandos-monitor \

345

378

$(MANDIR)/man8/mandos.8.gz \

379

$(MANDIR)/man8/mandos-monitor.8.gz \

380

$(MANDIR)/man8/mandos-ctl.8.gz \

346

381

$(MANDIR)/man5/mandos.conf.5.gz \

347

382

$(MANDIR)/man5/mandos-clients.conf.5.gz

348

383

update-rc.d -f mandos remove

364

399

$(INITRAMFSTOOLS)/hooks/mandos \

365

400

$(INITRAMFSTOOLS)/conf-hooks.d/mandos \

366

401

$(INITRAMFSTOOLS)/scripts/init-premount/mandos \

402

$(MANDIR)/man8/mandos-keygen.8.gz \

367

403

$(MANDIR)/man8/plugin-runner.8mandos.gz \

368

$(MANDIR)/man8/mandos-keygen.8.gz \

404

$(MANDIR)/man8/mandos-client.8mandos.gz

369

405

$(MANDIR)/man8/password-prompt.8mandos.gz \

370

406

$(MANDIR)/man8/usplash.8mandos.gz \

371

407

$(MANDIR)/man8/splashy.8mandos.gz \

372

408

$(MANDIR)/man8/askpass-fifo.8mandos.gz \

373

$(MANDIR)/man8/mandos-client.8mandos.gz

409

$(MANDIR)/man8/plymouth.8mandos.gz \

374

410

-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \

375

411

$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)

376

412

update-initramfs -k all -u

379

415

380

416

purge-server: uninstall-server

381

417

-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \

418

$(DESTDIR)/etc/dbus-1/system.d/mandos.conf

382

419

$(DESTDIR)/etc/default/mandos \

383

420

$(DESTDIR)/etc/init.d/mandos \

384

421

$(DESTDIR)/var/run/mandos.pid

Older »