1 diff -ur dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py dkimpy-milter-1.2.2/dkimpy_milter/__init__.py
2 --- dkimpy-milter-1.2.2.orig/dkimpy_milter/__init__.py 2020-08-09 20:15:48.000000000 +0200
3 +++ dkimpy-milter-1.2.2/dkimpy_milter/__init__.py 2022-05-29 13:50:24.310772566 +0200
6 # Ugh, but there's no easy way around this.
8 - configFile = '/usr/local/etc/dkimpy-milter.conf'
9 + configFile = '/etc/dkimpy-milter/dkimpy-milter.conf'
11 if (sys.argv[1] in ('-?', '--help', '-h')) or len(sys.argv) == 3 or \
12 (len(sys.argv) == 4 and sys.argv[2] != '-P'):
16 if socketname is None:
17 - socketname = 'local:/var/run/dkimpy-milter/dkimpy-milter.sock'
18 + socketname = 'local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock'
20 if milterconfig.get('Syslog'):
21 syslog.syslog('dkimpy-milter starting:{0} user:{1}'
22 diff -ur dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf dkimpy-milter-1.2.2/etc/dkimpy-milter.conf
23 --- dkimpy-milter-1.2.2.orig/etc/dkimpy-milter.conf 2020-04-09 04:49:44.000000000 +0200
24 +++ dkimpy-milter-1.2.2/etc/dkimpy-milter.conf 2022-05-29 13:51:41.948946914 +0200
26 # privileged user (e.g. Postfix)
29 -# Sign for example.com with key in /usr/local/etc/dkimkeys/dkim.key using
30 +# Sign for example.com with key in /etc/dkimpy-milter/dkim.key using
31 # selector '2007' (e.g. 2007._domainkey.example.com)
33 -#KeyFile /usr/local/etc/mail/dkim.key
34 +#KeyFile /etc/dkimpy-milter/example.com.key
37 # Commonly-used options; the commented-out versions show the defaults.
39 # ## inet:port to listen on all interfaces
40 # ## local:/path/to/socket to listen on a UNIX domain socket
42 -#Socket local:/run/dkimpy-milter/dkimpy-milter.sock
43 +#Socket local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock
45 #Socket inet:8892@localhost
46 +Socket local:/var/spool/postfix/dkimpy-milter/dkimpy-milter.sock
49 -### default /run/dkimpy-milter/dkimpy-milter.pid
50 +### default /var/run/dkimpy-milter.pid
52 ### Name of the file where the filter should write its pid before beginning
53 ### normal operations.
55 -PidFile /run/dkimpy-milter/dkimpy-milter.pid
56 +PidFile /var/run/dkimpy-milter.pid
59 ### default dkimpy-milter
61 ### Change to user "userid" before starting normal operation? May include
62 ### a group ID as well, separated from the userid by a colon.
66 diff -ur dkimpy-milter-1.2.2.orig/setup.py dkimpy-milter-1.2.2/setup.py
67 --- dkimpy-milter-1.2.2.orig/setup.py 2020-08-09 20:16:23.000000000 +0200
68 +++ dkimpy-milter-1.2.2/setup.py 2022-05-29 13:28:25.815906789 +0200
70 class FileMacroExpand(distutils.cmd.Command):
71 description = "Expand @@ variables in input files, simlar to make macros."
73 - ('sysconfigdir=', 'e', 'Specify system configuration directory. [/usr/local/etc]'),
74 - ('sbindir=', 's', 'Specify system binary directory. [/usr/local/sbin]'),
75 - ('bindir=', 'b', 'Specify binary directory. [/usr/loca/bin]'),
76 - ('rundir=', 'r', 'Specify run state directory. [/run]'),
77 + ('sysconfigdir=', 'e', 'Specify system configuration directory. [/etc]'),
78 + ('sbindir=', 's', 'Specify system binary directory. [/usr/sbin]'),
79 + ('bindir=', 'b', 'Specify binary directory. [/usr/bin]'),
80 + ('rundir=', 'r', 'Specify run state directory. [/var/run]'),
83 def initialize_options(self):
84 - self.sysconfigdir = '/usr/local/etc'
85 - self.sbindir = '/usr/local/sbin'
86 - self.bindir = '/usr/local/bin'
87 - self.rundir = '/run'
88 + self.sysconfigdir = '/etc'
89 + self.sbindir = '/usr/sbin'
90 + self.bindir = '/usr/bin'
91 + self.rundir = '/var/run'
93 def finalize_options(self):
94 self.configdir = self.sysconfigdir + '/dkimpy-milter'