/mandos/trunk : revision 417

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-05 20:19:02 UTC
mfrom: (416.1.2 mandos)
Revision ID: teddy@fukt.bsnet.se-20100905201902-ivwsc01ecaaqlqg4

* mandos (AvahiService.entry_group_state_changed): Better debug log
                                                   message.
  (AvahiService.server_state_changed): Added debug log message.

* mandos-monitor (isoformat_to_datetime): New function.
  (MandosClientWidget): Show a countdown to disabling if last checker
                        failed.

Show diffs side-by-side

added added

removed removed

Makefile

--expression='s/$<a class="citerefentry" href="$$"><span class="citerefentry"><span class="refentrytitle">$$[^<]*$$<\/span>($$[^)]*$$)<\/span><\/a>$/\1\3.\5\2\3\4\5\6/g'

PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \

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

plugins.d/plymouth

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

CPROGS=plugin-runner $(PLUGINS)

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

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

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

mandos-monitor.8 \

plugins.d/mandos-client.8mandos \

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

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

133

131

legalnotice.xml

134

132

$(DOCBOOKTOHTML)

135

133

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

134

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

144

135

legalnotice.xml

145

136

$(DOCBOOKTOMAN)

186

177

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

187

178

$@)

188

179

189

mandos-monitor: Makefile

190

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

191

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

192

$@)

193

194

180

mandos.lsm: Makefile

195

181

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

196

182

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

223

209

224

210

# Run the client with a local config and key

225

211

run-client: all keydir/seckey.txt keydir/pubkey.txt

226

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

227

@echo "# The following error messages are harmless and can be safely #"

228

@echo "# ignored. The messages are caused by not running as root, but #"

229

@echo "# you should NOT run \"make run-client\" as root unless you also #"

230

@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"

231

@echo "# From plugin-runner: setuid: Operation not permitted #"

232

@echo "# From askpass-fifo: mkfifo: Permission denied #"

233

@echo "# From mandos-client: setuid: Operation not permitted #"

234

@echo "# seteuid: Operation not permitted #"

235

@echo "# klogctl: Operation not permitted #"

236

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

237

212

./plugin-runner --plugin-dir=plugins.d \

238

213

--config-file=plugin-runner.conf \

239

214

--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \

246

221

247

222

# Run the server with a local config

248

223

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

249

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

250

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

251

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

252

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

253

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

254

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

255

224

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

256

225

257

226

# Used by run-server

274

243

install-server: doc

275

244

install --directory $(CONFDIR)

276

245

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

277

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

278

mandos-ctl

279

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

280

mandos-monitor

281

246

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

282

247

mandos.conf

283

248

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

284

249

clients.conf

285

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

286

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

287

250

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

288

251

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

289

252

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

325

288

install --mode=u=rwxs,go=rx \

326

289

--target-directory=$(PREFIX)/lib/mandos/plugins.d \

327

290

plugins.d/askpass-fifo

328

install --mode=u=rwxs,go=rx \

329

--target-directory=$(PREFIX)/lib/mandos/plugins.d \

330

plugins.d/plymouth

331

291

install initramfs-tools-hook \

332

292

$(INITRAMFSTOOLS)/hooks/mandos

333

293

install --mode=u=rw,go=r initramfs-tools-hook-conf \

360

320

361

321

uninstall-server:

362

322

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

363

$(PREFIX)/sbin/mandos-ctl \

364

$(PREFIX)/sbin/mandos-monitor \

365

323

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

366

324

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

367

325

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

380

338

$(PREFIX)/lib/mandos/plugins.d/usplash \

381

339

$(PREFIX)/lib/mandos/plugins.d/splashy \

382

340

$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \

383

$(PREFIX)/lib/mandos/plugins.d/plymouth \

384

341

$(INITRAMFSTOOLS)/hooks/mandos \

385

342

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

386

343

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

399

356

400

357

purge-server: uninstall-server

401

358

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

402

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

403

359

$(DESTDIR)/etc/default/mandos \

404

360

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

405

361

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

Older »