/mandos/release : revision 237.2.185

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: 2010-09-12 02:51:19 UTC
mto: (24.1.164 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 270.
Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22

Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

Show diffs side-by-side

added added

removed removed

Makefile

# -Wunreachable-code

#DEBUG=-ggdb3

# For info about _FORTIFY_SOURCE, see

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

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE

LINK_FORTIFY_LD=-z relro -fPIE

LINK_FORTIFY=-pie

# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>

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

FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC

LINK_FORTIFY_LD=-z relro -z now

LINK_FORTIFY=

# If BROKEN_PIE is set, do not build with -pie

ifndef BROKEN_PIE

FORTIFY += -fPIE

LINK_FORTIFY += -pie

endif

#COVERAGE=--coverage

OPTIMIZE=-Os

LANGUAGE=-std=gnu99

htmldir=man

version=1.0.11

version=1.0.14

SED=sed

## Use these settings for a traditional /usr/local install

LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))

# Commands to format a DocBook <refentry> document into a manual page

DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \

DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \

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

--param make.year.ranges 1 \

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

--param man.authors.section.enabled 0 \

/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \

$(notdir $<); \

$(MANPOST) $(notdir $@)

$(MANPOST) $(notdir $@))

# DocBook-to-man post-processing to fix a '\n' escape bug

MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'

DOCBOOKTOHTML=xsltproc --nonet --xinclude \

DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \

--param make.year.ranges 1 \

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

--param man.output.quietly 1 \

--param citerefentry.link 1 \

--output $@ \

/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \

$<; $(HTMLPOST) $@

$<; $(HTMLPOST) $@)

# Fix citerefentry links

HTMLPOST=$(SED) --in-place \

--expression='s/$<a class="citerefentry" href="$$"><span class="citerefentry"><span class="refentrytitle">$$[^<]*$$<\/span>($$[^)]*$$)<\/span><\/a>$/\1\3.\5\2\3\4\5\6/g'

151

158

152

159

# Update all these files with version number $(version)

153

160

common.ent: Makefile

154

$(SED) --in-place \

161

$(strip $(SED) --in-place \

155

162

--expression='s/^$<!ENTITY version "$[^"]*">$$/\1$(version)">/' \

156

163

$@)

157

164

158

165

mandos: Makefile

159

$(SED) --in-place \

166

$(strip $(SED) --in-place \

160

167

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

161

168

$@)

162

169

163

170

mandos-keygen: Makefile

164

$(SED) --in-place \

171

$(strip $(SED) --in-place \

165

172

--expression='s/^$VERSION="$[^"]*"$$/\1$(version)"/' \

166

173

$@)

167

174

168

175

mandos-ctl: Makefile

169

$(SED) --in-place \

176

$(strip $(SED) --in-place \

170

177

--expression='s/^$version = "$[^"]*"$$/\1$(version)"/' \

171

178

$@)

172

179

173

180

mandos.lsm: Makefile

174

$(SED) --in-place \

181

$(strip $(SED) --in-place \

175

182

--expression='s/^$Version:$.*/\1\t$(version)/' \

176

177

$(SED) --in-place \

183

$@)

184

$(strip $(SED) --in-place \

178

185

--expression='s/^$Entered-date:$.*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \

179

180

$(SED) --in-place \

186

$@)

187

$(strip $(SED) --in-place \

181

188

--expression='s/$mandos_$[0-9.]\+$\.orig\.tar\.gz$/\1$(version)\2/' \

182

189

$@)

183

190

184

plugins.d/mandos-client: plugins.d/mandos-client.o

185

$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \

186

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

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 $@

187

194

188

195

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

189

196

install-server install-client uninstall uninstall-server \

202

209

203

210

# Run the client with a local config and key

204

211

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 "###################################################################"

205

223

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

206

224

--config-file=plugin-runner.conf \

207

225

--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \

214

232

215

233

# Run the server with a local config

216

234

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 "#################################################################"

217

242

./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)

218

243

219

244

# Used by run-server

Older »