/mandos/release : revision 237.2.143

To get this branch, use:

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

« back to all changes in this revision

Viewing changes to Makefile

Committer: Teddy Hogeborn
Date: 2009-09-21 21:39:25 UTC
mto: (24.1.144 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 270.
Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng

Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

files removed:
DBUS-API

dbus-mandos.conf

debian/source

debian/source/format

mandos-ctl.xml

mandos-monitor

mandos-monitor.xml

plugins.d/plymouth.c

plugins.d/plymouth.xml

files modified:
.bzrignore

Makefile

NEWS

README

TODO

clients.conf

common.ent

debian/changelog

debian/control

debian/copyright

debian/mandos-client.README.Debian

debian/mandos.dirs

debian/mandos.docs

debian/rules

debian/watch

initramfs-tools-hook

mandos

mandos-clients.conf.xml

mandos-ctl

mandos-keygen

mandos.lsm

mandos.xml

plugin-runner.c

plugins.d/askpass-fifo.c

plugins.d/mandos-client.c

plugins.d/mandos-client.xml

plugins.d/password-prompt.c

plugins.d/password-prompt.xml

plugins.d/splashy.c

plugins.d/usplash.c

Show diffs side-by-side

added added

removed removed

Makefile

# -Wunreachable-code

#DEBUG=-ggdb3

# For info about _FORTIFY_SOURCE, see

# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>

# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC

LINK_FORTIFY_LD=-z relro -z now

LINK_FORTIFY=

# If BROKEN_PIE is set, do not build with -pie

ifndef BROKEN_PIE

FORTIFY += -fPIE

LINK_FORTIFY += -pie

endif

# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE

LINK_FORTIFY_LD=-z relro -fPIE

LINK_FORTIFY=-pie

#COVERAGE=--coverage

OPTIMIZE=-Os

LANGUAGE=-std=gnu99

htmldir=man

version=1.2

version=1.0.12

SED=sed

## Use these settings for a traditional /usr/local install

LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))

# Commands to format a DocBook <refentry> document into a manual page

DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \

DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \

--param man.charmap.use.subset 0 \

--param make.year.ranges 1 \

--param make.single.year.ranges 1 \

--param man.authors.section.enabled 0 \

/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \

$(notdir $<); \

$(MANPOST) $(notdir $@))

$(MANPOST) $(notdir $@)

# DocBook-to-man post-processing to fix a '\n' escape bug

MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'

DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \

DOCBOOKTOHTML=xsltproc --nonet --xinclude \

--param make.year.ranges 1 \

--param make.single.year.ranges 1 \

--param man.output.quietly 1 \

--param citerefentry.link 1 \

--output $@ \

/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \

$<; $(HTMLPOST) $@)

$<; $(HTMLPOST) $@

# Fix citerefentry links

HTMLPOST=$(SED) --in-place \

--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)

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

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

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

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

plugins.d/mandos-client.8mandos \

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

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

plugins.d/plymouth.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

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

133

124

legalnotice.xml

134

125

$(DOCBOOKTOHTML)

135

126

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

150

127

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

151

128

legalnotice.xml

152

129

$(DOCBOOKTOMAN)

174

151

175

152

# Update all these files with version number $(version)

176

153

common.ent: Makefile

177

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

154

$(SED) --in-place \

178

155

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

179

$@)

156

180

157

181

158

mandos: Makefile

182

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

159

$(SED) --in-place \

183

160

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

184

$@)

161

185

162

186

163

mandos-keygen: Makefile

187

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

164

$(SED) --in-place \

188

165

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

189

$@)

166

190

167

191

168

mandos-ctl: Makefile

192

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

193

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

194

$@)

195

196

mandos-monitor: Makefile

197

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

198

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

199

$@)

169

$(SED) --in-place \

170

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

171

200

172

201

173

mandos.lsm: Makefile

202

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

174

$(SED) --in-place \

203

175

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

204

$@)

205

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

176

177

$(SED) --in-place \

206

178

--expression='s/^$Entered-date:$.*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \

207

$@)

208

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

179

180

$(SED) --in-place \

209

181

--expression='s/$mandos_$[0-9.]\+$\.orig\.tar\.gz$/\1$(version)\2/' \

210

$@)

182

211

183

212

plugins.d/mandos-client: plugins.d/mandos-client.c

213

$(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\

214

) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@

184

plugins.d/mandos-client: plugins.d/mandos-client.o

185

$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \

186

$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@

215

187

216

188

.PHONY : all doc html clean distclean run-client run-server install \

217

189

install-server install-client uninstall uninstall-server \

230

202

231

203

# Run the client with a local config and key

232

204

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

233

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

234

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

235

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

236

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

237

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

238

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

239

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

240

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

241

@echo "# seteuid: Operation not permitted #"

242

@echo "# klogctl: Operation not permitted #"

243

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

244

205

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

245

206

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

246

207

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

253

214

254

215

# Run the server with a local config

255

216

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

256

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

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. #"

261

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

262

217

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

263

218

264

219

# Used by run-server

281

236

install-server: doc

282

237

install --directory $(CONFDIR)

283

238

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

288

239

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

289

240

mandos.conf

290

241

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

291

242

clients.conf

292

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

293

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

294

243

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

295

244

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

296

245

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

300

249

301

250

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

302

251

> $(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

307

252

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

308

253

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

309

254

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

336

281

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

337

282

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

338

283

plugins.d/askpass-fifo

339

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

340

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

341

plugins.d/plymouth

342

284

install initramfs-tools-hook \

343

285

$(INITRAMFSTOOLS)/hooks/mandos

344

286

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

350

292

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

351

293

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

352

294

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

295

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

296

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

353

297

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

354

298

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

355

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

356

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

357

299

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

358

300

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

359

301

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

360

302

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

361

303

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

362

304

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

363

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

364

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

365

305

366

306

install-client: install-client-nokey

367

307

# Post-installation stuff

373

313

374

314

uninstall-server:

375

315

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

376

$(PREFIX)/sbin/mandos-ctl \

377

$(PREFIX)/sbin/mandos-monitor \

378

316

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

379

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

380

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

381

317

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

382

318

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

383

319

update-rc.d -f mandos remove

395

331

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

396

332

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

397

333

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

398

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

399

334

$(INITRAMFSTOOLS)/hooks/mandos \

400

335

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

401

336

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

337

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

402

338

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

403

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

404

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

405

339

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

406

340

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

407

341

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

408

342

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

409

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

343

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

410

344

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

411

345

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

412

346

update-initramfs -k all -u

415

349

416

350

purge-server: uninstall-server

417

351

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

418

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

419

352

$(DESTDIR)/etc/default/mandos \

420

353

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

421

354

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

Older »