<div dir="ltr">Thanks for the patch! Applied and uploaded.<div><br></div><div>Tiny request: next time, please send patches formatted using git format-patch against the git repository. That makes it easier for me to accept your contributions. Thanks!</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 17, 2016 at 8:33 PM, Nishanth Aravamudan <span dir="ltr"><<a href="mailto:nish.aravamudan@canonical.com" target="_blank">nish.aravamudan@canonical.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Package: freeradius<br>
Version: 3.0.12+dfsg-3<br>
Followup-For: Bug #710895<br>
User: <a href="mailto:ubuntu-devel@lists.ubuntu.com">ubuntu-devel@lists.ubuntu.com</a><br>
Usertags: origin-ubuntu zesty ubuntu-patch<br>
<br>
Dear Maintainer,<br>
<br>
In Ubuntu, the attached patch was applied to achieve the following:<br>
<br>
* d/t: update tests for 3.x (Closes: #710895)<br>
- Password must be provided as 'User-Password'.<br>
- Configuration is stored in /etc/freeradius/3.0/.<br>
- Response strings do not contain 'code X' any longer.<br>
* d/freeradius.postinst: revert incorrect removal of /var/log file creation<br>
- 42abc545 ('Remove all use of dpkg-statoverride') included a<br>
non-dpkg-statoverride-related removal.<br>
<br>
Thanks for considering the patch.<br>
<br>
*** /tmp/tmpu9VegU/freeradius_3.0.<wbr>12+dfsg-3ubuntu2.debdiff<br>
diff -Nru freeradius-3.0.12+dfsg/debian/<wbr>freeradius.postinst freeradius-3.0.12+dfsg/debian/<wbr>freeradius.postinst<br>
--- freeradius-3.0.12+dfsg/debian/<wbr>freeradius.postinst 2016-11-11 17:09:56.000000000 -0800<br>
+++ freeradius-3.0.12+dfsg/debian/<wbr>freeradius.postinst 2016-11-17 11:04:24.000000000 -0800<br>
@@ -11,6 +11,10 @@<br>
# start after services which may be used and stop before them.<br>
update-rc.d freeradius start 50 2 3 4 5 . stop 19 0 1 6 . >/dev/null<br>
<br>
+ for file in radius.log radwtmp; do<br>
+ [ ! -f "/var/log/freeradius/${file}" ] && install -o freerad -g freerad -m 644 /dev/null /var/log/freeradius/${file}<br>
+ done<br>
+<br>
action="start"<br>
else<br>
action="restart"<br>
diff -Nru freeradius-3.0.12+dfsg/debian/<wbr>tests/test-freeradius.py freeradius-3.0.12+dfsg/debian/<wbr>tests/test-freeradius.py<br>
--- freeradius-3.0.12+dfsg/debian/<wbr>tests/test-freeradius.py 2016-11-11 17:09:56.000000000 -0800<br>
+++ freeradius-3.0.12+dfsg/debian/<wbr>tests/test-freeradius.py 2016-11-17 11:04:09.000000000 -0800<br>
@@ -47,11 +47,11 @@<br>
def setUp(self):<br>
'''Set up prior to each test_* function'''<br>
self.tmpdir = tempfile.mkdtemp(prefix='<wbr>freeradius-', dir='/tmp')<br>
- self.auth_approved = "code 2"<br>
- self.auth_denied = "code 3"<br>
+ self.auth_approved = "Access-Accept"<br>
+ self.auth_denied = "Access-Reject"<br>
<br>
# Add a default user<br>
- self.users_file = "/etc/freeradius/users"<br>
+ self.users_file = "/etc/freeradius/3.0/users"<br>
self.test_user = "testuser"<br>
self.test_pass = "testpassword"<br>
config_line = '%s Cleartext-Password := "%s"' % (self.test_user, self.test_pass)<br>
@@ -70,7 +70,7 @@<br>
def _test_auth(self, username, password, expected_string, expected_rc=0):<br>
'''Tests authentication'''<br>
<br>
- handle, tmpname = testlib.mkstemp_fill("User-<wbr>Name=%s,Password=%s" % (username, password), dir=self.tmpdir)<br>
+ handle, tmpname = testlib.mkstemp_fill("User-<wbr>Name=%s,User-Password=%s" % (username, password), dir=self.tmpdir)<br>
<br>
# can't use radtest as there's no way to set a timeout or number of retries<br>
rc, report = testlib.cmd(['/usr/bin/<wbr>radclient', '-r', '2', '-f', tmpname, '-s', 'localhost:1812', 'auth', 'testing123'])<br>
<br>
<br>
-- System Information:<br>
Debian Release: stretch/sid<br>
APT prefers yakkety-updates<br>
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500, 'yakkety'), (400, 'yakkety-proposed'), (100, 'yakkety-backports')<br>
Architecture: amd64 (x86_64)<br>
Foreign Architectures: i386<br>
<br>
Kernel: Linux 4.8.0-27-generic (SMP w/4 CPU cores)<br>
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)<br>
Shell: /bin/sh linked to /bin/dash<br>
Init: systemd (via /run/systemd/system)<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Nishanth Aravamudan<br>
Ubuntu Server<br>
Canonical Ltd<br>
<br>
______________________________<wbr>_________________<br>
Pkg-freeradius-maintainers mailing list<br>
<a href="mailto:Pkg-freeradius-maintainers@lists.alioth.debian.org">Pkg-freeradius-maintainers@<wbr>lists.alioth.debian.org</a><br>
<a href="https://lists.alioth.debian.org/mailman/listinfo/pkg-freeradius-maintainers" rel="noreferrer" target="_blank">https://lists.alioth.debian.<wbr>org/mailman/listinfo/pkg-<wbr>freeradius-maintainers</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Best regards,<br>Michael</div>
</div>