diff --git a/hammer.py b/hammer.py index a4f08c246d..3a428ebedf 100755 --- a/hammer.py +++ b/hammer.py @@ -1562,37 +1562,6 @@ def _apt_update(system, revision, env=None, check_times=False, attempts=1, sleep sleep_time_after_attempt=sleep_time_after_attempt, capture=capture) -def _install_freeradius_client(system, revision, features, env, check_times): - """Install FreeRADIUS-client with necessary patches from Francis Dupont.""" - # check if it is already installed - if (os.path.exists('/usr/local/lib/libfreeradius-client.so') and - os.path.exists('/usr/local/include/freeradius-client.h')): - log.info('freeradius-client is already installed.') - return - - # Install freeradius-client dependencies. - if system in ['centos', 'rhel', 'fedora']: - install_pkgs('nettle-devel', env=env, check_times=check_times) - elif system in ['alpine', 'debian', 'ubuntu']: - install_pkgs('nettle-dev', env=env, check_times=check_times) - elif system in ['arch', 'freebsd']: - install_pkgs('nettle', env=env, check_times=check_times) - else: - raise NotImplementedError('no implementation for %s' % system) - - # checkout sources, build them and install - execute('rm -rf freeradius-client') - execute('git clone https://github.com/fxdupont/freeradius-client.git', env=env, check_times=check_times) - execute('git checkout iscdev', cwd='freeradius-client', env=env, check_times=check_times) - execute('./configure --with-nettle', cwd='freeradius-client', env=env, check_times=check_times) - execute('make', cwd='freeradius-client', env=env, check_times=check_times) - execute('sudo make install', cwd='freeradius-client', env=env, check_times=check_times) - execute('rm -rf freeradius-client') - if system != 'alpine': - execute('sudo ldconfig', env=env) - log.info('freeradius-client successfully installed.') - - def _get_package_version(package: str): """ Returns the version available in the package manager's repository for the requested package. @@ -1669,9 +1638,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): packages.extend(['postgresql-devel']) packages.extend(['postgresql-server']) - if 'radius' in features: - packages.extend(['freeradius', 'git']) - if 'gssapi' in features: packages.extend(['krb5-devel']) @@ -1727,9 +1693,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): else: packages.append('postgresql-devel') - if 'radius' in features: - packages.extend(['freeradius', 'git']) - if 'gssapi' in features: packages.extend(['krb5-devel']) @@ -1782,9 +1745,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): else: packages.append('postgresql-private-devel') - if 'radius' in features: - packages.extend(['freeradius', 'git']) - if 'gssapi' in features: packages.extend(['krb5-devel']) @@ -1835,9 +1795,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): else: packages.extend(['postgresql-client', 'libpq-dev', 'postgresql-all']) - if 'radius' in features: - packages.extend(['freeradius', 'git']) - if 'gssapi' in features: packages.extend(['libkrb5-dev']) @@ -1895,9 +1852,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): else: packages.append('postgresql-all') - if 'radius' in features: - packages.extend(['freeradius', 'git']) - if 'gssapi' in features: packages.extend(['libkrb5-dev']) @@ -1936,9 +1890,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): else: packages.extend(['postgresql13-server', 'postgresql13-client']) - if 'radius' in features: - packages.extend(['freeradius3', 'git']) - if 'gssapi' in features: packages.extend(['krb5', 'krb5-devel']) # FreeBSD comes with a Heimdal krb5-config by default. Make sure @@ -2032,9 +1983,6 @@ def prepare_system_local(features, check_times, ignore_errors_for): if 'pgsql' in features: _configure_pgsql(system, features, revision) - if 'radius' in features: - _install_freeradius_client(system, revision, features, env, check_times) - #execute('sudo rm -rf /usr/share/doc') log.info('Preparing deps completed successfully.') @@ -2116,8 +2064,6 @@ def _build_binaries_and_run_ut(system, revision, features, tarball_path, env, ch raise NotImplementedError('no implementation for %s' % system) if 'docs' in features and not system == 'rhel': cmd += ' --enable-generate-docs' - if 'radius' in features: - cmd += ' --with-freeradius=/usr/local' if 'gssapi' in features: cmd += ' --with-gssapi' if 'shell' in features: @@ -2241,53 +2187,6 @@ def _check_installed_rpm_or_debs(services_list): def _build_rpm(system, revision, features, tarball_path, env, check_times, dry_run, pkg_version, pkg_isc_version, repo_url): - # install our freeradius-client but now from rpm - cmd = 'bash -c "cat <