/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 at bsnet
  • Date: 2010-08-10 19:08:24 UTC
  • mto: (237.2.182 mandos-local)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: teddy@fukt.bsnet.se-20100810190824-5yquozxy4kh6py3f
* plugins.d/mandos-client.c: An empty interface name now means to
                             autodetect an interface; to specify no
                             particular interface, use "none".
  (sys_class_net): New global variable for the "/sys/class/net" path.
  (good_interface): New function to determine the suitability of an
                    interface.  Used by a scandir() call in main().
  (main): Changed default value for "interface" to the empty string.
          Moved "connect_to" to be a global variable.  Only take down
          and up interface if its name is not "none".
* plugins.d/mandos-client.xml (OPTIONS): Update documentation for the
                                         "--interface" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
13
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
13
LINK_FORTIFY_LD=-z relro -z now
15
14
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
15
ifndef BROKEN_PIE
19
16
FORTIFY += -fPIE
 
17
LINK_FORTIFY_LD += -fPIE
20
18
LINK_FORTIFY += -pie
21
19
endif
22
20
#COVERAGE=--coverage
57
55
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
56
 
59
57
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
58
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
59
        --param man.charmap.use.subset          0 \
62
60
        --param make.year.ranges                1 \
63
61
        --param make.single.year.ranges         1 \
65
63
        --param man.authors.section.enabled     0 \
66
64
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
65
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
66
        $(MANPOST) $(notdir $@)
69
67
# DocBook-to-man post-processing to fix a '\n' escape bug
70
68
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
69
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
70
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
71
        --param make.year.ranges                1 \
74
72
        --param make.single.year.ranges         1 \
75
73
        --param man.output.quietly              1 \
77
75
        --param citerefentry.link               1 \
78
76
        --output $@ \
79
77
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
78
        $<; $(HTMLPOST) $@
81
79
# Fix citerefentry links
82
80
HTMLPOST=$(SED) --in-place \
83
81
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
158
156
 
159
157
# Update all these files with version number $(version)
160
158
common.ent: Makefile
161
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
162
160
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
 
                $@)
 
161
                $@
164
162
 
165
163
mandos: Makefile
166
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
167
165
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
 
                $@)
 
166
                $@
169
167
 
170
168
mandos-keygen: Makefile
171
 
        $(strip $(SED) --in-place \
 
169
        $(SED) --in-place \
172
170
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
173
 
                $@)
 
171
                $@
174
172
 
175
173
mandos-ctl: Makefile
176
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
177
175
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
 
                $@)
 
176
                $@
179
177
 
180
178
mandos.lsm: Makefile
181
 
        $(strip $(SED) --in-place \
 
179
        $(SED) --in-place \
182
180
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
183
 
                $@)
184
 
        $(strip $(SED) --in-place \
 
181
                $@
 
182
        $(SED) --in-place \
185
183
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
186
 
                $@)
187
 
        $(strip $(SED) --in-place \
 
184
                $@
 
185
        $(SED) --in-place \
188
186
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
189
 
                $@)
 
187
                $@
190
188
 
191
 
plugins.d/mandos-client: plugins.d/mandos-client.c
192
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
189
plugins.d/mandos-client: plugins.d/mandos-client.o
 
190
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
191
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
194
192
 
195
193
.PHONY : all doc html clean distclean run-client run-server install \
196
194
        install-server install-client uninstall uninstall-server \
209
207
 
210
208
# Run the client with a local config and key
211
209
run-client: all keydir/seckey.txt keydir/pubkey.txt
212
 
        @echo "###################################################################"
213
 
        @echo "# The following error messages are harmless and can be safely     #"
214
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
215
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
216
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
217
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
218
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
219
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
220
 
        @echo "#                     seteuid: Operation not permitted            #"
221
 
        @echo "#                     klogctl: Operation not permitted            #"
222
 
        @echo "###################################################################"
223
210
        ./plugin-runner --plugin-dir=plugins.d \
224
211
                --config-file=plugin-runner.conf \
225
212
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
232
219
 
233
220
# Run the server with a local config
234
221
run-server: confdir/mandos.conf confdir/clients.conf
235
 
        @echo "#################################################################"
236
 
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
237
 
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
238
 
        @echo "# they are harmless and are caused by the server not running as #"
239
 
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
240
 
        @echo "# not also unpack and compile it as root.                       #"
241
 
        @echo "#################################################################"
242
222
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
223
 
244
224
# Used by run-server