Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 04ef3629d7 | |||
| 489238dff0 | |||
| a8bf7104bc |
@@ -1,3 +1,8 @@
|
||||
1.2.1 2020-01-04
|
||||
- Fix expand option not to fail if files are missing since socket activation
|
||||
service files are not shipped in the sdist
|
||||
- Correct dkimpy-milter.conf file install location to match expand locations
|
||||
|
||||
1.2.0 2020-01-03
|
||||
- Add support for SigningTable, KeyTable, and KeyTableEd25519 (LP: #1797397)
|
||||
- Add support for specifying MinimumKeyBits for RSA signatures
|
||||
|
||||
@@ -56,6 +56,7 @@ class FileMacroExpand(distutils.cmd.Command):
|
||||
'system/socket-activation/dkimpy-milter.socket', ]
|
||||
for infile in files:
|
||||
outfile = ''
|
||||
try:
|
||||
filein = open(infile + '.in')
|
||||
for line in filein:
|
||||
for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]:
|
||||
@@ -76,6 +77,8 @@ class FileMacroExpand(distutils.cmd.Command):
|
||||
for line in outfile:
|
||||
out.write(line)
|
||||
out.close()
|
||||
except FileNotFoundError as x:
|
||||
pass
|
||||
|
||||
kw = {} # Work-around for lack of 'or' requires in setuptools.
|
||||
try:
|
||||
@@ -86,7 +89,7 @@ except ImportError: # If PyDNS is not installed, prefer dnspython
|
||||
|
||||
setup(
|
||||
name='dkimpy-milter',
|
||||
version='1.2.0',
|
||||
version='1.2.1',
|
||||
author='Scott Kitterman',
|
||||
author_email='scott@kitterman.com',
|
||||
url='https://launchpad.net/dkimpy-milter',
|
||||
@@ -115,8 +118,8 @@ setup(
|
||||
include_package_data=True,
|
||||
data_files=[(os.path.join('share', 'man', 'man5'),
|
||||
['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'),
|
||||
['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']),
|
||||
(os.path.join('lib', 'systemd', 'system'),
|
||||
['man/dkimpy-milter.8']), (os.path.join('etc', 'dkimpy-milter'),
|
||||
['etc/dkimpy-milter.conf']), (os.path.join('lib', 'systemd', 'system'),
|
||||
['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'),
|
||||
['system/dkimpy-milter']), (os.path.join('etc', 'init.d'),
|
||||
['system/dkimpy-milter.openrc'])],
|
||||
|
||||
Reference in New Issue
Block a user