# <brain@chatspike.net>
# <Craig@chatspike.net>
#
+# Licensed under GPL, please see the COPYING file
+# for more information
+#
# [14:21] Brain: <matrix impression> i know perl-fu!
#
# $Id$
# Utility functions for our buildsystem
use make::utilities;
use make::configure;
+use make::gnutlscert;
GetOptions (
'enable-gnutls' => \$opt_use_gnutls,
'with-nick-length=i' => \$opt_nick_length,
'with-channel-length=i' => \$opt_chan_length,
'with-max-clients=i' => \$opt_maxclients,
+ 'enable-ports' => \$opt_ports,
'enable-epoll' => \$opt_epoll,
'enable-kqueue' => \$opt_kqueue,
+ 'disable-ports' => \$opt_noports,
'disable-epoll' => \$opt_noepoll,
'disable-kqueue' => \$opt_nokqueue,
'enable-ipv6' => \$opt_ipv6,
(defined $opt_noipv6links) ||
(defined $opt_kqueue) ||
(defined $opt_epoll) ||
+ (defined $opt_ports) ||
(defined $opt_maxchans) ||
(defined $opt_opermaxchans) ||
(defined $opt_chan_length) ||
(defined $opt_use_openssl) ||
(defined $opt_nokqueue) ||
(defined $opt_noepoll) ||
+ (defined $opt_noports) ||
(defined $opt_use_gnutls)
);
my $interactive = !$non_interactive;
$config{LIBRARY_DIR} = $opt_library_dir;
}
chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL} = `openssl version 2>/dev/null`); # Openssl version
+chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version
+chomp($gnutls_ver = $config{HAS_GNUTLS});
+chomp($openssl_ver = $config{HAS_OPENSSL});
$config{USE_GNUTLS} = "n";
if (defined $opt_use_gnutls)
{
{
$config{USE_EPOLL} = "n";
}
+$config{USE_PORTS} = "y"; # epoll enabled
+if (defined $opt_ports)
+{
+ $config{USE_PORTS} = "y";
+}
+if (defined $opt_noports)
+{
+ $config{USE_PORTS} = "n";
+}
$config{IPV6} = "n"; # IPv6 support (experimental)
if (defined $opt_ipv6)
{
$config{MAX_AWAY} = $opt_away;
}
-$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])?(\-[a-z][0-9])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
+$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
$config{HAS_OPENSSL} = $1;
if ($config{GCCVER} eq "") {
getosflags();
}
$has_epoll = $config{HAS_EPOLL};
+ $has_ports = $config{HAS_PORTS};
$has_kqueue = $config{HAS_KQUEUE};
writefiles(1);
makecache();
print "Updating Files..\n";
getosflags();
$has_epoll = $config{HAS_EPOLL};
+ $has_ports = $config{HAS_PORTS};
$has_kqueue = $config{HAS_KQUEUE};
writefiles(0);
makecache();
print "yes\n" if $has_epoll == 1;
print "no\n" if $has_epoll == 0;
+printf "Checking if Solaris I/O completion ports are available... ";
+$has_ports = 0;
+my $system = `uname -s`;
+chomp ($system);
+$has_ports = 1 if ($system eq "SunOS");
+
+if ($has_ports) {
+ my $kernel = `uname -r`;
+ chomp($kernel);
+ if (($kernel !~ /^5\.10/)) {
+ $has_ports = 0;
+ }
+}
+print "yes\n" if $has_ports == 1;
+print "no\n" if $has_ports == 0;
+
if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
$config{HAS_STRLCPY} = "true";
}
yesno(USE_EPOLL,"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
print "\n";
}
- $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y"));
+ if ($has_ports) {
+ yesno(USE_PORTS,"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
+ print "\n";
+ }
+ $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y"));
if (!$chose_hiperf) {
print "No high-performance socket engines are available, or you chose\n";
print "not to enable one. Defaulting to select() engine.\n\n";
}
if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
- print "I have detected both GnuTLS and OpenSSL on your system.\n";
+ print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
print "I will default to GnuTLS. If you wish to use OpenSSL\n";
print "instead, you should enable the OpenSSL module yourself\n";
print "by copying it from src/modules/extra to src/modules.\n\n";
+ print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
+ print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
}
if ($config{HAS_GNUTLS} eq "y") {
print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
}
}
+ else {
+ print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+ }
print "\nThe following questions will ask you for various figures relating\n";
print "To your IRCd install. Please note that these should usually be left\n";
* Generating the Private Key may take some time, go grab a *
* Coffee. Even better, to generate some more entropy if it *
* is taking a while, open another console and type du / a *
-* few times and get that HD going :) Then answer the *
+* few times and get that HD going :) Then answer the *
* Questions which follow. If you are unsure, just hit enter *
*************************************************************\n\n";
- system("certtool --generate-privkey --outfile key.pem");
- system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem");
+ make_gnutls_cert();
print "\nCertificate generation complete, copying to config directory... ";
system("mv key.pem $config{CONFIG_DIR}/key.pem");
system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
print "SSL Certificates Not found, Generating.. \n\n
*************************************************************
* Generating the certificates may take some time, go grab a *
-* coffee, or something. *
+* coffee, or something. *
*************************************************************\n\n";
system("openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem");
system("openssl dhparam -out dhparams.pem 1024");
$se = "socketengine_epoll";
$use_hiperf = 1;
}
+ if (($has_ports) && ($config{USE_PORTS} eq "y")) {
+ print FILEHANDLE "#define USE_PORTS\n";
+ $se = "socketengine_ports";
+ $use_hiperf = 1;
+ }
# user didn't choose either epoll or select for their OS.
# default them to USE_SELECT (ewwy puke puke)
if (!$use_hiperf) {
elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
$se = "socketengine_epoll";
}
+elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+ $se = "socketengine_ports";
+}
###
# This next section is for cygwin dynamic module builds.
elsif (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
$se = "socketengine_epoll";
}
+ elsif (($has_ports) && ($config{USE_PORTS} eq "y")) {
+ $se = "socketengine_ports";
+ }
open(FH,">src/Makefile") or die("Could not write src/Makefile");
print FH <<EOM;
projects / user / henk / code / inspircd.git / blobdiff