/mandos/trunk

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-07-21 15:34:44 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080721153444-lugbjkj1oq65ugq3
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
                     $(LANGUAGE).
  (WARN, DEBUG, COVERAGE, LANGUAGE): New.
  (LDFLAGS): New; use $(COVERAGE)

* plugbasedclient.c: Added copyright header.
  (process.buffer_size, process.buffer_length): Changed to "size_t".
  (main): Cast arguments to malloc and realloc.  Detect read errors
          from processes.

* mandosclient.c: Added copyright header.
  (interface): Moved to inside "main".
  (gpg_packet_decrypt): Renamed to "pgp_packet_decrypt"; all callers
                        changed.  Changed "new_packet_capacity" and
                        "new_packet_length" to be ssize_t.  Cast
                        arguments to realloc.
  (debuggnutls): Attribute "level" argument as unused.
  (empty_log): Attribute "level" and "txt" arguments as unused.
  (start_mandos_communication): New argument "if_index".  Bug fix:
                                check ret, no tcp_sd, for errors from
                                setsockopt.  Use "if_index" directly
                                instead of looking up the index.  Loop
                                around fwrite until all data is written.
  (resolve_callback): Attribute "txt", and "flags" as usused.  Added
                      default case to switch.  Also show server host
                      name.  Call start_mandos_communication with
                      "interface".
  (browse_callback): Added default case to switch.
  (main): Variable "interface" moved here.  Cast "srand" argument.
          Bug fix: Call avahi_s_service_browser_new with index of
          "interface", not "eth0".

* passprompt.c: Added copyright header.
  (termination_handler): Attribute "signum" argument as unused.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
 
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
 
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
 
1
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 
9
2
DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
13
3
#COVERAGE=--coverage
14
 
OPTIMIZE=-Os
15
4
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
17
 
PREFIX=/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=/usr/share/man
22
5
 
23
6
# Do not change these two
24
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
25
7
LDFLAGS=$(COVERAGE)
26
 
 
27
 
DOCBOOKTOMAN=xsltproc --nonet \
28
 
        --param man.charmap.use.subset          0 \
29
 
        --param make.year.ranges                1 \
30
 
        --param make.single.year.ranges         1 \
31
 
        --param man.output.quietly              1 \
32
 
        --param man.authors.section.enabled     0
33
 
 
34
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
35
 
PROGS=plugin-runner $(PLUGINS)
36
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
37
 
        plugins.d/password-request.8mandos \
38
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
39
 
        mandos-clients.conf.5
 
8
CFLAGS=$(WARN) $(COVERAGE) $(DEBUG) $(LANGUAGE)
 
9
 
 
10
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
40
11
 
41
12
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
42
13
 
43
14
all: $(PROGS)
44
15
 
45
 
doc: $(DOCS)
46
 
 
47
 
%.5: %.xml
48
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
49
 
 
50
 
%.8: %.xml
51
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
52
 
 
53
 
%.8mandos: %.xml
54
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
55
 
 
56
 
plugin-runner: plugin-runner.o
 
16
plugbasedclient: plugbasedclient.o
57
17
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
58
18
 
59
 
plugins.d/password-request: plugins.d/password-request.o
60
 
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
61
 
                $(LOADLIBES) $(LDLIBS) -o $@
 
19
plugins.d/mandosclient: plugins.d/mandosclient.o
 
20
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
62
21
 
63
 
plugins.d/password-prompt: plugins.d/password-prompt.o
 
22
plugins.d/passprompt: plugins.d/passprompt.o
64
23
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
65
24
 
66
 
.PHONY : all clean distclean run-client run-server install \
67
 
        install-server install-client uninstall uninstall-server \
68
 
        uninstall-client purge purge-server purge-client
69
 
 
 
25
.PHONY : clean
70
26
clean:
71
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
72
 
 
73
 
distclean: clean
74
 
mostlyclean: clean
75
 
maintainer-clean: clean
76
 
        -rm --force --recursive keydir
77
 
 
78
 
check:
79
 
        ./mandos --check
80
 
 
81
 
run-client: all
82
 
        -mkdir keydir
83
 
        -./mandos-keygen --dir keydir
84
 
        ./plugin-runner --plugin-dir=plugins.d \
85
 
                --options-for=password-request:--keydir=keydir
86
 
 
87
 
run-server:
88
 
        ./mandos --debug --configdir=.
89
 
 
90
 
install: install-server install-client
91
 
 
92
 
install-server: doc
93
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
94
 
                $(MANDIR)/man8
95
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
96
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
97
 
        install --mode=0640 --target-directory=$(CONFDIR) \
98
 
                clients.conf
99
 
        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
 
27
        -rm -f $(PROGS) $(objects) core