/mandos/trunk : revision 38

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: 2008-08-03 01:09:36 UTC
mfrom: (24.1.9 mandos)
Revision ID: teddy@fukt.bsnet.se-20080803010936-ujme8tgxceszfbi1

* plugbasedclient.c (main): New "--userid" and "--groupid" options.
                            Take an additional non-option argument and
                            parse it as a plus-separated and -prefixed
                            list of additional options.

* plugins.d/mandosclient.c (DH_BITS): Replaced with
                                      "mandos_context.dh_bits".  All
                                      users changed.
  (certdir): Renamed to "keydir".  All users changed.
  (certfile): Renamed to "pubkeyfile".  All users changed.
  (certkey): Renamed to "seckeyfile".  All users changed.
  (encrypted_session): Replaced with "mandos_context".  All users
                       changed.
  (initgnutls): Take additional "session" and "dh_params" arguments.
                All callers changed.
  (start_mandos_communication): Take additional "mc" argument.  All
                                callers changed.  Print target IPv6
                                address if different than supplied
                                string.
  (simple_poll) Replaced with "mandos_context.simple_poll".  All users
                changed.
  (server): Replaced with "mandos_context.server".  All users changed.
  (main): Default interface to "eth0".  Rename "--certdir" to
          "--keydir", "--certkey" to "--seckey", and "--certfile" to
          "--pubkey".  New options "--dh-bits" and "--priority".  If
          the interface is not up, bring it up.

files added:
ca.pem

cert.pem

client-cert.pem

client-key.pem

crl.pem

key.pem

files removed:
COPYING

initramfs-tools-hook

initramfs-tools-hook-conf

initramfs-tools-script

mandos-clients.conf.xml

mandos-keygen

mandos.conf.xml

mandos.xml

network-protocol.txt

plugin-runner.xml

plugins.d/password-prompt.xml

plugins.d/password-request.xml

plugins.d/usplash

files renamed:
plugin-runner.c => plugbasedclient.c

plugins.d/password-request.c => plugins.d/mandosclient.c

plugins.d/password-prompt.c => plugins.d/passprompt.c

mandos.conf => server.conf

mandos => server.py

files modified:
Makefile

TODO

clients.conf

Show diffs side-by-side

added added

removed removed

Makefile

WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \

-Wswitch-default -Wswitch-enum -Wunused-parameter \

-Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \

-Wunsafe-loop-optimizations -Wpointer-arith \

-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \

-Wconversion -Wstrict-prototypes -Wold-style-definition \

-Wpacked -Wnested-externs -Wunreachable-code -Winline \

-Wvolatile-register-var

WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-parameter -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow -Wunsafe-loop-optimizations -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wold-style-definition -Wpacked -Wnested-externs -Wunreachable-code -Winline -Wvolatile-register-var

DEBUG=-ggdb3

# For info about _FORTIFY_SOURCE, see

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

#COVERAGE=--coverage

OPTIMIZE=-Os

LANGUAGE=-std=gnu99

# PREFIX=/usr/local

PREFIX=/usr

# CONFDIR=/usr/local/lib/mandos

CONFDIR=/etc/mandos

# MANDIR=/usr/local/man

MANDIR=/usr/share/man

# Do not change these two

CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)

LDFLAGS=$(COVERAGE)

DOCBOOKTOMAN=xsltproc --nonet \

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

--param make.year.ranges 1 \

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

--param man.output.quietly 1 \

--param man.authors.section.enabled 0

PLUGINS=plugins.d/password-prompt plugins.d/password-request

PROGS=plugin-runner $(PLUGINS)

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

plugins.d/password-request.8mandos \

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

mandos-clients.conf.5

PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt

objects=$(shell for p in $(PROGS); do echo $${p}.o; done)

all: $(PROGS)

doc: $(DOCS)

%.5: %.xml

cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)

%.8: %.xml

cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)

%.8mandos: %.xml

cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)

plugin-runner: plugin-runner.o

plugbasedclient: plugbasedclient.o

$(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@

plugins.d/password-request: plugins.d/password-request.o

$(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \

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

plugins.d/mandosclient: plugins.d/mandosclient.o

$(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@

plugins.d/password-prompt: plugins.d/password-prompt.o

plugins.d/passprompt: plugins.d/passprompt.o

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

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

install-server install-client uninstall uninstall-server \

uninstall-client purge purge-server purge-client

.PHONY : clean

clean:

-rm --force $(PROGS) $(objects) $(DOCS) core

distclean: clean

mostlyclean: clean

maintainer-clean: clean

-rm --force --recursive keydir

check:

./mandos --check

run-client: all

-mkdir keydir

-./mandos-keygen --dir keydir

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

--options-for=password-request:--keydir=keydir

run-server:

./mandos --debug --configdir=.

install: install-server install-client

install-server: doc

mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \

$(MANDIR)/man8

install --mode=0755 mandos $(PREFIX)/sbin/mandos

install --mode=0644 --target-directory=$(CONFDIR) mandos.conf

install --mode=0640 --target-directory=$(CONFDIR) \

clients.conf

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

100

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

101

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

102

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

103

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

104

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

105

106

install-client: all doc /usr/share/initramfs-tools/hooks/.

107

mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \

108

$(MANDIR)/man8

109

-mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d

110

chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d

111

install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \

112

plugin-runner

113

install --mode=0755 --target-directory=$(PREFIX)/sbin \

114

mandos-keygen

115

install --mode=0755 \

116

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

117

plugins.d/password-prompt

118

install --mode=4755 \

119

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

120

plugins.d/password-request

121

install initramfs-tools-hook \

122

/usr/share/initramfs-tools/hooks/mandos

123

install initramfs-tools-hook-conf \

124

/usr/share/initramfs-tools/conf-hooks.d/mandos

125

install initramfs-tools-script \

126

/usr/share/initramfs-tools/scripts/local-top/mandos

127

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

128

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

129

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

130

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

131

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

132

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

133

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

134

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

135

-$(PREFIX)/sbin/mandos-keygen

136

update-initramfs -k all -u

137

138

uninstall: uninstall-server uninstall-client

139

140

uninstall-server: $(PREFIX)/sbin/mandos

141

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

142

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

143

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

144

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

145

-rmdir $(CONFDIR)

146

147

uninstall-client:

148

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

149

# to use it.

150

! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \

151

/etc/crypttab

152

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

153

$(PREFIX)/lib/mandos/plugin-runner \

154

$(PREFIX)/lib/mandos/plugins.d/password-prompt \

155

$(PREFIX)/lib/mandos/plugins.d/password-request \

156

/usr/share/initramfs-tools/hooks/mandos \

157

/usr/share/initramfs-tools/conf-hooks.d/mandos \

158

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

159

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

160

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

161

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

162

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

163

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

164

update-initramfs -k all -u

165

166

purge: purge-server purge-client

167

168

purge-server: uninstall-server

169

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

170

-rmdir $(CONFDIR)

171

172

purge-client: uninstall-client

173

-rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt

174

-rmdir $(CONFDIR) $(CONFDIR)/plugins.d

-rm -f $(PROGS) $(objects) core

Older »