/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 network-hooks.d/bridge.conf

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 13:09:43 UTC
  • Revision ID: teddy@recompile.se-20160228130943-6ofi0xgek1xd7qmy
Use GnuPG 2 if available

* debian/control (Package: mandos/Depends): Change "gnupg (<< 2)" to
                                            "gnupg".
  (Package: mandos-client/Depends): Remove "gnupg (<< 2)"; it will be
                                    depended on by libgpgme11, which
                                    will be added automatically by
                                    ${shlibs:Depends}.
* mandos (PGPEngine.__init__): Try to run "gpgconf" and set 'self.gpg'
                               to any binary found.  Also change
                               "--home" to "--homedir".
  (PGPEngine.encrypt, PGPEngine.decrypt): Use the 'self.gpg' attribute
                                          instead of "gpg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge.conf
 
1
## Required
 
2
 
 
3
#BRIDGE=br0
 
4
 
 
5
#PORT_ADDRESSES="00:11:22:33:44:55 11:22:33:44:55:66"
 
6
 
 
7
## Optional
 
8
 
 
9
#IPADDRS="192.0.2.3/24 2001:DB8::aede:48ff:fe71:f6f2/32"
 
10
 
 
11
#ROUTES="192.0.2.0/24 2001:DB8::/32"