/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 debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2008-07-29 03:35:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080729033539-08zecoj3jwlkpjhw
* server.conf: New file.

* mandos-clients.conf: Renamed to clients.conf.

* Makefile (FORTIFY): New.
  (CFLAGS): Include $(FORTIFY).

* plugins.d/mandosclient.c (main): New "if_index" variable.  Bug fix:
                                   check if interface exists.  New
                                   "--connect" option.

* server.py (serviceInterface): Removed; replaced by
                                "AvahiService.interface".  All users
                                changed.
  (AvahiError, AvahiServiceError, AvahiGroupError): New exception
                                                    classes.
  (AvahiService): New class.
  (serviceName): Removed; replaced by "AvahiService.name".  All users
                 changed.
  (serviceType): Removed; replaced by "AvahiService.type".  All users
                 changed.
  (servicePort): Removed; replaced by "AvahiService.port".  All users
                 changed.
  (serviceTXT): Removed; replaced by "AvahiService.TXT".  All users
                changed.
  (domain): Removed; replaced by "AvahiService.domain".  All users
            changed.
  (host): Removed; replaced by "AvahiService.host".  All users
          changed.
  (rename_count): Removed; replaced by "AvahiService.rename_count" and
                 "AvahiService.max_renames".  All users changed.
  (Client.__init__): If no secret or secfile, raise TypeError instead
                     of RuntimeError.
  (Client.last_seen): Renamed to "Client.last_checked_ok".  All users
                      changed.
  (Client.stop, Client.stop_checker): Use "getattr" with default value
                                      instead of "hasattr".
  (Client.still_valid): Removed "now" argument.
  (Client.handle): Separate the "no client found" and "client invalid"
                   cases for clearer code.
  (IPv6_TCPServer.__init__): "options" argument replaced by
                             "settings".  All callers changed.
  (IPv6_TCPServer.options): Replaced by "IPv6_TCPServer.settings".
                            All users changed.
  (IPv6_TCPServer.server_bind): Use getattr instead of hasattr.
  (add_service): Removed; replaced by "AvahiService.add".  All callers
                 changed.
  (remove_service): Removed; replaced by "AvahiService.remove".  All
                    callers changed.
  (entry_group_state_changed): On entry group collision, call the new
                               AvahiService.rename method.  Raise
                               AvahiGroupError on group error.
  (if_nametoindex): Use ctypes.utils.find_library to locate the C
                    library.  Cache the result.  Loop on EINTR.
  (daemon): Use os.path.devnull to locate "/dev/null".
  (killme): Removed.  All callers changed to do "sys.exit()" instead,
            except where stated otherwise.
  (main): Removed "exitstatus".  Removed all default values from all
          non-bool options.  New option "--configdir".  New variables
          "server_defaults" and "server_settings", read from
          "%(configdir)s/server.conf".  Let any supplied command line
          options override server settings.   Variable "defaults"
          renamed to "client_defaults", which is read from
          "clients.conf" instead of "mandos-clients.conf".  New global
          AvahiService object "service" replaces old global variables.
          Catch AvahiError and exit with error if caught.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/make -f
2
 
# Sample debian/rules that uses debhelper.
3
 
#
4
 
# This file was originally written by Joey Hess and Craig Small.
5
 
# As a special exception, when this file is copied by dh-make into a
6
 
# dh-make output file, you may use that output file without restriction.
7
 
# This special exception was added by Craig Small in version 0.37 of dh-make.
8
 
#
9
 
# Modified to make a template file for a multi-binary package with separated
10
 
# build-arch and build-indep targets  by Bill Allombert 2001
11
 
 
12
 
# Uncomment this to turn on verbose mode.
13
 
#export DH_VERBOSE=1
14
 
 
15
 
# This has to be exported to make some magic below work.
16
 
export DH_OPTIONS
17
 
 
18
 
# -pie is broken on the mips and mipsel architectures, see
19
 
# <http://bugs.debian.org/526961>
20
 
ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:))
21
 
  BROKEN_PIE := yes
22
 
  export BROKEN_PIE
23
 
endif
24
 
ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))
25
 
  BROKEN_PIE := yes
26
 
  export BROKEN_PIE
27
 
endif
28
 
 
29
 
configure: configure-stamp
30
 
configure-stamp:
31
 
        dh_testdir
32
 
        touch configure-stamp
33
 
 
34
 
build: build-arch build-indep
35
 
 
36
 
build-arch: build-arch-stamp
37
 
build-arch-stamp: configure-stamp
38
 
        dh_auto_build -- all doc
39
 
        touch $@
40
 
 
41
 
build-indep: build-indep-stamp
42
 
build-indep-stamp: configure-stamp
43
 
        dh_auto_build -- doc
44
 
        touch $@
45
 
 
46
 
clean:
47
 
        dh_testdir
48
 
        dh_testroot
49
 
        rm -f build-arch-stamp build-indep-stamp configure-stamp
50
 
        dh_auto_clean
51
 
        dh_clean
52
 
 
53
 
install: install-indep install-arch
54
 
install-indep:
55
 
        dh_testdir
56
 
        dh_testroot
57
 
        dh_prep
58
 
        dh_installdirs --indep
59
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
60
 
        dh_lintian
61
 
        dh_installinit --onlyscripts \
62
 
                --update-rcd-params="defaults 25 15"
63
 
        dh_install --indep
64
 
 
65
 
install-arch:
66
 
        dh_testdir
67
 
        dh_testroot
68
 
        dh_prep
69
 
        dh_installdirs --same-arch
70
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client install-client-nokey
71
 
        dh_lintian
72
 
        dh_install --same-arch
73
 
 
74
 
binary-common:
75
 
        dh_testdir
76
 
        dh_testroot
77
 
        dh_installchangelogs
78
 
        dh_installdocs
79
 
        dh_link
80
 
        dh_strip
81
 
        dh_compress
82
 
        dh_fixperms --exclude etc/keys/mandos \
83
 
                --exclude etc/mandos/clients.conf \
84
 
                --exclude etc/mandos/plugins.d \
85
 
                --exclude usr/lib/mandos/plugins.d
86
 
        dh_installdeb
87
 
        dh_shlibdeps
88
 
        dh_gencontrol
89
 
        dh_md5sums
90
 
        dh_builddeb
91
 
 
92
 
# Build architecture independant packages using the common target.
93
 
binary-indep: build-indep install-indep
94
 
        $(MAKE) -f debian/rules DH_OPTIONS=--indep binary-common
95
 
 
96
 
# Build architecture dependant packages using the common target.
97
 
binary-arch: build-arch install-arch
98
 
        $(MAKE) -f debian/rules DH_OPTIONS=--same-arch binary-common
99
 
 
100
 
binary: binary-arch binary-indep
101
 
 
102
 
.PHONY: build clean binary-indep binary-arch binary install \
103
 
                install-indep install-arch configure