/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

  • Committer: Teddy Hogeborn
  • Date: 2015-06-28 16:35:27 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150628163527-cky0ec59zew7teua
Add a plugin helper directory, available to all plugins.

* Makefile (PLUGIN_HELPERS): New; list of plugin helpers.
  (CPROGS): Appended "$(PLUGIN_HELPERS)".
* initramfs-tools-hook: Create new plugin helper directory, and copy
                        plugin helpers provided by the system and/or
                        by the local administrator.
  (PLUGINHELPERDIR): New.
* plugin-runner.c: Take new --plugin-helper-dir option and provide
                   environment variable to all plugins.
  (PHDIR): New; set to "/lib/mandos/plugin-helpers".
  (main/pluginhelperdir): New.
  (main/options): New option "--plugin-helper-dir".
  (main/parse_opt, main/parse_opt_config_file): Accept new option.
  (main): Use new option to set MANDOSPLUGINHELPERDIR environment
          variable as if using --global-env MANDOSPLUGINHELPERDIR=...
* plugin-runner.xml: Document new --plugin-helper-dir option.
  (SYNOPSIS, OPTIONS): Add "--plugin-helper-dir" option.
  (PLUGINS/WRITING PLUGINS): Document new environment variable
                             available to plugins.
  (ENVIRONMENT): Document new environment variable
                 "MANDOSPLUGINHELPERDIR" affected by the new
                 --plugin-helper-dir option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
8
 
        -Wunreachable-code
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
11
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
19
23
LINK_FORTIFY += -pie
20
24
endif
21
25
#COVERAGE=--coverage
22
 
OPTIMIZE=-Os
 
26
OPTIMIZE=-Os -fno-strict-aliasing
23
27
LANGUAGE=-std=gnu99
24
28
htmldir=man
25
 
version=1.6.4
 
29
version=1.6.9
26
30
SED=sed
27
31
 
28
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
81
85
        --param man.authors.section.enabled     0 \
82
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
83
87
        $(notdir $<); \
84
 
        $(MANPOST) $(notdir $@);\
85
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
86
89
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
87
90
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
88
91
        fi >/dev/null)
89
 
# DocBook-to-man post-processing to fix a '\n' escape bug
90
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
91
92
 
92
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
93
94
        --param make.year.ranges                1 \
105
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
106
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
107
108
        plugins.d/plymouth
108
 
CPROGS=plugin-runner $(PLUGINS)
 
109
PLUGIN_HELPERS=
 
110
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
109
111
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
110
112
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
111
113
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
263
265
        @echo "# ignored.  The messages are caused by not running as root, but   #"
264
266
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
265
267
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
266
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
268
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
269
        @echo "#                     setuid: Operation not permitted             #"
267
270
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
268
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
269
 
        @echo "#                     seteuid: Operation not permitted            #"
270
 
        @echo "#                     klogctl: Operation not permitted            #"
 
271
        @echo "# From mandos-client:                                             #"
 
272
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
273
        @echo "#             Warning: network hook \"*\" exited with status *      #"
271
274
        @echo "###################################################################"
 
275
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
272
276
        ./plugin-runner --plugin-dir=plugins.d \
 
277
                --plugin-helper-dir=plugin-helpers \
273
278
                --config-file=plugin-runner.conf \
274
279
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
280
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
275
281
                $(CLIENTARGS)
276
282
 
277
283
# Used by run-client
292
298
        install --directory confdir
293
299
        install --mode=u=rw $< $@
294
300
# Add a client password
295
 
        ./mandos-keygen --dir keydir --password >> $@
 
301
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
296
302
statedir:
297
303
        install --directory statedir
298
304
 
352
358
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
353
359
                install --mode=u=rwx \
354
360
                        --directory "$(CONFDIR)/plugins.d"; \
 
361
                install --directory "$(CONFDIR)/plugin-helpers"; \
355
362
        fi
356
363
        install --mode=u=rwx,go=rx --directory \
357
364
                "$(CONFDIR)/network-hooks.d"