X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=048975f41dee8f5ece6c68e792487ce6ee612132;hb=66ecf04088b747c00e7fdf8380fbece7848018be;hp=04981f6fdcc186f3fef0397fd36526da3d0d252d;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 04981f6fd..048975f41 100755
--- a/configure
+++ b/configure
@@ -159,6 +159,7 @@ unless ($config{CXX}) {
 }
 my %compiler = get_compiler_info($config{CXX});
 
+$config{HAS_ARC4RANDOM_BUF} = run_test 'arc4random_buf()', test_file($config{CXX}, 'arc4random_buf.cpp');
 $config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', $^O eq 'darwin' ? undef : '-lrt');
 $config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');
 
@@ -206,6 +207,20 @@ if (defined $opt_gid) {
 } else {
 	@group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} // getgid());
 	print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group;
+	unless ($group[2]) {
+		print_warning <<"EOW";
+You are building as the privileged $group[0] group and have not specified
+an unprivileged group to run InspIRCd as.
+
+This is almost never what you should do. You should probably either create a new
+unprivileged user/group to build and run as or pass the '--gid [id|name]' flag
+to specify an unprivileged group to run as.
+EOW
+		if (!prompt_bool $interactive, "Are you sure you want to build as the $group[0] group?", 0) {
+			say STDERR "If you are sure you want to build as the $group[0] group pass the --gid $group[2] flag." unless $interactive;
+			exit 1;
+		}
+	}
 }
 $config{GROUP} = $group[0];
 $config{GID}   = $group[2];
@@ -218,13 +233,24 @@ if (defined $opt_uid) {
 } else {
 	@user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} // getuid());
 	print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user;
+	unless ($user[2]) {
+		print_warning <<"EOW";
+You are building as the privileged $user[0] user and have not specified
+an unprivileged user to run InspIRCd as.
+
+This is almost never what you should do. You should probably either create a new
+unprivileged user/group to build and run as or pass the '--uid [id|name]' flag
+to specify an unprivileged user to run as.
+EOW
+		if (!prompt_bool $interactive, "Are you sure you want to build as the $user[0] user?", 0) {
+			say STDERR "If you are sure you want to build as the $user[0] user pass the --uid $user[2] flag." unless $interactive;
+			exit 1;
+		}
+	}
 }
 $config{USER} = $user[0];
 $config{UID}  = $user[2];
 
-# Clear the screen.
-system 'tput', 'clear' if $interactive;
-
 # Warn the user about clock drifting when running on OpenVZ.
 if (-e '/proc/user_beancounters' || -e '/proc/vz/vzaquota') {
 	print_warning <<'EOW';
@@ -242,8 +268,9 @@ not been tested as heavily and may contain various faults which could seriously
 affect the running of your server. It is recommended that you use a stable
 version instead.
 
-You can obtain the latest stable version from http://www.inspircd.org/ or by
-running `git checkout insp20` if you are installing from Git.
+You can obtain the latest stable version from https://www.inspircd.org or by
+running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp3)|>` if you are
+installing from Git.
 EOW
 	if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development // 0) {
 		say STDERR 'If you understand this warning and still want to continue pass the --development flag.' unless $interactive;
@@ -297,13 +324,37 @@ if (prompt_bool $interactive, $question, 0) {
 } else {
 	# TODO: finish modulemanager rewrite and replace this code with:
 	# system './modulemanager', 'enable', '--auto';
-	enable_extras 'm_ssl_gnutls.cpp' unless system 'pkg-config --exists gnutls >/dev/null 2>&1';
-	enable_extras 'm_ssl_mbedtls.cpp' if -e '/usr/include/mbedtls/ssl.h';
-	enable_extras 'm_ssl_openssl.cpp' unless system 'pkg-config --exists openssl >/dev/null 2>&1';
+	my %modules = (
+		# Missing: m_ldap, m_regex_stdlib, m_ssl_mbedtls
+		'm_geoip.cpp'           => 'pkg-config --exists geoip',
+		'm_mysql.cpp'           => 'mysql_config --version',
+		'm_pgsql.cpp'           => 'pg_config --version',
+		'm_regex_pcre.cpp'      => 'pcre-config --version',
+		'm_regex_posix.cpp'     => undef,
+		'm_regex_re2.cpp'       => 'pkg-config --exists re2',
+		'm_regex_tre.cpp'       => 'pkg-config --exists tre',
+		'm_sqlite3.cpp'         => 'pkg-config --exists sqlite3',
+		'm_ssl_gnutls.cpp'      => 'pkg-config --exists gnutls',
+		'm_ssl_openssl.cpp'     => 'pkg-config --exists openssl',
+		'm_sslrehashsignal.cpp' => undef,
+	);
+	while (my ($module, $command) = each %modules) {
+		unless (defined $command && system "$command 1>/dev/null 2>/dev/null") {
+			enable_extras $module;
+		}
+	}
 }
 
 # Generate SSL certificates.
-if (<src/modules/m_ssl_*.cpp> && prompt_bool $interactive, 'Would you like to generate SSL certificates now?', $interactive) {
+$question = <<EOQ;
+Would you like to generate a self-signed SSL certificate now? This certificate
+can be used for testing but <|BOLD should not|> be used on a production network.
+
+Note: you can get a <|BOLD free|> CA-signed certificate from Let's Encrypt. See
+https://letsencrypt.org/getting-started/ for more details.
+EOQ
+
+if (<src/modules/m_ssl_*.cpp> && prompt_bool $interactive, $question, $interactive) {
 	system './tools/genssl', 'auto';
 }
 
@@ -346,7 +397,7 @@ print_format <<"EOM";
 <|GREEN Execution User:|>  $config{USER} ($config{UID})
 <|GREEN Socket Engine:|>   $config{SOCKETENGINE}
 
-To build with these settings run '<|GREEN make -j${\get_cpu_count}|>' now.
+To build with these settings run '<|GREEN make -j${\get_cpu_count} install|>' now.
 
 EOM