/mandos/release

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

Convert some programs to use the exit codes from <sysexits.h>.  Change
all programs using the "argp" parsing functions to use them correctly;
checking return value, using argp_error() to report parse errors etc.

* plugin-runner.c: Use <sysexits.h> exit codes.  Always use fallback,
                   even on option errors, except for "--help", etc.
  (getplugin): Make sure "errno" is set correctly on return.
  (main): Declare our own "--help", "--usage", and "--version"
          options which do not cause the fallback to be invoked.
          In all other options, use fallback on any error.
  (parse_opt, parse_opt_config_file): Reset errno at start and return
                                      errno.  No need to check "arg"
                                      for NULL.  New "--help",
                                      "--usage", and "--version"
                                      options.
  (parse_opt): Accept empty string as global option.  Do not print
               errors which will be detected and reported later.  Do
               "argp_error()" on parse error or empty plugin names.
* plugins.d/mandos-client.c: Use <sysexits.h> exit codes.  Do not
                             return successful exit code on "--help",
                             etc. since this would give the wrong
                             message to "plugin-runner".
  (main): Declare our own "--help", "--usage", and "--version"
          options which do not return a successful exit code.
  (parse_opt): Reset errno at start and return errno.  Do
               "argp_error()" on parse errors.  New "--help",
               "--usage", and "--version" options.
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>.  Do
                               not return successful exit code on
                               "--help", etc. since this would give
                               the wrong message to "plugin-runner".
  (main): Declare our own "--help", "--usage", and "--version" options
          which do not return a successful exit code.  Do
          close(STDOUT_FILENO) after writing to check its return code.
  (parse_opt): Reset errno at start and return errno.

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
14
LINK_FORTIFY_LD=-z relro -fPIE
 
15
LINK_FORTIFY=-pie
22
16
#COVERAGE=--coverage
23
17
OPTIMIZE=-Os
24
18
LANGUAGE=-std=gnu99
25
19
htmldir=man
26
 
version=1.0.14
 
20
version=1.0.13
27
21
SED=sed
28
22
 
29
23
## Use these settings for a traditional /usr/local install
57
51
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
52
 
59
53
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
54
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
55
        --param man.charmap.use.subset          0 \
62
56
        --param make.year.ranges                1 \
63
57
        --param make.single.year.ranges         1 \
65
59
        --param man.authors.section.enabled     0 \
66
60
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
61
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
62
        $(MANPOST) $(notdir $@)
69
63
# DocBook-to-man post-processing to fix a '\n' escape bug
70
64
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
65
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
66
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
67
        --param make.year.ranges                1 \
74
68
        --param make.single.year.ranges         1 \
75
69
        --param man.output.quietly              1 \
77
71
        --param citerefentry.link               1 \
78
72
        --output $@ \
79
73
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
74
        $<; $(HTMLPOST) $@
81
75
# Fix citerefentry links
82
76
HTMLPOST=$(SED) --in-place \
83
77
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
78
 
85
79
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
80
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
81
CPROGS=plugin-runner $(PLUGINS)
89
82
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
83
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
159
152
 
160
153
# Update all these files with version number $(version)
161
154
common.ent: Makefile
162
 
        $(strip $(SED) --in-place \
 
155
        $(SED) --in-place \
163
156
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
164
 
                $@)
 
157
                $@
165
158
 
166
159
mandos: Makefile
167
 
        $(strip $(SED) --in-place \
 
160
        $(SED) --in-place \
168
161
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@)
 
162
                $@
170
163
 
171
164
mandos-keygen: Makefile
172
 
        $(strip $(SED) --in-place \
 
165
        $(SED) --in-place \
173
166
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
174
 
                $@)
 
167
                $@
175
168
 
176
169
mandos-ctl: Makefile
177
 
        $(strip $(SED) --in-place \
 
170
        $(SED) --in-place \
178
171
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
 
                $@)
 
172
                $@
180
173
 
181
174
mandos.lsm: Makefile
182
 
        $(strip $(SED) --in-place \
 
175
        $(SED) --in-place \
183
176
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
184
 
                $@)
185
 
        $(strip $(SED) --in-place \
 
177
                $@
 
178
        $(SED) --in-place \
186
179
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
187
 
                $@)
188
 
        $(strip $(SED) --in-place \
 
180
                $@
 
181
        $(SED) --in-place \
189
182
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
190
 
                $@)
 
183
                $@
191
184
 
192
 
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
185
plugins.d/mandos-client: plugins.d/mandos-client.o
 
186
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
187
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
195
188
 
196
189
.PHONY : all doc html clean distclean run-client run-server install \
197
190
        install-server install-client uninstall uninstall-server \
210
203
 
211
204
# Run the client with a local config and key
212
205
run-client: all keydir/seckey.txt keydir/pubkey.txt
213
 
        @echo "###################################################################"
214
 
        @echo "# The following error messages are harmless and can be safely     #"
215
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
216
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
217
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
218
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
219
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
220
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
221
 
        @echo "#                     seteuid: Operation not permitted            #"
222
 
        @echo "#                     klogctl: Operation not permitted            #"
223
 
        @echo "###################################################################"
224
206
        ./plugin-runner --plugin-dir=plugins.d \
225
207
                --config-file=plugin-runner.conf \
226
208
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
233
215
 
234
216
# Run the server with a local config
235
217
run-server: confdir/mandos.conf confdir/clients.conf
236
 
        @echo "#################################################################"
237
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
238
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
239
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
240
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
241
 
        @echo "#################################################################"
242
218
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
219
 
244
220
# Used by run-server
306
282
        install --mode=u=rwxs,go=rx \
307
283
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
308
284
                plugins.d/askpass-fifo
309
 
        install --mode=u=rwxs,go=rx \
310
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
311
 
                plugins.d/plymouth
312
285
        install initramfs-tools-hook \
313
286
                $(INITRAMFSTOOLS)/hooks/mandos
314
287
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
359
332
                $(PREFIX)/lib/mandos/plugins.d/usplash \
360
333
                $(PREFIX)/lib/mandos/plugins.d/splashy \
361
334
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
362
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
363
335
                $(INITRAMFSTOOLS)/hooks/mandos \
364
336
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
365
337
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \