/mandos/trunk : revision 1204

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 at recompile
Date: 2020-02-08 14:01:38 UTC
Revision ID: teddy@recompile.se-20200208140138-h3ett0amdelfpt90

mandos: If possible, use shlex.quote() instead of re.escape()

* mandos: Make sure shlex.quote() exists (falling back to assigning
re.escape to it).
(Client.start_checker): Use shlex.quote() instead of re.escape().

Show diffs side-by-side

added added

removed removed

Makefile

LANGUAGE:=-std=gnu11

FEATURES:=-D_FILE_OFFSET_BITS=64

htmldir:=man

version:=1.8.7

version:=1.8.9

SED:=sed

PKG_CONFIG?=pkg-config

156

157

objects:=$(addsuffix .o,$(CPROGS))

158

159

.PHONY: all

159

160

all: $(PROGS) mandos.lsm

160

161

162

.PHONY: doc

161

163

doc: $(DOCS)

162

164

165

.PHONY: html

163

166

html: $(htmldocs)

164

167

165

168

%.5: %.xml common.ent legalnotice.xml

282

285

$@)

283

286

284

287

# Need to add the GnuTLS, Avahi and GPGME libraries

285

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

286

$(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\

287

) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\

288

) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\

289

) $(LDLIBS) -o $@

288

plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \

289

) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)

290

plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \

291

) $(AVAHI_LIBS) $(GPGME_LIBS)

290

292

291

293

# Need to add the libnl-route library

292

plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c

293

$(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\

294

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

294

plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)

295

plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)

295

296

297

# Need to add the GLib and pthread libraries

297

dracut-module/password-agent: dracut-module/password-agent.c

298

$(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\

299

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

300

301

.PHONY : all doc html clean distclean mostlyclean maintainer-clean \

302

check run-client run-server install install-html \

303

install-server install-client-nokey install-client uninstall \

304

uninstall-server uninstall-client purge purge-server \

305

purge-client

306

298

dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)

299

dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread

300

301

.PHONY: clean

307

302

clean:

308

303

-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core

309

304

305

.PHONY: distclean

310

306

distclean: clean

307

.PHONY: mostlyclean

311

308

mostlyclean: clean

309

.PHONY: maintainer-clean

312

310

maintainer-clean: clean

313

311

-rm --force --recursive keydir confdir statedir

314

312

313

.PHONY: check

315

314

check: all

316

315

./mandos --check

317

316

./mandos-ctl --check

321

320

./dracut-module/password-agent --test

322

321

323

322

# Run the client with a local config and key

323

.PHONY: run-client

324

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

325

keydir/tls-privkey.pem keydir/tls-pubkey.pem

326

@echo '######################################################'

356

./mandos-keygen --dir keydir --force

357

358

# Run the server with a local config

359

.PHONY: run-server

359

360

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

360

361

./mandos --debug --no-dbus --configdir=confdir \

361

362

--statedir=statedir $(SERVERARGS)

372

373

statedir:

373

374

install --directory statedir

374

375

376

.PHONY: install

375

377

install: install-server install-client-nokey

376

378

379

.PHONY: install-html

377

380

install-html: html

378

381

install --directory $(htmldir)

379

382

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

380

383

$(htmldocs)

381

384

385

.PHONY: install-server

382

386

install-server: doc

383

387

install --directory $(CONFDIR)

384

388

if install --directory --mode=u=rwx --owner=$(USER) \

431

435

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

432

436

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

433

437

438

.PHONY: install-client-nokey

434

439

install-client-nokey: all doc

435

440

install --directory $(LIBDIR)/mandos $(CONFDIR)

436

441

install --directory --mode=u=rwx $(KEYDIR) \

515

520

gzip --best --to-stdout dracut-module/password-agent.8mandos \

516

521

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

517

522

523

.PHONY: install-client

518

524

install-client: install-client-nokey

519

525

# Post-installation stuff

520

526

-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"

530

536

531

537

echo "Now run mandos-keygen --password --dir $(KEYDIR)"

532

538

539

.PHONY: uninstall

533

540

uninstall: uninstall-server uninstall-client

534

541

542

.PHONY: uninstall-server

535

543

uninstall-server:

536

544

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

537

545

$(PREFIX)/sbin/mandos-ctl \

544

552

update-rc.d -f mandos remove

545

553

-rmdir $(CONFDIR)

546

554

555

.PHONY: uninstall-client

547

556

uninstall-client:

548

557

# Refuse to uninstall client if /etc/crypttab is explicitly configured

549

558

# to use it.

585

594

done; \

586

595

587

596

597

.PHONY: purge

588

598

purge: purge-server purge-client

589

599

600

.PHONY: purge-server

590

601

purge-server: uninstall-server

591

602

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

592

603

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

597

608

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

598

609

-rmdir $(CONFDIR)

599

610

611

.PHONY: purge-client

600

612

purge-client: uninstall-client

601

613

-shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem

602

614

-rm --force $(CONFDIR)/plugin-runner.conf \

Older »