Commit report for v3.1.x branch
New activity for FreeRADIUS (the high performance and highly configurable RADIUS server) ====== Sync changes from v3.0.x Arran Cudbard-Bell@2015-10-01T23:31:25Z Files modified: * debian/control * debian/freeradius-memcached.install * debian/freeradius-memcached.lintian-overrides * debian/freeradius-memcached.postinst * debian/freeradius-redis.lintian-overrides * debian/freeradius-redis.postinst * debian/freeradius-yubikey.install * debian/freeradius-yubikey.lintian-overrides * debian/freeradius-yubikey.postinst * debian/patches/disable-dhcp-bydefault.diff * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff * debian/rules Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/9fbcfacf0eba72ce650b2... ====== Merge pull request #1286 from qnet-herwin/compile_128bit Fixed build for systems without support for 128 bit integers Arran Cudbard-Bell@2015-10-01T19:00:35Z Files modified: * src/include/missing-h Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/f78ff3db09bcd1929ecca... ====== Fixed build for systems without support for 128 bit integers The build still fails, but at least it's a step in the right direction. Herwin Weststrate@2015-10-01T18:47:56Z Files modified: * src/include/missing-h Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/c56fb974baee32dc8930c... ====== try harder to find isql.h location has moved between debian wheezy and jessie Matthew Newton (via Alan T. DeKok)@2015-10-01T17:26:54Z Files modified: * src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure * src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/7725ef5f3f6af61f74e95... ====== missing space Matthew Newton (via Alan T. DeKok)@2015-10-01T17:26:54Z Files modified: * src/modules/rlm_cache/rlm_cache.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/799c8c006db197528a2d3... ====== Merge pull request #1284 from mcnewton/deb31 refresh debian quilt patches Arran Cudbard-Bell@2015-10-01T17:21:31Z Files modified: * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/b485c12780a3165e02669... ====== refresh debian quilt patches Matthew Newton@2015-09-30T23:37:24Z Files modified: * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/8ee9da7688627730f9552... ====== debian package fails when not building with fakeroot Matthew Newton (via Arran Cudbard-Bell)@2015-10-01T17:19:23Z Files modified: * debian/rules Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/03681e4b769034cf94ed1... ====== -- This commit summary was generated @2015-10-02T00:00:02Z by lgfeed version 0.00 (https://github.com/arr2036/lgfeed).
On Fri, Oct 02, 2015 at 12:00:02AM +0200, The git bot wrote:
New activity for FreeRADIUS (the high performance and highly configurable RADIUS server)
====== Sync changes from v3.0.x
Arran Cudbard-Bell@2015-10-01T23:31:25Z Files modified: * debian/control * debian/freeradius-memcached.install * debian/freeradius-memcached.lintian-overrides * debian/freeradius-memcached.postinst * debian/freeradius-redis.lintian-overrides * debian/freeradius-redis.postinst * debian/freeradius-yubikey.install * debian/freeradius-yubikey.lintian-overrides * debian/freeradius-yubikey.postinst * debian/patches/disable-dhcp-bydefault.diff * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff * debian/rules
Aw, crap. Don't ask me to do it and then do it yourself... Just wasted 30 minutes! I'll fix it up as it won't work on wheezy as-is, then test build in on all current versions. Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On Thu, Oct 01, 2015 at 11:15:52PM +0100, Matthew Newton wrote:
On Fri, Oct 02, 2015 at 12:00:02AM +0200, The git bot wrote:
New activity for FreeRADIUS (the high performance and highly configurable RADIUS server)
====== Sync changes from v3.0.x
Arran Cudbard-Bell@2015-10-01T23:31:25Z Files modified: * debian/control * debian/freeradius-memcached.install * debian/freeradius-memcached.lintian-overrides * debian/freeradius-memcached.postinst * debian/freeradius-redis.lintian-overrides * debian/freeradius-redis.postinst * debian/freeradius-yubikey.install * debian/freeradius-yubikey.lintian-overrides * debian/freeradius-yubikey.postinst * debian/patches/disable-dhcp-bydefault.diff * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff * debian/rules
Aw, crap. Don't ask me to do it and then do it yourself... Just wasted 30 minutes!
Sorry, that was rude. I apologise. Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On Oct 1, 2015, at 6:18 PM, Matthew Newton <mcn4@leicester.ac.uk> wrote:
On Thu, Oct 01, 2015 at 11:15:52PM +0100, Matthew Newton wrote:
On Fri, Oct 02, 2015 at 12:00:02AM +0200, The git bot wrote:
New activity for FreeRADIUS (the high performance and highly configurable RADIUS server)
====== Sync changes from v3.0.x
Arran Cudbard-Bell@2015-10-01T23:31:25Z Files modified: * debian/control * debian/freeradius-memcached.install * debian/freeradius-memcached.lintian-overrides * debian/freeradius-memcached.postinst * debian/freeradius-redis.lintian-overrides * debian/freeradius-redis.postinst * debian/freeradius-yubikey.install * debian/freeradius-yubikey.lintian-overrides * debian/freeradius-yubikey.postinst * debian/patches/disable-dhcp-bydefault.diff * debian/patches/logrotate-path.diff * debian/patches/radiusd-to-freeradius.diff * debian/rules
Aw, crap. Don't ask me to do it and then do it yourself... Just wasted 30 minutes!
Sorry, that was rude. I apologise.
No it was justified... But that commit was to resolve all difference in debian packaging between v3.0.x and v3.1.x, not just your set of commits. -Arran
On Thu, Oct 01, 2015 at 07:48:10PM -0400, Arran Cudbard-Bell wrote:
No it was justified... But that commit was to resolve all difference in debian packaging between v3.0.x and v3.1.x, not just your set of commits.
Yeah, that's good, thanks. I was going to look at that next as I noticed the two had diverged somewhat, so you did save me doing that :) Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On Thu, Oct 01, 2015 at 11:15:52PM +0100, Matthew Newton wrote:
I'll fix it up as it won't work on wheezy as-is, then test build in on all current versions.
OK, 3.0.x and 3.1.x are both good, with the revert PR I just sent. My earlier fix is fine for normal building but annoyingly not when using debian's sbuild system. So still not sure why the build fails in rlm_sqlhpqippool without fakeroot, but with fakeroot it's fine (which is the documented method anyway). In theory, configure ... --with-iodbc-include-dir='/usr/include/iodbc' \ ... should fail on wheezy because isql.h is in /usr/include. But because src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac now also has smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" then it erroneously reports as having found it in /usr/include/iodbc, but actually uses it from /usr/include, so all is well. Essentially the extra --with-iodbc-include-dir directive is just redundant. I've successfully built packages for both branches using sbuild on wheezy, jessie and sid, so it looks like it's at a good place now. Cheers, Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On Fri, Oct 2, 2015 at 6:18 AM, Matthew Newton <mcn4@leicester.ac.uk> wrote:
In theory, configure
... --with-iodbc-include-dir='/usr/include/iodbc' \ ...
should fail on wheezy because isql.h is in /usr/include. But because src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac now also has
smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include"
then it erroneously reports as having found it in /usr/include/iodbc, but actually uses it from /usr/include, so all is well. Essentially the extra --with-iodbc-include-dir directive is just redundant.
I haven't tested 3.x, but with 2.1.12 on ubuntu vivid they added patches/freeradius_add_iodbc_include_dirs.diff, which basically change this line smart_try_dir="$iodbc_include_dir /usr/include/iodbc /usr/local/iodbc/include" on src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.in and configure. Tested on my ppa for 2.2.9 to work on precise, trusty (isql.h in /usr/include), vivid, and wily (isql.h in /usr/include/iodbc). No "--with-iodbc-include-dir" on debian/rules. So if you want to remove redundant code, the "/usr/include" in smart_try_dir line is probably safe to remove as well. -- Fajar
On Fri, Oct 02, 2015 at 02:44:17PM +0700, Fajar A. Nugraha wrote:
On Fri, Oct 2, 2015 at 6:18 AM, Matthew Newton <mcn4@leicester.ac.uk> wrote: I haven't tested 3.x, but with 2.1.12 on ubuntu vivid they added patches/freeradius_add_iodbc_include_dirs.diff, which basically change this line
smart_try_dir="$iodbc_include_dir /usr/include/iodbc /usr/local/iodbc/include"
Yeah, it was the /usr/include/iodbc I had to include there to get it to work properly on jessie. I added /usr/include just for completeness as the library search included /usr/lib already.
So if you want to remove redundant code, the "/usr/include" in smart_try_dir line is probably safe to remove as well.
If it's there then configure correctly reports where it found the header. Otherwise, it finds the header but reports it found it in the wrong location. So in my view it's probably better to leave as-is. Cheers, Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
participants (4)
-
announce＠freeradius.org -
Arran Cudbard-Bell -
Fajar A. Nugraha -
Matthew Newton