diff -Nru ircd-hybrid-8.2.12+dfsg.1/aclocal.m4 ircd-hybrid-8.2.17+dfsg.1/aclocal.m4 --- ircd-hybrid-8.2.12+dfsg.1/aclocal.m4 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/aclocal.m4 2016-04-21 18:37:07.000000000 +0000 @@ -1210,6 +1210,7 @@ m4_include([m4/ax_arg_enable_assert.m4]) m4_include([m4/ax_arg_enable_debugging.m4]) m4_include([m4/ax_arg_enable_warnings.m4]) +m4_include([m4/ax_arg_gnutls.m4]) m4_include([m4/ax_arg_ioloop_mechanism.m4]) m4_include([m4/ax_arg_libgeoip.m4]) m4_include([m4/ax_arg_openssl.m4]) diff -Nru ircd-hybrid-8.2.12+dfsg.1/AUTHORS ircd-hybrid-8.2.17+dfsg.1/AUTHORS --- ircd-hybrid-8.2.12+dfsg.1/AUTHORS 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/AUTHORS 2016-04-21 18:37:07.000000000 +0000 @@ -1,4 +1,4 @@ -$Id: AUTHORS 5303 2015-01-04 21:27:56Z michael $ +$Id: AUTHORS 7528 2016-04-10 17:25:44Z michael $ The hybrid team is a group of ircd coders who were frustrated with the instability and all-out "dirtiness" of the EFnet ircds @@ -6,22 +6,19 @@ of people, all of us. Anyone is welcome to contribute to this effort. You are encouraged -to participate in the Hybrid mailing list. To subscribe to the -Hybrid List, use this link: +to participate in the ircd-hybrid mailing list. To subscribe to the +ircd-hybrid list, use this link: https://lists.ircd-hybrid.org/mailman/listinfo/hybrid The core team as of this major release: -billy-jon, William Bierman III -cryogen, Stuart Walsh Dianora, Diane Bruce -metalrock, Jack Low Michael, Michael Wobst Rodder, Jon Lusky Wohali, Joan Touzet The following people have contributed blood, sweat, and/or code to -recent releases of Hybrid, in nick alphabetical order: +recent releases of ircd-hybrid, in nick alphabetical order: A1kmm, Andrew Miller Adam, Adam @@ -29,8 +26,10 @@ adx, Piotr Nizynski AndroSyn, Aaron Sethman bane, Dragan Dosen +billy-jon, William Bierman III bysin, Ben Kittridge cosine, Patrick Alken +cryogen, Stuart Walsh David-T, David Taylor Dom, Dominic Hargreaves Fawkes, Christoph Ostermeier @@ -47,6 +46,7 @@ knight, Alan LeVee kre, Dinko Korunic madmax, Paul Lomax +metalrock, Jack Low Riedel, Dennis Vink, scuzzy, David Todd spookey, David Colburn diff -Nru ircd-hybrid-8.2.12+dfsg.1/ChangeLog ircd-hybrid-8.2.17+dfsg.1/ChangeLog --- ircd-hybrid-8.2.12+dfsg.1/ChangeLog 2016-01-05 14:57:57.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/ChangeLog 2016-04-21 18:37:19.000000000 +0000 @@ -1,3 +1,1649 @@ +2016-04-21 14:11:11 michael + + * [r7545] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-04-21 07:15:58 michael + + * [r7543] /ircd-hybrid/branches/8.2.x/src/channel.c: + - channel.c:channel_do_join(): const correctness + +2016-04-21 06:32:05 michael + + * [r7541] /ircd-hybrid/branches/8.2.x/src/channel.c: + - channel.c:add_invite(): trim down client's invite list until there are no more + than ConfigChannel.max_channels entries on the list + +2016-04-20 14:38:32 michael + + * [r7540] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-04-20 14:31:28 michael + + * [r7538] /ircd-hybrid/branches/8.2.x/src/channel.c: + - channel.c:add_invite(): fixed possible core with channel::max_channels = 0 + +2016-04-11 11:02:36 michael + + * [r7536] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:check_client(): removed redudant sockhost info in server notice + +2016-04-11 10:46:54 michael + + * [r7534] /ircd-hybrid/branches/8.2.x/include/conf.h: + - conf.c: removed unused cluster_a_line() prototype + +2016-04-10 13:34:51 michael + + * [r7532] /ircd-hybrid/branches/8.2.x/src/server.c: + - server.c:find_servconn_in_progress(): replace match() call with irccmp() + +2016-04-10 13:29:41 michael + + * [r7530] /ircd-hybrid/branches/8.2.x/src/server.c: + - server.c:show_capabilities(): remove "TS" which is irrelevant info + +2016-04-10 13:25:44 michael + + * [r7528] /ircd-hybrid/branches/8.2.x/AUTHORS, + /ircd-hybrid/branches/8.2.x/src/version.c: + - Update AUTHORS and version.c + +2016-04-06 12:26:08 michael + + * [r7526] /ircd-hybrid/branches/8.2.x/include/whowas.h: + - whowas.h: documentation + +2016-04-04 14:51:46 michael + + * [r7524] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c:mo_connect(): don't let 'flags::connect:remote' override 'flags::connect' + +2016-04-03 06:16:18 michael + + * [r7522] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: tweaks and updates by Dominic Hargreaves + +2016-04-02 11:55:25 michael + + * [r7520] /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/server.c: + - attach_connect_block(), check_server(): replace match() calls with irccmp() since the + strings that are to be compared cannot contain wildcards anyway + +2016-03-30 14:26:55 michael + + * [r7519] /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/patchlevel.h: + - Bump version to hybrid-8.2.17 + +2016-03-30 14:25:44 michael + + * [r7518] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-03-30 14:22:29 michael + + * [r7516] /ircd-hybrid/branches/8.2.x/src/channel_mode.c: + - channel_mode.c: cosmetical changes + +2016-03-26 15:57:32 michael + + * [r7514] /ircd-hybrid/branches/8.2.x/include/ircd_defs.h: + - ircd_defs.h: increase REASONLEN to 260 + +2016-03-26 15:55:16 michael + + * [r7512] /ircd-hybrid/branches/8.2.x/include/ircd_defs.h, + /ircd-hybrid/branches/8.2.x/modules/core/m_kill.c, + /ircd-hybrid/branches/8.2.x/modules/m_svskill.c: + - Removed KILLLEN; use REASONLEN instead + +2016-03-26 15:48:19 michael + + * [r7510] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:show_iline_prefix(): whitespace change + +2016-03-26 15:46:51 michael + + * [r7508] /ircd-hybrid/branches/8.2.x/include/ircd_defs.h: + - ircd_defs.h: add TOPICLEN documentation + +2016-03-26 15:30:22 michael + + * [r7506] /ircd-hybrid/branches/8.2.x/include/ircd_defs.h: + - ircd_defs.h: improve NICKLEN documentation + +2016-03-25 14:08:30 michael + + * [r7504] /ircd-hybrid/branches/8.2.x/src/reslib.c: + - reslib.c:add_nameserver(): remove useless test on 'res' + +2016-03-25 10:27:04 michael + + * [r7502] /ircd-hybrid/branches/8.2.x/include/mempool.h: + - mempool.h: #undef MEMPOOL_STATS + +2016-03-22 15:48:49 michael + + * [r7500] /ircd-hybrid/branches/8.2.x/src/mempool.c: + - mempool.c:mp_pool_get(): stylistic change + +2016-03-22 15:46:44 michael + + * [r7498] /ircd-hybrid/branches/8.2.x/include/modules.h, + /ircd-hybrid/branches/8.2.x/src/modules.c: + - modules.h, modules.c: avoid using HYB_PATH_MAX for module_path::path + +2016-03-21 16:33:32 michael + + * [r7496] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c:whowas_make(): fixed potential core when general::whowas_history_length is set to 0 + +2016-03-21 16:03:33 michael + + * [r7494] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c:whowas_trim(): use dlink_list_length + +2016-03-20 07:07:21 michael + + * [r7491] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-03-19 14:58:18 michael + + * [r7489] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c:whowas_trim(): fixed test on whowas_list.tail + +2016-03-16 11:31:44 michael + + * [r7487] /ircd-hybrid/branches/8.2.x/src/client.c: + - client.c:free_client(): fix broken assert() + +2016-03-16 06:44:47 michael + + * [r7485] /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/whowas.h, + /ircd-hybrid/branches/8.2.x/src/whowas.c: + - Rename Client::whowas to Client::whowas_list + +2016-03-16 05:28:00 michael + + * [r7483] /ircd-hybrid/branches/8.2.x/src/hash.c: + - hash.c: remove unused header includes + +2016-03-16 05:18:07 michael + + * [r7481] /ircd-hybrid/branches/8.2.x/src/event.c: + - event.c: remove unused header includes + +2016-03-16 04:53:26 michael + + * [r7479] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:read_conf_files(): removed isupport_rebuild() call no longer needed + +2016-03-15 15:28:12 michael + + * [r7477] /ircd-hybrid/branches/8.2.x/include/numeric.h: + - numeric.h: remove irrelevant comment + +2016-03-15 15:20:54 michael + + * [r7475] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - Update reference.conf + +2016-03-13 15:15:57 michael + + * [r7474] /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/patchlevel.h: + - Bump version to hybrid-8.2.16 + +2016-03-13 08:31:57 michael + + * [r7472] /ircd-hybrid/branches/8.2.x/src/watch.c: + - watch.c: remove unused header include + +2016-03-13 07:50:44 michael + + * [r7470] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: style corrections; use const keyword where appropriate + +2016-03-12 14:06:56 michael + + * [r7468] /ircd-hybrid/branches/8.2.x/modules/m_svsnick.c: + - m_svsnick.c:ms_svsnick(): split up if statement + +2016-03-12 09:16:37 michael + + * [r7466] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:stats_memory(): remove TOTAL info which is completely off anyway + +2016-03-12 08:45:42 michael + + * [r7465] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-03-12 08:13:43 michael + + * [r7463] /ircd-hybrid/branches/8.2.x/src/client.c: + - client.c:find_chasing(): remove useless cast + +2016-03-12 08:12:11 michael + + * [r7461] /ircd-hybrid/branches/8.2.x/modules/core/m_kill.c: + - m_kill.c:mo_kill(): remove ueseless cast + +2016-03-12 07:56:34 michael + + * [r7459] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: renamings + +2016-03-12 07:51:35 michael + + * [r7457] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:stats_events(): use proper conversion specifier + +2016-03-12 07:47:07 michael + + * [r7455] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:stats_memory(): remove extraneous whowas_count_memory() call + +2016-03-11 13:47:05 michael + + * [r7452] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-03-11 12:32:13 michael + + * [r7451] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c: remove unused header include + +2016-03-11 12:21:27 michael + + * [r7448] /ircd-hybrid/branches/8.2.x/include/whowas.h, + /ircd-hybrid/branches/8.2.x/modules/m_whowas.c, + /ircd-hybrid/branches/8.2.x/src/whowas.c: + - Further cleanups to recent WHOWAS changes + +2016-03-11 12:02:00 michael + + * [r7446] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - Update reference.conf + +2016-03-10 15:48:15 michael + + * [r7444] /ircd-hybrid/branches/8.2.x/config.h.in, + /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/src/conf_lexer.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Rebuilt autogenerated files + +2016-03-10 15:27:34 michael + + * [r7443] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c: documentation + +2016-03-10 15:20:54 michael + + * [r7440] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c: documentation + +2016-03-10 15:03:41 michael + + * [r7439] /ircd-hybrid/branches/8.2.x/src/ircd.c: + - ircd.c:main(): actually call whowas_init() now + +2016-03-10 14:57:51 michael + + * [r7436] /ircd-hybrid/branches/8.2.x/doc/reference.conf, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/whowas.h, + /ircd-hybrid/branches/8.2.x/m4/ax_mempool_chunksizes.m4, + /ircd-hybrid/branches/8.2.x/modules/m_info.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_lexer.l, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/ircd.c, + /ircd-hybrid/branches/8.2.x/src/whowas.c: + - Change whowas system to use a linked list instead of othe this monolithic WHOWAS table + - Size of the whowas nick name history length is now configurable + +2016-03-09 12:49:48 michael + + * [r7434] /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c: + - m_dline.c, m_kline.c, m_xline.c: use const keyword where appropriate + +2016-03-09 12:35:59 michael + + * [r7432] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:stats_memory(): variable renamings; remove unused code + +2016-03-08 13:19:38 michael + + * [r7430] /ircd-hybrid/branches/8.2.x/src/client.c, + /ircd-hybrid/branches/8.2.x/src/event.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c: + - Minor style cleanups & constification + +2016-03-07 12:46:09 michael + + * [r7428] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_undline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unkline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c, + /ircd-hybrid/branches/8.2.x/modules/m_unxline.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c, + /ircd-hybrid/branches/8.2.x/src/conf.c: + - parse_aline() cleanups + +2016-03-07 12:17:19 michael + + * [r7426] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: remove unused header includes + +2016-03-07 11:57:04 michael + + * [r7424] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:report_shared(), report_cluster(): increase buffer size for the extra 'c' character + +2016-03-07 11:48:08 michael + + * [r7422] /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c: + - m_dline.c, m_kline.c: expiry time for *LINES set by remote clients is no longer capped at MAX_TDKLINE_TIME + +2016-03-06 14:59:05 michael + + * [r7420] /ircd-hybrid/branches/8.2.x/modules/m_kline.c: + - m_kline.c: save us a second parse_netmask() call + +2016-03-06 14:50:50 michael + + * [r7418] /ircd-hybrid/branches/8.2.x/modules/m_dline.c: + - m_dline.c: deduplicate + +2016-03-06 14:33:46 michael + + * [r7416] /ircd-hybrid/branches/8.2.x/modules/m_kline.c: + - m_kline.c: deduplicate + +2016-03-06 14:18:01 michael + + * [r7414] /ircd-hybrid/branches/8.2.x/modules/m_xline.c: + - m_xline.c: deduplicate + +2016-03-06 13:37:12 michael + + * [r7412] /ircd-hybrid/branches/8.2.x/modules/m_xline.c: + - m_xline.c: merge relay_xline() into ms_xline(); allow services to override valid_wild_card_simple() + +2016-03-06 13:19:24 michael + + * [r7410] /ircd-hybrid/branches/8.2.x/modules/m_kline.c: + - m_kline.c:ms_kline(): allow services to override valid_wild_card() + +2016-03-06 13:09:40 michael + + * [r7408] /ircd-hybrid/branches/8.2.x/modules/m_resv.c: + - m_resv.c:resv_handle(): allow services to override valid_wild_card_simple() + +2016-03-06 12:19:26 michael + + * [r7406] /ircd-hybrid/branches/8.2.x/modules/m_set.c: + - m_set.c:quote_autoconn(): use conf->name when reporting the server name + +2016-03-06 11:57:32 michael + + * [r7404] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: split report_confitem_types() into two separate functions + +2016-03-06 11:32:59 michael + + * [r7402] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/modules/m_oper.c, + /ircd-hybrid/branches/8.2.x/src/conf.c: + - Remove useless parameters from operator_find() + +2016-03-06 11:10:14 michael + + * [r7400] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/modules/m_connect.c, + /ircd-hybrid/branches/8.2.x/modules/m_oper.c, + /ircd-hybrid/branches/8.2.x/modules/m_set.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/server.c: + - Cleanups to operator/connect block lookup routines + +2016-03-06 05:21:18 michael + + * [r7398] /ircd-hybrid/branches/8.2.x/include/numeric.h, + /ircd-hybrid/branches/8.2.x/src/numeric.c: + - numeric.h, numeric.c: remove unused ERR_NOADMININFO + +2016-03-05 13:33:21 michael + + * [r7396] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: merge some of the recently introduced conf-report functions + +2016-03-05 11:59:34 michael + + * [r7395] /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c: rename some variables for consistency + +2016-03-05 11:55:57 michael + + * [r7392] /ircd-hybrid/branches/8.2.x/include/whowas.h, + /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas.c: doxygen + +2016-03-05 11:45:59 michael + + * [r7390] /ircd-hybrid/branches/8.2.x/src/list.c: + - list.c: cleanup/dedup dlinkFindDelete() + +2016-03-04 12:05:06 michael + + * [r7388] /ircd-hybrid/branches/8.2.x/doc/ircd.8: + - Update doc/ircd.8 by jackal + +2016-03-03 07:38:02 michael + + * [r7386] /ircd-hybrid/branches/8.2.x/doc/reference.conf, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - Remove artificial cap of minimum required size of the dh parameter file + +2016-03-03 07:16:34 michael + + * [r7384] /ircd-hybrid/branches/8.2.x/include/conf.h: + - conf.h: removed now unused MaskItem::count + +2016-03-02 13:09:09 michael + + * [r7383] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c whitespace changes + +2016-03-02 12:51:43 michael + + * [r7380] /ircd-hybrid/branches/8.2.x/src/send.c: + - send.c:sendto_realops_flags(): use sendto_one_notice() + +2016-03-01 12:34:47 michael + + * [r7378] /ircd-hybrid/branches/8.2.x/src/parse.c: + - parse.c:parse(): change length to size_t type + +2016-02-28 12:36:55 michael + + * [r7376] /ircd-hybrid/branches/8.2.x/src/numeric.c: + - numeric.c: RPL_TRACEUNKNOWN: use proper conversion specifier for 'uintmax_t' + +2016-02-28 12:05:07 michael + + * [r7374] /ircd-hybrid/branches/8.2.x/modules/m_svskill.c: + - m_svskill.c: remove unused header include + +2016-02-28 12:02:08 michael + + * [r7372] /ircd-hybrid/branches/8.2.x/modules/m_svstag.c: + - m_svstag.c: remove unused header includes + +2016-02-28 11:48:59 michael + + * [r7370] /ircd-hybrid/branches/8.2.x/help/invite: + - Update help/invite explaining what INVITE with no arguments does + +2016-02-24 07:45:53 michael + + * [r7367] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS + +2016-02-24 07:40:02 michael + + * [r7365] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS + +2016-02-24 07:39:07 michael + + * [r7363] /ircd-hybrid/branches/8.2.x/README: + - Update README + +2016-02-23 16:13:08 michael + + * [r7362] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-23 14:35:02 michael + + * [r7360] /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c: + - m_resv.c, m_xline.c: replaced atoi() with strtoumax() + +2016-02-22 15:17:40 michael + + * [r7359] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-22 14:55:28 michael + + * [r7358] /ircd-hybrid/branches/8.2.x/configure: + - autoreconf + +2016-02-22 14:54:39 michael + + * [r7357] /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/patchlevel.h: + - Bump version to 8.2.15 + +2016-02-22 13:59:30 michael + + * [r7356] /ircd-hybrid/branches/8.2.x/modules/core/m_join.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_server.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_sjoin.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/channel_mode.c, + /ircd-hybrid/branches/8.2.x/src/server.c: + - Cleanup more conversion specifiers + +2016-02-21 07:52:34 michael + + * [r7354] /ircd-hybrid/branches/8.2.x/modules/core/m_message.c: + - m_message.c:build_target_list(): stylistic changes + +2016-02-21 07:45:02 michael + + * [r7351] /ircd-hybrid/branches/8.2.x/modules/core/m_message.c: + - m_message.c:flood_attack_*(): incorporate fixes from p4 so 'can_flood' actually works + +2016-02-21 06:56:06 michael + + * [r7350] /ircd-hybrid/branches/8.2.x/include/listener.h, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/listener.c: + - Show some stats about allocated listeners in /stats z + +2016-02-21 06:44:24 michael + + * [r7347] /ircd-hybrid/branches/8.2.x/include/fdlist.h, + /ircd-hybrid/branches/8.2.x/src/server.c: + - Remove unused header includes + +2016-02-21 06:27:43 michael + + * [r7346] /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/listener.h, + /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/client.c, + /ircd-hybrid/branches/8.2.x/src/listener.c: + - Remove excessive 'const' + +2016-02-21 06:16:54 michael + + * [r7343] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: remove stats_usage() + +2016-02-21 06:12:56 michael + + * [r7342] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-20 13:55:29 michael + + * [r7341] /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/src/client.c: + - client_attach_svstag(): remove excessive 'const' + +2016-02-20 13:48:05 michael + + * [r7338] /ircd-hybrid/branches/8.2.x/modules/m_eob.c: + - m_eob.c:ms_eob(): use proper conversion specifier + +2016-02-20 13:11:14 michael + + * [r7336] /ircd-hybrid/branches/8.2.x/src/client.c: + - client.c:exit_client(): improve user logging + +2016-02-20 12:50:27 michael + + * [r7334] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:clear_out_old_conf(): removed double motd_clear() call which somehow sneaked in + +2016-02-19 12:56:28 michael + + * [r7333] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-19 12:52:18 michael + + * [r7331] /ircd-hybrid/branches/8.2.x/README: + - README: add 'Raspbian Jessie' to tested platforms + +2016-02-18 16:07:50 michael + + * [r7329] /ircd-hybrid/branches/8.2.x/include/auth.h, + /ircd-hybrid/branches/8.2.x/include/channel.h, + /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/conf_gecos.h, + /ircd-hybrid/branches/8.2.x/include/conf_resv.h, + /ircd-hybrid/branches/8.2.x/include/event.h, + /ircd-hybrid/branches/8.2.x/include/fdlist.h, + /ircd-hybrid/branches/8.2.x/include/ipcache.h, + /ircd-hybrid/branches/8.2.x/include/ircd.h, + /ircd-hybrid/branches/8.2.x/include/misc.h, + /ircd-hybrid/branches/8.2.x/include/motd.h, + /ircd-hybrid/branches/8.2.x/include/s_bsd.h, + /ircd-hybrid/branches/8.2.x/include/send.h, + /ircd-hybrid/branches/8.2.x/include/watch.h, + /ircd-hybrid/branches/8.2.x/include/whowas.h, + /ircd-hybrid/branches/8.2.x/modules/core/m_bmask.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_join.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_kill.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_nick.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_sjoin.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_tmode.c, + /ircd-hybrid/branches/8.2.x/modules/m_admin.c, + /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_help.c, + /ircd-hybrid/branches/8.2.x/modules/m_info.c, + /ircd-hybrid/branches/8.2.x/modules/m_invite.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_links.c, + /ircd-hybrid/branches/8.2.x/modules/m_lusers.c, + /ircd-hybrid/branches/8.2.x/modules/m_map.c, + /ircd-hybrid/branches/8.2.x/modules/m_motd.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/modules/m_svinfo.c, + /ircd-hybrid/branches/8.2.x/modules/m_svskill.c, + /ircd-hybrid/branches/8.2.x/modules/m_svsmode.c, + /ircd-hybrid/branches/8.2.x/modules/m_svsnick.c, + /ircd-hybrid/branches/8.2.x/modules/m_svstag.c, + /ircd-hybrid/branches/8.2.x/modules/m_tburst.c, + /ircd-hybrid/branches/8.2.x/modules/m_version.c, + /ircd-hybrid/branches/8.2.x/modules/m_who.c, + /ircd-hybrid/branches/8.2.x/modules/m_whois.c, + /ircd-hybrid/branches/8.2.x/modules/m_whowas.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c, + /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/client.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/event.c, + /ircd-hybrid/branches/8.2.x/src/ircd.c, + /ircd-hybrid/branches/8.2.x/src/listener.c, + /ircd-hybrid/branches/8.2.x/src/misc.c, + /ircd-hybrid/branches/8.2.x/src/res.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd_devpoll.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd_epoll.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd_kqueue.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd_poll.c, + /ircd-hybrid/branches/8.2.x/src/send.c, + /ircd-hybrid/branches/8.2.x/src/whowas.c, + /ircd-hybrid/branches/8.2.x/tools/mkpasswd.c: + - Now that we got time_t to work nicely on openbsd with snprintf's conversion specifiers, + we ran into a similiar issue on Raspbian/ARMv7's time_t which is of signed 32 bit and + doesn't cope at all with %j. Instead of doing tricks, get rid of time_t everywhere and + forever and use uintmax_t instead which has at least a 'standardized' conversion specifier + associated with it. + +2016-02-16 12:36:55 michael + + * [r7328] /ircd-hybrid/branches/8.2.x/include/fdlist.h: + - fdlist.h: removed FILEIO_V2 define + +2016-02-16 12:32:07 michael + + * [r7325] /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/conf_cluster.h, + /ircd-hybrid/branches/8.2.x/include/conf_service.h, + /ircd-hybrid/branches/8.2.x/include/conf_shared.h, + /ircd-hybrid/branches/8.2.x/include/s_bsd.h, + /ircd-hybrid/branches/8.2.x/include/whowas.h: + - Remove useless header includes + +2016-02-14 11:28:20 michael + + * [r7324] /ircd-hybrid/branches/8.2.x/include/client.h: + - client.h: remove unused struct MaskItem declaration + +2016-02-14 10:40:45 michael + + * [r7321] /ircd-hybrid/branches/8.2.x/include/conf_cluster.h, + /ircd-hybrid/branches/8.2.x/include/send.h, + /ircd-hybrid/branches/8.2.x/src/conf_cluster.c, + /ircd-hybrid/branches/8.2.x/src/send.c: + - Constification + +2016-02-14 10:22:23 michael + + * [r7320] /ircd-hybrid/branches/8.2.x/src/conf_parser.c: + - Re-built parser files + +2016-02-14 10:20:48 michael + + * [r7317] /ircd-hybrid/branches/8.2.x/src/conf_parser.y: + - conf_parser.y: fixed triggered assert with user = "" in auth {} blocks + +2016-02-12 14:46:11 michael + + * [r7315] /ircd-hybrid/branches/8.2.x/include/conf_resv.h: + - conf_resv.h: removed unused struct ResvExemptItem members + +2016-02-10 06:16:42 michael + + * [r7314] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c:report_gecos(): whitespace change + +2016-02-10 06:01:53 michael + + * [r7311] /ircd-hybrid/branches/8.2.x/include/conf_gecos.h, + /ircd-hybrid/branches/8.2.x/include/conf_service.h, + /ircd-hybrid/branches/8.2.x/src/conf_gecos.c, + /ircd-hybrid/branches/8.2.x/src/conf_service.c: + - svn propset + +2016-02-10 05:55:30 michael + + * [r7309] /ircd-hybrid/branches/8.2.x/include/conf_gecos.h, + /ircd-hybrid/branches/8.2.x/src/conf_gecos.c: + - conf_gecos.h, conf_gecos.c: fixed copyright info + +2016-02-10 05:47:36 michael + + * [r7307] /ircd-hybrid/branches/8.2.x/src/Makefile.in, + /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - autoreconf + - re-create parser files + +2016-02-10 05:46:47 michael + + * [r7306] /ircd-hybrid/branches/8.2.x/include/conf_gecos.h, + /ircd-hybrid/branches/8.2.x/src/conf_gecos.c: + - Add conf_gecos.* + +2016-02-10 05:34:25 michael + + * [r7303] /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/modules/m_unxline.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/client.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_db.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/numeric.c, + /ircd-hybrid/branches/8.2.x/src/user.c: + - Cleanup/separate XLINE / gecos{} conf implementation + +2016-02-09 16:53:02 michael + + * [r7301] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-09 16:20:42 michael + + * [r7299] /ircd-hybrid/branches/8.2.x/modules/m_info.c: + - m_info.c: OUTPUT_STRING for libgeoip_ipv4_database_file and libgeoip_ipv6_database_file + +2016-02-09 16:13:42 michael + + * [r7298] /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/patchlevel.h: + - Bump version to 8.2.14 + +2016-02-09 14:39:40 michael + + * [r7297] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-09 14:34:26 michael + + * [r7295] /ircd-hybrid/branches/8.2.x/src/tls_none.c: + - tls_none.c:tls_new_cred(): return 1 if no tls support is available so conf_handle_tls() doesn't exit the process + +2016-02-09 14:02:08 michael + + * [r7293] /ircd-hybrid/branches/8.2.x/src/conf_pseudo.c: + - conf_pseudo.c: renaming for consistency + +2016-02-08 14:29:22 michael + + * [r7291] /ircd-hybrid/branches/8.2.x/modules/m_resv.c: + - m_resv.c: cosmetical changes + +2016-02-07 15:12:50 michael + + * [r7289] /ircd-hybrid/branches/8.2.x/src/conf_resv.c: + - conf_resv.c:resv_make(): move code + +2016-02-07 14:54:53 michael + + * [r7287] /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/src/conf_resv.c: + - Further fixes to resv rewrite + +2016-02-07 13:39:06 michael + + * [r7285] /ircd-hybrid/branches/8.2.x/src/conf_resv.c: + - conf_resv.c:resv_make(): actually add the item to its corresponding list + +2016-02-07 13:25:56 michael + + * [r7284] /ircd-hybrid/branches/8.2.x/src/conf_parser.c: + - Re-create parser files + +2016-02-07 13:02:24 michael + + * [r7281] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/conf_resv.h, + /ircd-hybrid/branches/8.2.x/modules/core/m_nick.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c, + /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_db.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/conf_resv.c, + /ircd-hybrid/branches/8.2.x/src/numeric.c: + - Cleanup/separate RESV conf implementation + +2016-02-07 10:31:23 michael + + * [r7280] /ircd-hybrid/branches/8.2.x/src/ircd.c: + - ircd.c: ensure ircd.log is set up properly before calling tls_init() + +2016-02-07 10:28:09 michael + + * [r7277] /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls_openssl.c: removed logging to stderr which is closed at this point anyway + +2016-02-06 16:09:05 michael + + * [r7276] /ircd-hybrid/branches/8.2.x/src/tls_none.c: + - tls_none.c: add missing tls_handshake() dummy + +2016-02-06 15:55:20 michael + + * [r7273] /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/server.c, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - Let's do this better + +2016-02-06 15:48:06 michael + + * [r7272] /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/server.c, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_none.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - Don't exit out with GnuTLS when there's no key and/or certificate + +2016-02-06 14:24:53 michael + + * [r7269] /ircd-hybrid/branches/8.2.x/include/ircd_defs.h, + /ircd-hybrid/branches/8.2.x/src/ircd.c: + - Leave fd 3 open for GnuTLS < 3.3.10 that don't have https://gitlab.com/gnutls/gnutls/commit/684b825f5f78cc7ad1f61be232fd20ee0bc5b56f + + " When gnutls_global_init() is called manually from the application check the urandom fd for validity + That addresses the issue where a server closes all open file descriptors + and then calls gnutls_global_init(). " + +2016-02-06 14:02:58 michael + + * [r7268] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: another whitespace cleanup + +2016-02-06 14:01:29 michael + + * [r7265] /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/conf_class.c, + /ircd-hybrid/branches/8.2.x/src/motd.c: + - Minor simplifications on clearing lists + +2016-02-06 13:04:21 michael + + * [r7264] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: whitespace change + +2016-02-06 12:38:17 michael + + * [r7261] /ircd-hybrid/branches/8.2.x/src/conf_lexer.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Re-create parser files + +2016-02-06 12:35:35 michael + + * [r7260] /ircd-hybrid/branches/8.2.x/src/conf_service.c: + - conf_service.c:service_clear(): free() service->name + +2016-02-06 12:28:28 michael + + * [r7257] /ircd-hybrid/branches/8.2.x/doc/reference.conf, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/ircd.h, + /ircd-hybrid/branches/8.2.x/modules/m_info.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_lexer.l, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/ircd.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c: + - Improve libGeoIP support + +2016-02-04 12:38:40 michael + + * [r7255] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: minor doc improvements to service {} section + +2016-02-04 12:29:05 michael + + * [r7254] /ircd-hybrid/branches/8.2.x/include/conf_cluster.h: + - conf_cluster: remove useless header include + +2016-02-04 12:24:07 michael + + * [r7250] /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Re-create parser files + +2016-02-04 12:23:21 michael + + * [r7249] /ircd-hybrid/branches/8.2.x/src/Makefile.in: + - autoreconf + +2016-02-04 12:19:38 michael + + * [r7247] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/conf_service.h, + /ircd-hybrid/branches/8.2.x/modules/core/m_server.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/conf_service.c: + - Move service {} block configuration management into its own module + +2016-02-03 13:30:27 michael + + * [r7246] /ircd-hybrid/branches/8.2.x/include/modules.h, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/modules.c: + - Renamed 'mod_clear_paths()' to 'modules_conf_clear()'. Further simplification to modules_conf_clear() + +2016-02-03 13:18:49 michael + + * [r7243] /ircd-hybrid/branches/8.2.x/src/client.c, + /ircd-hybrid/branches/8.2.x/src/conf_pseudo.c, + /ircd-hybrid/branches/8.2.x/src/whowas.c: + - whowas_off_history(), pseudo_clear(), client_clear_svstags(): simplifications + +2016-02-03 11:55:51 michael + + * [r7242] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-03 11:40:25 michael + + * [r7240] /ircd-hybrid/branches/8.2.x/include/conf_cluster.h, + /ircd-hybrid/branches/8.2.x/src/conf_cluster.c, + /ircd-hybrid/branches/8.2.x/src/conf_shared.c: + - conf_cluster, conf_shared: remove unused header includes + +2016-02-03 11:36:00 michael + + * [r7239] /ircd-hybrid/branches/8.2.x/src/conf_parser.c: + - Recreate parser files + +2016-02-03 11:33:23 michael + + * [r7236] /ircd-hybrid/branches/8.2.x/src/Makefile.in: + - autoreconf + +2016-02-03 11:33:03 michael + + * [r7235] /ircd-hybrid/branches/8.2.x/include/conf_resv.h, + /ircd-hybrid/branches/8.2.x/include/resv.h, + /ircd-hybrid/branches/8.2.x/modules/core/m_join.c, + /ircd-hybrid/branches/8.2.x/modules/core/m_nick.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_db.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/conf_resv.c, + /ircd-hybrid/branches/8.2.x/src/hash.c, + /ircd-hybrid/branches/8.2.x/src/resv.c: + - Move resv.* to conf_resv.* + +2016-02-03 11:07:31 michael + + * [r7232] /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls_openssl.c: removed extraneous curly braces not needed with c99 + +2016-02-03 11:00:39 michael + + * [r7231] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:conf_handle_tls(): use EXIT_FAILURE + +2016-02-03 10:58:38 michael + + * [r7228] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c: documenting + +2016-02-03 10:52:27 michael + + * [r7227] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:oper_privs_as_string(): rename variables + +2016-02-03 10:47:51 michael + + * [r7224] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:oper_privs_as_string(): adjust/improve buffer size + +2016-02-03 10:41:13 michael + + * [r7223] /ircd-hybrid/branches/8.2.x/src/send.c: + - send.c:sendto_match_servs(): fixed longstanding issue where we would cluster to non-CLUSTER capable servers + +2016-02-03 10:35:45 michael + + * [r7220] /ircd-hybrid/branches/8.2.x/include/conf_cluster.h, + /ircd-hybrid/branches/8.2.x/include/conf_shared.h, + /ircd-hybrid/branches/8.2.x/src/conf_cluster.c, + /ircd-hybrid/branches/8.2.x/src/conf_shared.c: + - svn propset + +2016-02-03 10:29:52 michael + + * [r7219] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: renamings & constifications + +2016-02-03 10:22:04 michael + + * [r7216] /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.c:clear_out_old_conf(): clear ClusterItems + +2016-02-03 10:14:50 michael + + * [r7215] /ircd-hybrid/branches/8.2.x/include/conf.h: + - conf.h: removed old shared_items leftover + +2016-02-03 10:12:21 michael + + * [r7212] /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Regenerate parser files + +2016-02-03 10:11:23 michael + + * [r7211] /ircd-hybrid/branches/8.2.x/src/Makefile.in: + - autoreconf + +2016-02-03 10:06:47 michael + + * [r7208] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/conf_cluster.h, + /ircd-hybrid/branches/8.2.x/include/conf_shared.h, + /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_locops.c, + /ircd-hybrid/branches/8.2.x/modules/m_rehash.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/modules/m_undline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unkline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c, + /ircd-hybrid/branches/8.2.x/modules/m_unxline.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_cluster.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/conf_shared.c: + - Clustering has been broken in -r7158. Rewrote most of the shared/cluster implementation to be less obscure. + This introduces a little bit of code duplication, but increases readability, is less error prone, and + reduces memory consumption a bit. + +2016-02-02 12:26:35 michael + + * [r7205] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-02-02 12:15:04 michael + + * [r7203] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-01-31 10:29:24 michael + + * [r7201] /ircd-hybrid/branches/8.2.x/README: + - Update README + +2016-01-30 15:20:07 michael + + * [r7197] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - Update reference.conf + +2016-01-30 14:42:19 michael + + * [r7195] /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - tls_gnutls.c: explicitly disable SSLv3 for releases prior to 3.4 + +2016-01-30 13:54:35 michael + + * [r7194] /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - tls_gnutls.c: add %SERVER_PRECEDENCE to priorities + +2016-01-30 13:47:50 michael + + * [r7191] /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls_openssl.c: removed test on OPENSSL_VERSION_NUMBER which is no longer needed + +2016-01-30 13:45:13 michael + + * [r7189] /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls_openssl.c:tls_new_cred(): set ciphers from serverinfo::ssl_cipher_list which somehow got lost in the rewrite + +2016-01-29 14:02:54 michael + + * [r7187] /ircd-hybrid/branches/8.2.x/AUTHORS: + - AUTHORS: replace occurences of Hybrid with ircd-hybrid + +2016-01-29 13:58:44 michael + + * [r7185] /ircd-hybrid/branches/8.2.x/src/version.c: + - version.c: replace occurences of Hybrid with ircd-hybrid + +2016-01-28 14:53:30 michael + + * [r7183] /ircd-hybrid/branches/8.2.x/src/send.c: + - send.c:sendto_match_servs(): allow for 0 cap + +2016-01-28 13:59:23 michael + + * [r7182] /ircd-hybrid/branches/8.2.x/README: + - Update README + +2016-01-28 13:50:07 michael + + * [r7179] /ircd-hybrid/branches/8.2.x/configure: + - autoreconf + +2016-01-28 13:49:48 michael + + * [r7178] /ircd-hybrid/branches/8.2.x/m4/ax_arg_gnutls.m4: + - ax_arg_gnutls.m4: add simple 'checking' message + +2016-01-28 13:27:04 michael + + * [r7175] /ircd-hybrid/branches/8.2.x/configure: + - autoreconf + +2016-01-28 13:12:12 michael + + * [r7173] /ircd-hybrid/branches/8.2.x/m4/ax_arg_openssl.m4: + - ax_arg_openssl.m4: require 1.0.1d and above + +2016-01-28 12:16:02 michael + + * [r7172] /ircd-hybrid/branches/8.2.x/m4/ax_arg_gnutls.m4: + - ax_arg_gnutls.m4: fixed previous commit + +2016-01-28 12:09:12 michael + + * [r7169] /ircd-hybrid/branches/8.2.x/m4/ax_arg_gnutls.m4: + - ax_arg_gnutls.m4: require 3.3.8 and above + +2016-01-28 06:52:48 michael + + * [r7167] /ircd-hybrid/branches/8.2.x/config.h.in, + /ircd-hybrid/branches/8.2.x/configure: + - autoreconf + +2016-01-28 06:52:23 michael + + * [r7166] /ircd-hybrid/branches/8.2.x/configure.ac: + - configure.ac: remove check for wait.h + +2016-01-28 06:41:36 michael + + * [r7163] /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/include/tls_gnutls.h, + /ircd-hybrid/branches/8.2.x/include/tls_openssl.h, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_none.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls*: more copyright fixups + +2016-01-28 06:29:23 michael + + * [r7162] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-01-28 06:28:33 michael + + * [r7161] /ircd-hybrid/branches/8.2.x/src/conf_parser.c: + - Re-built parser file + +2016-01-28 06:25:55 michael + + * [r7158] /ircd-hybrid/branches/8.2.x/modules/m_stats.c, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y: + - Fixed bug where shared & cluster confs would not get removed from their associated list and memory free'd + (SHARED_ALL sets all bits and therefore IsConfDatabase(x) == true + +2016-01-28 05:46:43 michael + + * [r7156] /ircd-hybrid/branches/8.2.x/modules/m_rehash.c: + - m_rehash.c:mo_rehash(): fixed match() test + +2016-01-28 05:26:13 michael + + * [r7154] /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/src/Makefile.in: + - autoreconf + +2016-01-28 05:24:32 michael + + * [r7153] /ircd-hybrid/branches/8.2.x/include/rsa.h: + - Remove rsa.h for real + +2016-01-28 05:22:17 michael + + * [r7151] /ircd-hybrid/branches/8.2.x/include/misc.h, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/misc.c, + /ircd-hybrid/branches/8.2.x/src/rsa.c, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - Move report_crypto_errors from rsa.c to tls_openssl.c + - Move binary_to_hex from rsa.c to misc.c + - Removed rsa.c & rsa.h + +2016-01-28 05:14:39 michael + + * [r7150] /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/patchlevel.h: + - Bump version to 8.2.13 + +2016-01-28 05:04:18 michael + + * [r7149] /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - More copyright -- from Adam + +2016-01-28 05:03:01 michael + + * [r7147] /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - Fix gnutls error handling -- from Adam + +2016-01-28 05:00:55 michael + + * [r7144] /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - Fix cert leak in tls_verify_cert -- from Adam + +2016-01-28 04:57:03 michael + + * [r7143] /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/server.c, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_none.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - Remove useless raw_result -- from Adam + +2016-01-27 16:38:39 michael + + * [r7140] /ircd-hybrid/branches/8.2.x/include/stdinc.h: + - stdinc.h: removed openssl header includes which no longer should be here + +2016-01-27 16:29:13 michael + + * [r7138] /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/src/conf.c: + - conf.h, conf.c: remove now unused ConfigServerInfo.rsa_private_key + +2016-01-27 13:00:11 michael + + * [r7136] /ircd-hybrid/branches/8.2.x/include/tls_gnutls.h: + - tls_gnutls.h: fixed compile error + +2016-01-26 15:43:32 michael + + * [r7135] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-01-25 14:51:19 michael + + * [r7133] /ircd-hybrid/branches/8.2.x/include/tls_gnutls.h, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - tls_gnutls.h, tls_gnutls.c: minor cleanups + +2016-01-25 14:12:39 michael + + * [r7132] /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Re-create parser files + +2016-01-25 14:11:08 michael + + * [r7129] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: fixed spelling + +2016-01-25 14:09:58 michael + + * [r7128] /ircd-hybrid/branches/8.2.x/include/conf_pseudo.h, + /ircd-hybrid/branches/8.2.x/src/conf_pseudo.c: + - conf_pseudo.h, conf_pseudo.c: fix/update copyright header + +2016-01-25 14:08:01 michael + + * [r7125] /ircd-hybrid/branches/8.2.x/src/conf_parser.y: + - conf_parser.y: removed bunch of unused/redundant header includes + +2016-01-24 15:28:27 michael + + * [r7123] /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - tls_openssl.c: style corrections + +2016-01-24 15:23:34 michael + + * [r7122] /ircd-hybrid/branches/8.2.x/src/conf_parser.y: + - conf_parser.y: removed some cruft + +2016-01-24 15:06:26 michael + + * [r7119] /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c: + - tls_gnutls.c:tls_get_cipher(): make the string look similar to the openssl variant (add protocol information) + +2016-01-24 12:33:00 michael + + * [r7117] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - reference.conf: add some example commands for gnutls support + +2016-01-23 16:06:27 michael + + * [r7115] /ircd-hybrid/branches/8.2.x/include/conf.h: + - Remove MaskItem::rsa_public_key + +2016-01-23 15:31:37 michael + + * [r7114] /ircd-hybrid/branches/8.2.x/src/packet.c, + /ircd-hybrid/branches/8.2.x/src/send.c, + /ircd-hybrid/branches/8.2.x/src/user.c: + - Remove some HAVE_TLS + +2016-01-23 15:24:52 michael + + * [r7111] /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/include/tls_gnutls.h, + /ircd-hybrid/branches/8.2.x/include/tls_none.h, + /ircd-hybrid/branches/8.2.x/include/tls_openssl.h, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_none.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c: + - propset + +2016-01-23 15:20:23 michael + + * [r7110] /ircd-hybrid/branches/8.2.x/src/conf_parser.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.h: + - Re-generate parser files + +2016-01-23 15:17:49 michael + + * [r7107] /ircd-hybrid/branches/8.2.x/Makefile.in, + /ircd-hybrid/branches/8.2.x/aclocal.m4, + /ircd-hybrid/branches/8.2.x/config.h.in, + /ircd-hybrid/branches/8.2.x/configure, + /ircd-hybrid/branches/8.2.x/doc/Makefile.in, + /ircd-hybrid/branches/8.2.x/help/Makefile.in, + /ircd-hybrid/branches/8.2.x/libltdl/Makefile.in, + /ircd-hybrid/branches/8.2.x/modules/Makefile.in, + /ircd-hybrid/branches/8.2.x/modules/core/Makefile.in, + /ircd-hybrid/branches/8.2.x/modules/extra/Makefile.in, + /ircd-hybrid/branches/8.2.x/src/Makefile.in, + /ircd-hybrid/branches/8.2.x/tools/Makefile.in: + - autoreconf + +2016-01-23 15:17:08 michael + + * [r7106] /ircd-hybrid/branches/8.2.x/configure.ac, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/include/fdlist.h, + /ircd-hybrid/branches/8.2.x/include/misc.h, + /ircd-hybrid/branches/8.2.x/include/rsa.h, + /ircd-hybrid/branches/8.2.x/include/tls.h, + /ircd-hybrid/branches/8.2.x/include/tls_gnutls.h, + /ircd-hybrid/branches/8.2.x/include/tls_none.h, + /ircd-hybrid/branches/8.2.x/include/tls_openssl.h, + /ircd-hybrid/branches/8.2.x/m4/ax_arg_gnutls.m4, + /ircd-hybrid/branches/8.2.x/modules/core/m_server.c, + /ircd-hybrid/branches/8.2.x/src/Makefile.am, + /ircd-hybrid/branches/8.2.x/src/conf.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y, + /ircd-hybrid/branches/8.2.x/src/fdlist.c, + /ircd-hybrid/branches/8.2.x/src/ircd.c, + /ircd-hybrid/branches/8.2.x/src/misc.c, + /ircd-hybrid/branches/8.2.x/src/packet.c, + /ircd-hybrid/branches/8.2.x/src/rsa.c, + /ircd-hybrid/branches/8.2.x/src/s_bsd.c, + /ircd-hybrid/branches/8.2.x/src/send.c, + /ircd-hybrid/branches/8.2.x/src/server.c, + /ircd-hybrid/branches/8.2.x/src/tls_gnutls.c, + /ircd-hybrid/branches/8.2.x/src/tls_none.c, + /ircd-hybrid/branches/8.2.x/src/tls_openssl.c, + /ircd-hybrid/branches/8.2.x/src/user.c: + - Incorporate gnutls support by Adam & Attila + +2016-01-23 12:57:04 michael + + * [r7103] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c:mo_connect(): remove invalid comment + +2016-01-23 12:10:46 michael + + * [r7102] /ircd-hybrid/branches/8.2.x/modules/m_webirc.c: + - m_webirc.c: constification; avoid multiple array indices; stylistic changes; improve server notices + +2016-01-23 11:45:57 michael + + * [r7099] /ircd-hybrid/branches/8.2.x/m4/ax_arg_openssl.m4: + - ax_arg_openssl.m4: removed now unused ENABLE_SSL condition + +2016-01-22 12:50:18 michael + + * [r7097] /ircd-hybrid/branches/8.2.x/modules/m_rehash.c: + - Improve documentation + +2016-01-22 12:47:00 michael + + * [r7096] /ircd-hybrid/branches/8.2.x/modules/m_undline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unkline.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c, + /ircd-hybrid/branches/8.2.x/modules/m_unxline.c: + - Improve documentation + +2016-01-22 12:40:14 michael + + * [r7093] /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c: + - Improve documentation + +2016-01-22 12:28:32 michael + + * [r7092] /ircd-hybrid/branches/8.2.x/modules/m_tburst.c: + - m_tburst.c: mention that parv[5] can be an empty string + +2016-01-22 12:19:55 michael + + * [r7089] /ircd-hybrid/branches/8.2.x/modules/m_topic.c: + - m_topic.c: mention that parv[2] can be an empty string + +2016-01-22 12:15:30 michael + + * [r7087] /ircd-hybrid/branches/8.2.x/modules/m_topic.c: + - m_topic.c:ms_topic(): fixed parameter validation + +2016-01-20 09:14:32 michael + + * [r7086] /ircd-hybrid/branches/8.2.x/modules/m_watch.c: + - m_watch.c:m_watch(): removed pointless increment on 'user' + +2016-01-20 09:12:17 michael + + * [r7083] /ircd-hybrid/branches/8.2.x/include/watch.h, + /ircd-hybrid/branches/8.2.x/modules/m_watch.c, + /ircd-hybrid/branches/8.2.x/src/watch.c: + - watch.h, watch.c, m_watch.c: rename some variables for consistency + +2016-01-20 08:19:14 michael + + * [r7081] /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - Update reference.conf; mention that ip directives can be stacked in exempt blocks + +2016-01-20 08:07:37 michael + + * [r7080] /ircd-hybrid/branches/8.2.x/NEWS, + /ircd-hybrid/branches/8.2.x/doc/reference.conf: + - Update NEWS & reference.conf + +2016-01-20 08:03:40 michael + + * [r7079] /ircd-hybrid/branches/8.2.x/NEWS: + - Update NEWS file + +2016-01-20 07:59:31 michael + + * [r7078] /ircd-hybrid/branches/8.2.x/help/rehash: + - Update help/rehash + +2016-01-20 06:47:29 michael + + * [r7075] /ircd-hybrid/branches/8.2.x/modules/m_dline.c, + /ircd-hybrid/branches/8.2.x/modules/m_kline.c, + /ircd-hybrid/branches/8.2.x/modules/m_list.c, + /ircd-hybrid/branches/8.2.x/modules/m_module.c, + /ircd-hybrid/branches/8.2.x/modules/m_rehash.c, + /ircd-hybrid/branches/8.2.x/modules/m_set.c, + /ircd-hybrid/branches/8.2.x/modules/m_xline.c, + /ircd-hybrid/branches/8.2.x/src/channel.c, + /ircd-hybrid/branches/8.2.x/src/client.c: + - Constifications; style cleanups in some places + +2016-01-20 06:28:43 michael + + * [r7074] /ircd-hybrid/branches/8.2.x/modules/m_resv.c, + /ircd-hybrid/branches/8.2.x/modules/m_unresv.c: + - m_resv.c, m_unresv.c: 'standardize' RESV/UNRESV notices/logging to look similar to KLINE/DLINE/XLINE messages + +2016-01-20 06:12:04 michael + + * [r7071] /ircd-hybrid/branches/8.2.x/modules/m_unresv.c: + - m_unresv.c:mo_unresv(): UNRESV does not have reasons - removed 'char *reason' + +2016-01-19 12:44:59 michael + + * [r7069] /ircd-hybrid/branches/8.2.x/modules/core/m_squit.c: + - m_squit.c: improve SQUIT logging; make logging look similar to CONNECT for consistency + +2016-01-19 12:32:28 michael + + * [r7067] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c: minor cleanup - avoid multiple array indices + +2016-01-19 12:18:28 michael + + * [r7065] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c: improve CONNECT logging + +2016-01-19 12:08:09 michael + + * [r7063] /ircd-hybrid/branches/8.2.x/modules/m_resv.c: + - m_resv.c: use non-encapsulated RESV for temporary RESVs; removed me_resv(). Not sure why encapsulated RESV had this unused parv[3] argument which always was "0". + +2016-01-18 13:56:46 michael + + * [r7062] /ircd-hybrid/branches/8.2.x/src/conf_parser.c: + - Rebuilt conf_parser.c + +2016-01-18 13:53:32 michael + + * [r7059] /ircd-hybrid/branches/8.2.x/doc/reference.conf, + /ircd-hybrid/branches/8.2.x/include/client.h, + /ircd-hybrid/branches/8.2.x/include/conf.h, + /ircd-hybrid/branches/8.2.x/modules/m_rehash.c, + /ircd-hybrid/branches/8.2.x/src/conf_parser.y: + - Operators can now REHASH on remote servers; requested by astrutt + - REHASH now requires at least one parameter which currently might be one of CONF, MOTD, or DNS + +2016-01-16 14:51:09 michael + + * [r7057] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c:mo_connect(): cleanups + +2016-01-16 14:33:08 michael + + * [r7055] /ircd-hybrid/branches/8.2.x/modules/m_connect.c: + - m_connect.c:ms_connect(): parv[3] is not allowed to be NULL, so clean up weird logic checking EmptyString(parv[2]) + +2016-01-10 09:23:16 michael + + * [r7053] /ircd-hybrid/branches/8.2.x/src/channel.c: + - channel.c: replaced a couple of MyClient() tests with just MyConnect() + +2016-01-10 07:46:09 michael + + * [r7052] /ircd-hybrid/branches/8.2.x/modules/m_stats.c: + - m_stats.c: replaced a couple of MyClient() tests with just MyConnect() + +2016-01-10 07:41:29 michael + + * [r7050] /ircd-hybrid/branches/8.2.x/src/user.c: + - user.c:introduce_client(): replaced a MyClient() test with just MyConnect() + +2016-01-10 07:38:40 michael + + * [r7047] /ircd-hybrid/branches/8.2.x/modules/m_userhost.c: + - m_userhost.c: replaced a MyClient() test with just MyConnect() + +2016-01-09 15:11:17 michael + + * [r7045] /ircd-hybrid/branches/8.2.x/include/numeric.h, + /ircd-hybrid/branches/8.2.x/modules/m_etrace.c, + /ircd-hybrid/branches/8.2.x/modules/m_trace.c, + /ircd-hybrid/branches/8.2.x/src/numeric.c: + - Rename 'non-standard' RPL_TRACEEND to RPL_ENDOFTRACE + 2016-01-05 09:51:27 michael * [r7041] /ircd-hybrid/branches/8.2.x/README: diff -Nru ircd-hybrid-8.2.12+dfsg.1/config.h.in ircd-hybrid-8.2.17+dfsg.1/config.h.in --- ircd-hybrid-8.2.12+dfsg.1/config.h.in 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/config.h.in 2016-04-21 18:37:07.000000000 +0000 @@ -85,6 +85,9 @@ /* Define to 1 if libGeoIP (-lGeoIP) is available. */ #undef HAVE_LIBGEOIP +/* Define to 1 if you have the `gnutls' library (-lgnutls). */ +#undef HAVE_LIBGNUTLS + /* Define to 1 if you have the `ssl' library (-lssl). */ #undef HAVE_LIBSSL @@ -160,9 +163,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the header file. */ -#undef HAVE_WAIT_H - /* This value is set to 1 to indicate that the system argz facility works */ #undef HAVE_WORKING_ARGZ @@ -239,6 +239,9 @@ /* Size of the watch mempool chunk. */ #undef MP_CHUNK_SIZE_WATCH +/* Size of the Whowas mempool chunk. */ +#undef MP_CHUNK_SIZE_WHOWAS + /* Define to disable assert() statements. */ #undef NDEBUG diff -Nru ircd-hybrid-8.2.12+dfsg.1/configure ircd-hybrid-8.2.17+dfsg.1/configure --- ircd-hybrid-8.2.12+dfsg.1/configure 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/configure 2016-04-21 18:37:07.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Id: configure.ac 7038 2016-01-05 14:40:00Z michael . +# From configure.ac Id: configure.ac 7474 2016-03-13 19:15:57Z michael . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.12. +# Generated by GNU Autoconf 2.69 for ircd-hybrid 8.2.17. # # Report bugs to . # @@ -593,8 +593,8 @@ # Identity of this package. PACKAGE_NAME='ircd-hybrid' PACKAGE_TARNAME='ircd-hybrid' -PACKAGE_VERSION='8.2.12' -PACKAGE_STRING='ircd-hybrid 8.2.12' +PACKAGE_VERSION='8.2.17' +PACKAGE_STRING='ircd-hybrid 8.2.17' PACKAGE_BUGREPORT='bugs@ircd-hybrid.org' PACKAGE_URL='' @@ -648,8 +648,6 @@ LIBDIR SYSCONFDIR PREFIX -ENABLE_SSL_FALSE -ENABLE_SSL_TRUE LTDLOPEN LT_CONFIG_H CONVENIENCE_LTDL_FALSE @@ -815,6 +813,7 @@ enable_debugging enable_warnings enable_openssl +enable_gnutls enable_libgeoip ' ac_precious_vars='build_alias @@ -1369,7 +1368,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ircd-hybrid 8.2.12 to adapt to many kinds of systems. +\`configure' configures ircd-hybrid 8.2.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1439,7 +1438,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ircd-hybrid 8.2.12:";; + short | recursive ) echo "Configuration of ircd-hybrid 8.2.17:";; esac cat <<\_ACEOF @@ -1471,6 +1470,8 @@ --enable-warnings Enable compiler warnings. --enable-openssl=DIR Enable LibreSSL/OpenSSL support (DIR optional). --disable-openssl Disable LibreSSL/OpenSSL support. + --enable-gnutls Enable GnuTLS support. + --disable-gnutls Disable GnuTLS support. --disable-libgeoip Disable GeoIP support Optional Packages: @@ -1572,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ircd-hybrid configure 8.2.12 +ircd-hybrid configure 8.2.17 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2041,7 +2042,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ircd-hybrid $as_me 8.2.12, which was +It was created by ircd-hybrid $as_me 8.2.17, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2330,7 +2331,6 @@ as_fn_append ac_header_list " types.h" as_fn_append ac_header_list " socket.h" as_fn_append ac_header_list " sys/wait.h" -as_fn_append ac_header_list " wait.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2914,7 +2914,7 @@ # Define the identity of the package. PACKAGE='ircd-hybrid' - VERSION='8.2.12' + VERSION='8.2.17' cat >>confdefs.h <<_ACEOF @@ -14269,8 +14269,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 $as_echo_n "checking for library containing crypt... " >&6; } if ${ac_cv_search_crypt+:} false; then : @@ -14370,6 +14368,9 @@ $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_WHOWAS 256*1024" >>confdefs.h + + # Argument processing. @@ -16530,8 +16531,8 @@ fi if test "$cf_enable_openssl" != "no"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL or OpenSSL 0.9.8o and above" >&5 -$as_echo_n "checking for LibreSSL or OpenSSL 0.9.8o and above... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL or OpenSSL 1.0.1d and above" >&5 +$as_echo_n "checking for LibreSSL or OpenSSL 1.0.1d and above... " >&6; } if test "$cross_compiling" = yes; then : cf_openssl_version_ok=no else @@ -16544,7 +16545,7 @@ int main () { - exit(!(OPENSSL_VERSION_NUMBER >= 0x009080ffL)); + exit(!(OPENSSL_VERSION_NUMBER >= 0x1000104fL)); ; return 0; } @@ -16663,14 +16664,110 @@ fi fi - if test "$ac_cv_lib_ssl_SSL_connect" = yes; then - ENABLE_SSL_TRUE= - ENABLE_SSL_FALSE='#' + +# Check whether --enable-gnutls was given. +if test "${enable_gnutls+set}" = set; then : + enableval=$enable_gnutls; cf_enable_gnutls=$enableval +else + cf_enable_gnutls="auto" +fi + + +if test "$cf_enable_openssl" != "auto" && + test "$cf_enable_openssl" != "yes"; then + if test "$cf_enable_gnutls" != "no"; then + + ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" +if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + #include +int +main () +{ + + exit(!(GNUTLS_VERSION_NUMBER >= 0x030308)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5 +$as_echo_n "checking for gnutls_init in -lgnutls... " >&6; } +if ${ac_cv_lib_gnutls_gnutls_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgnutls $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gnutls_init (); +int +main () +{ +return gnutls_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gnutls_gnutls_init=yes +else + ac_cv_lib_gnutls_gnutls_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_init" >&5 +$as_echo "$ac_cv_lib_gnutls_gnutls_init" >&6; } +if test "x$ac_cv_lib_gnutls_gnutls_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGNUTLS 1 +_ACEOF + + LIBS="-lgnutls $LIBS" + +fi + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GnuTLS 3.3.8 and above" >&5 +$as_echo_n "checking for GnuTLS 3.3.8 and above... " >&6; } + if test "$ac_cv_lib_gnutls_gnutls_init" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } else - ENABLE_SSL_TRUE='#' - ENABLE_SSL_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - GnuTLS support disabled" >&5 +$as_echo "no - GnuTLS support disabled" >&6; } fi + fi +fi # Check whether --enable-libgeoip was given. @@ -16996,10 +17093,6 @@ -if test -z "${ENABLE_SSL_TRUE}" && test -z "${ENABLE_SSL_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SSL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -17397,7 +17490,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ircd-hybrid $as_me 8.2.12, which was +This file was extended by ircd-hybrid $as_me 8.2.17, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17463,7 +17556,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ircd-hybrid config.status 8.2.12 +ircd-hybrid config.status 8.2.17 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru ircd-hybrid-8.2.12+dfsg.1/configure.ac ircd-hybrid-8.2.17+dfsg.1/configure.ac --- ircd-hybrid-8.2.12+dfsg.1/configure.ac 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/configure.ac 2016-04-21 18:37:07.000000000 +0000 @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION([$Id: configure.ac 7038 2016-01-05 14:40:00Z michael $]) +AC_REVISION([$Id: configure.ac 7519 2016-03-30 18:26:55Z michael $]) AC_PREREQ(2.69) -AC_INIT([ircd-hybrid], [8.2.12], [bugs@ircd-hybrid.org]) +AC_INIT([ircd-hybrid], [8.2.17], [bugs@ircd-hybrid.org]) AM_INIT_AUTOMAKE(1.15 subdir-objects) AM_MAINTAINER_MODE AC_CONFIG_MACRO_DIR([m4]) @@ -45,8 +45,7 @@ sys/param.h \ types.h \ socket.h \ - sys/wait.h \ - wait.h) + sys/wait.h) AC_SEARCH_LIBS(crypt, crypt) @@ -59,6 +58,7 @@ AX_ARG_ENABLE_DEBUGGING AX_ARG_ENABLE_WARNINGS AX_ARG_OPENSSL +AX_ARG_GNUTLS AX_ARG_LIBGEOIP AC_DEFINE_DIR([PREFIX],[prefix],[Set to prefix.]) diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/boguschangelog.sh ircd-hybrid-8.2.17+dfsg.1/debian/boguschangelog.sh --- ircd-hybrid-8.2.12+dfsg.1/debian/boguschangelog.sh 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/boguschangelog.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh - -VERSION="$(dpkg-parsechangelog | grep '^Version' | awk '{print $2}')" -USER="$(getent passwd `whoami` | cut -d: -f5 | cut -d, -f1)" -FAKEEMAIL="$(whoami)@$(hostname --fqdn)" -RFCDATE=$(date -R) - -cat < ${RFCDATE} - -EOF diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/changelog ircd-hybrid-8.2.17+dfsg.1/debian/changelog --- ircd-hybrid-8.2.12+dfsg.1/debian/changelog 2016-01-17 19:04:03.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/changelog 2016-04-23 12:05:41.000000000 +0000 @@ -1,3 +1,30 @@ +ircd-hybrid (1:8.2.17+dfsg.1-1) unstable; urgency=medium + + * New upstream release + + -- Dominic Hargreaves Sat, 23 Apr 2016 13:05:40 +0100 + +ircd-hybrid (1:8.2.16+dfsg.1-2) unstable; urgency=high + + * Remove reference to obsolete debconf question, fixing + uninstallability; thanks to Andreas Beckmann (Closes: #821823) + + -- Dominic Hargreaves Tue, 19 Apr 2016 23:13:39 +0100 + +ircd-hybrid (1:8.2.16+dfsg.1-1) unstable; urgency=medium + + * Add Brazilian Portuguese translation, thanks to Adriano Rafael Gomes + (Closes: #816931) + * New upstream release + - update config files from new reference.conf + * Build unconditionally with SSL support using new GnuTLS support + (Closes: #697376) + * Add NEWS entry about Anope in Debian and remove outdated debconf + prompt about lack of services support + * Update Standards-Version (no changes) + + -- Dominic Hargreaves Sun, 03 Apr 2016 13:33:01 +0100 + ircd-hybrid (1:8.2.12+dfsg.1-1) unstable; urgency=medium * New upstream release diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/control ircd-hybrid-8.2.17+dfsg.1/debian/control --- ircd-hybrid-8.2.12+dfsg.1/debian/control 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/control 2016-04-23 12:00:42.000000000 +0000 @@ -8,10 +8,11 @@ libgeoip-dev, automake (>= 1:1.13.1), dh-autoreconf, - libltdl-dev + libltdl-dev, + libgnutls28-dev, Build-Conflicts: autoconf2.13 Maintainer: Dominic Hargreaves -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://ircd-hybrid.com/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/dom/ircd-hybrid.git Vcs-Git: git://anonscm.debian.org/users/dom/ircd-hybrid.git @@ -20,14 +21,16 @@ Architecture: any Conflicts: ircd-ircu, ircd-irc2, dancer-ircd, oftc-hybrid Pre-Depends: debconf (>= 0.5) | debconf-2.0 -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + openssl, Provides: ircd Recommends: whois Suggests: anope Description: high-performance secure IRC server ircd-hybrid is a stable, high-performance IRC server that features: . - * If enabled, SSL client support and server-to-server RSA encryption; + * SSL client support and server-to-server RSA encryption; * Compressed server links; * Channel exceptions (+e) and invitation exceptions (+I); * New configuration file format; diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/control.in ircd-hybrid-8.2.17+dfsg.1/debian/control.in --- ircd-hybrid-8.2.12+dfsg.1/debian/control.in 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/control.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -Source: ircd-hybrid -Section: net -Priority: optional -Build-Depends: debhelper (>= 9), - docbook-to-man, - flex, - bison, - libgeoip-dev, - automake (>= 1:1.13.1), - dh-autoreconf, - libltdl-dev @SSL_BUILD_DEPENDS@ -Build-Conflicts: autoconf2.13 -Maintainer: Dominic Hargreaves -Standards-Version: 3.9.6 -Homepage: http://ircd-hybrid.com/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/dom/ircd-hybrid.git -Vcs-Git: git://anonscm.debian.org/users/dom/ircd-hybrid.git - -Package: ircd-hybrid -Architecture: any -Conflicts: ircd-ircu, ircd-irc2, dancer-ircd, oftc-hybrid -Pre-Depends: debconf (>= 0.5) | debconf-2.0 -Depends: ${shlibs:Depends}, ${misc:Depends} @SSL_HYBRID_DEPENDS@ -Provides: ircd -Recommends: whois -Suggests: anope -Description: high-performance secure IRC server - ircd-hybrid is a stable, high-performance IRC server that features: - . - * If enabled, SSL client support and server-to-server RSA encryption; - * Compressed server links; - * Channel exceptions (+e) and invitation exceptions (+I); - * New configuration file format; - * Halfops (+h) and anti-spam user mode +g; - * Dynamically loadable modules; - * Channel and nickname RESV's (reservations). - -Package: hybrid-dev -Section: devel -Architecture: all -Depends: ${misc:Depends} -Suggests: ircd-hybrid -Description: high-performance secure IRC server - development files - These are the headers used when writing modules for ircd-hybrid. - For more information on how to write these modules, see the ircd-hybrid - documentation or example_module.c in the source code for ircd-hybrid. - . - It also includes mbuild-hybrid, a shell script that simplifies building - and installation of such modules. This shell script is simplistic and - assumes a lot; if you possess clue, you will know what to do anyway. diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/.git-dpm ircd-hybrid-8.2.17+dfsg.1/debian/.git-dpm --- ircd-hybrid-8.2.12+dfsg.1/debian/.git-dpm 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/.git-dpm 2016-04-23 12:00:43.000000000 +0000 @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -fdb826ac4ba165b6f81b5c0374b7f8f6748c21a0 -fdb826ac4ba165b6f81b5c0374b7f8f6748c21a0 -1d36ccc077161ce1e6c4bf14f8b989922f9057bf -1d36ccc077161ce1e6c4bf14f8b989922f9057bf -ircd-hybrid_8.2.12+dfsg.1.orig.tar.gz -addafa2d2c233be969dab97bc5944ee056048206 -1098771 +74c0350fe0f05c06f82dc812cc3f8508dbe41832 +74c0350fe0f05c06f82dc812cc3f8508dbe41832 +5d95dc8e03745e2540a6d7032d233b2c812bbe85 +5d95dc8e03745e2540a6d7032d233b2c812bbe85 +ircd-hybrid_8.2.17+dfsg.1.orig.tar.gz +d7f319a6ab82022e929e79a68e4376fe13698177 +1118244 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,1437 @@ +/* + * This is an example configuration file for ircd-hybrid + * + * Copyright (c) 2000-2016 ircd-hybrid development team + * + * $Id: reference.conf 7475 2016-03-15 19:20:54Z michael $ + * + * This version has been customized for Debian. + */ + +/* + * ######################################################################## + * IMPORTANT NOTE: + * + * auth {} blocks MUST be specified in order of precedence. The first one + * that matches a user will be used. So place spoofs first, then specials, + * then general access. + * ######################################################################## + * + * Shell style (#), C++ style (//) and C style comments are supported. + * + * Files may be included by either: + * .include "filename" + * .include + * + * Times/durations are written as: + * 12 hours 30 minutes 1 second + * + * Valid units of time: + * year, month, week, day, hour, minute, second + * + * Valid units of size: + * megabyte/mbyte/mb, kilobyte/kbyte/kb, byte + * + * Sizes and times may be singular or plural. + */ + + +/* + * serverinfo {}: contains information about the server + */ +serverinfo { + /* + * name: the name of this server. This cannot be changed at runtime. + */ + name = "hybrid8.debian.local"; + + /* + * sid: a server's unique ID. This is three characters long and must + * be in the form [0-9][A-Z0-9][A-Z0-9]. The first character must be + * a digit, followed by 2 alpha-numerical letters. + * + * NOTE: The letters must be capitalized. This cannot be changed at runtime. + * + * A sid is automatically generated at runtime, if you want to configure + * a specific sid, uncomment the following line. + */ +# sid = "0HY"; + + /* + * description: the description of the server. + */ + description = "ircd-hybrid 8.1-debian"; + + /* + * network_name, network_desc: the name and description of the network this + * server is on. Shown in the 005 reply and used with serverhiding. + */ + network_name = "debian"; + network_desc = "This is My Network"; + + /* + * hub: allow this server to act as a hub and have multiple servers + * connected to it. + */ + hub = no; + + /* + * vhost: the IP address to bind to when connecting outward to IPv4 servers. + * This should be an IPv4 address, or "*" for INADDR_ANY. + */ +# vhost = "192.0.2.1"; + + /* + * vhost6: the IP address to bind to when connecting outward to IPv6 servers. + * This should be an IPv6 address, or "*" for in6addr_any. + */ +# vhost6 = "2001:DB8::1"; + + /* + * default_max_clients: the default maximum number of clients allowed + * to connect. This can be changed from within IRC via /QUOTE SET MAX. + */ + default_max_clients = 512; + + /* + * max_nick_length: only applies to local clients. Must be in the + * range of 9 to 30. Default is 9 if nothing else is specified. + */ + max_nick_length = 15; + + /* + * max_topic_length: only applies to topics set by local clients. + * Must be in the range of 80 to 300. Default is 80 if nothing + * else is specified. + */ + max_topic_length = 300; + + /* + * libgeoip_database_options: used to control the libGeoIP database handling. + * + * Available options: + * + * standard - Read database from file system. This uses the least memory. + * memory_cache - Load database into memory. Provides faster performance but + * uses more memory. + * mmap_cache - Load database into mmap shared memory. + * check_cache - Check for updated database. If database has been updated, + * reload file handle and/or memory cache. + */ +# libgeoip_database_options = memory_cache, check_cache; + + /* + * libgeoip_ipv4_database_file: the path to the GeoIP IPv4 database file. + */ +# libgeoip_ipv4_database_file = "etc/GeoIP.dat"; + + /* + * libgeoip_ipv6_database_file: the path to the GeoIP IPv6 database file. + */ +# libgeoip_ipv6_database_file = "etc/GeoIPv6.dat"; + + /* + * rsa_private_key_file: the path to the file containing the RSA key. + * + * Example commands to store a 2048 bit RSA key in rsa.key: + * + * OpenSSL/LibreSSL: + * openssl genrsa -out rsa.key 2048 + * + * GnuTLS: + * certtool --generate-privkey --sec-param=medium --outfile rsa.key + * + * Once the RSA key is generated, it is highly recommended to lock down + * its file permissions: + * + * chown . rsa.key + * chmod 0600 rsa.key + * + * Note to Debian users: the postinst script created this + * for you. + */ + rsa_private_key_file = "/etc/ircd-hybrid/key/ircd.key"; + + /* + * ssl_certificate_file: the path to the file containing our + * SSL certificate for encrypted client connection. + * + * This assumes your private RSA key is stored in rsa.key. You + * MUST have an RSA key in order to generate the certificate. + * + * Example command: + * + * OpenSSL/LibreSSL: + * openssl req -new -days 365 -x509 -key rsa.key -out cert.pem + * + * GnuTLS: + * certtool --generate-self-signed --load-privkey rsa.key --outfile cert.pem + */ + ssl_certificate_file = "/etc/ircd-hybrid/key/ircd.pem"; + + /* + * ssl_dh_param_file: the path to the PEM encoded Diffie-Hellman + * parameter file. DH parameters are required when using + * ciphers with EDH (ephemeral Diffie-Hellman) key exchange. + * + * A DH parameter file can be created by running: + * + * OpenSSL/LibreSSL: + * openssl dhparam -out dhparam.pem 2048 + * + * GnuTLS: + * certtool --generate-dh-params --sec-param=medium --outfile dhparam.pem + */ +# ssl_dh_param_file = "/etc/ircd-hybrid/dhparam.pem"; + + /* + * ssl_dh_elliptic_curve: defines the curve to use for the + * Elliptic Curve Diffie-Hellman (ECDH) algorithm. + * Default is ANSI X9.62 prime256v1/secp256r1 if nothing else is specified. + * + * A list of curves supported by OpenSSL can be obtained by running: + * + * openssl ecparam -list_curves + * + * This directive currently doesn't do anything with GnuTLS support. + */ +# ssl_dh_elliptic_curve = "secp521r1"; + + /* + * ssl_cipher_list: list of ciphers to support on _this_ server. + * Can be used to enforce specific ciphers for incoming SSL/TLS + * connections. If a client (which also includes incoming server + * connections) is not capable of using any of the ciphers listed + * here, the connection will simply be rejected. + * + * A list of supported ciphers can be obtained by running: + * + * OpenSSL/LibreSSL: + * openssl ciphers -tls1 -v + * + * GnuTLS: + * gnutls-cli --list + * + * Multiple ciphers are separated by colons. The order of preference is + * from left to right. + */ +# ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA"; + + /* + * ssl_message_digest_algorithm: defines which cryptographic hash function + * to use for generating fingerprint hashes of X.509 certificates. + * Default is SHA-256 if nothing else is specified. + * + * A list of supported message digest algorithms can be obtained by running: + * + * OpenSSL/LibreSSL: + * openssl list-message-digest-algorithms + * + * GnuTLS: + * gnutls-cli --list + */ +# ssl_message_digest_algorithm = "sha256"; +}; + +/* + * admin {}: contains administrative information about the server + */ +admin { + name = "Smurf target"; + description = "Main Server Administrator"; + email = ""; +}; + +/* + * class {}: contains information about classes for users + */ +class { + /* name: the name of the class. */ + name = "users"; + + /* + * ping_time: how often a client must reply to a PING from the + * server before they are dropped. + */ + ping_time = 90 seconds; + + /* + * number_per_ip: how many local users are allowed to connect + * from a single IP address (optional) + */ + number_per_ip = 2; + + /* + * max_local: how many local users are allowed to connect + * from a single ident@host (optional) + */ + max_local = 2; + + /* + * max_global: network-wide limit of users per ident@host (optional) + */ + max_global = 10; + + /* + * max_number: the maximum number of users allowed in this class (optional) + */ + max_number = 100; + + /* + * The following lines are optional and allow you to define + * how many users can connect from one /NN subnet. + */ + cidr_bitlen_ipv4 = 24; + cidr_bitlen_ipv6 = 120; + number_per_cidr = 16; + + /* + * sendq: the amount of data allowed in a client's send queue before + * they are dropped. + */ + sendq = 100 kbytes; + + /* + * recvq: the amount of data allowed in a client's receive queue before + * they are dropped for flooding. Defaults to 2560 if the chosen value + * isn't within the range of 512 to 8000. + */ + recvq = 2560 bytes; +}; + +class { + name = "opers"; + ping_time = 90 seconds; + number_per_ip = 10; + max_number = 100; + sendq = 100 kbytes; + + /* + * max_channels: maximum number of channels users in this class can join. + */ + max_channels = 60; + + /* + * min_idle: minimum idle time that is shown in WHOIS. + */ + min_idle = 3 hours; + + /* + * max_idle: maximum idle time that is shown in WHOIS. + */ + max_idle = 8 hours; + + /* + * flags: + * + * random_idle - a fake idle time is set randomly between + * min_idle and max_idle + * hide_idle_from_opers - the fake idle time will also be shown to operators + */ + flags = random_idle, hide_idle_from_opers; +}; + +class { + name = "server"; + ping_time = 90 seconds; + + /* + * connectfreq: only used in server classes. Specifies the delay + * between autoconnecting to servers. + */ + connectfreq = 5 minutes; + + /* max number: the number of servers to autoconnect to. */ + max_number = 1; + + /* sendq: servers need a higher sendq as they send more data. */ + sendq = 2 megabytes; +}; + +/* + * motd {}: Allows the display of a different MOTD to a client + * depending on its origin. Applies to local users only. + */ +motd { + /* + * mask: multiple mask entries are permitted. Mask can either be + * a class name or a hostname. CIDR is supported. + */ + mask = "*.at"; + mask = "*.de"; + mask = "*.ch"; + + /* + * file: path to the motd file. + */ + file = "/etc/ircd-hybrid/german.motd"; +}; + +/* + * listen {}: contains information about the ports ircd listens on + */ +listen { + /* + * port: the port to listen on. If no host is specified earlier in the + * listen {} block, it will listen on all available IP addresses. + * + * Ports are separated by commas; a range may be specified using ".." + */ + + /* port: listen on all available IP addresses, ports 6665 to 6669. */ + port = 6665 .. 6669; + + /* + * Listen on 192.0.2.2/6697 with SSL enabled and hidden from STATS P + * unless you are an administrator. + * + * NOTE: The "flags" directive always has to come before "port". + * + * Currently available flags are: + * + * ssl - Port may only accept TLS/SSL connections + * server - Only server connections are permitted + * hidden - Port is hidden from /stats P, unless you're an admin + */ + flags = hidden, ssl; + host = "127.0.0.1"; # change this! + port = 6697; + + /* + * host: set a specific IP address to listen on using the + * subsequent port definitions. This may be IPv4 or IPv6. + */ + #host = "192.0.2.3"; + #port = 7000, 7001; + + #host = "2001:DB8::2"; + #port = 7002; +}; + +/* + * auth {}: allow users to connect to the ircd + */ +auth { + /* + * user: the user@host allowed to connect. Multiple user + * lines are permitted within each auth {} block. + */ + user = "*@127.0.0.1"; + #user = "*test@2001:DB8:*"; + + /* password: an optional password that is required to use this block. */ + #password = "letmein"; + + /* + * encrypted: indicates whether the auth password above has been + * encrypted. Default is 'no' if nothing else is specified. + */ + #encrypted = yes; + + /* + * spoof: fake the user's host to this. This is free-form; just do + * everyone a favor and don't abuse it. ('=' prefix on /stats I) + */ + spoof = "i.love.debian.org"; + + /* class: the class the user is placed in. */ + class = "opers"; + + /* + * need_password - don't allow users who haven't supplied the correct | ('&' prefix on /stats I if disabled) + * password to connect using another auth {} block + * need_ident - require the user to have identd to connect | ('+' prefix on /stats I) + * spoof_notice - enable spoofing notification to admins + * exceed_limit - allow a user to exceed class limits | ('>' prefix on /stats I) + * kline_exempt - exempt this user from k-lines | ('^' prefix on /stats I) + * xline_exempt - exempt this user from x-lines | ('!' prefix on /stats I) + * resv_exempt - exempt this user from resvs | ('$' prefix on /stats I) + * no_tilde - remove ~ from a user with no ident | ('-' prefix on /stats I) + * can_flood - allow this user to exceed flood limits | ('|' prefix on /stats I) + * webirc - enables WEBIRC authentication for web-based | ('<' prefix on /stats I) + * clients such as Mibbit + */ + flags = need_password, spoof_notice, exceed_limit, kline_exempt, + xline_exempt, resv_exempt, no_tilde, can_flood; +}; + +#auth { +# /* +# * redirserv, redirport: the server and port to redirect a user to. +# * A user does not have to obey the redirection; the ircd just +# * suggests an alternative server for them. +# */ +# redirserv = "server2.example.net"; +# redirport = 6667; +# +# user = "*@*.ch"; +# +# /* class: a class is required even though it is not used. */ +# class = "users"; +#}; + +auth { + user = "*@*"; + class = "users"; + flags = need_ident; +}; + +/* + * operator {}: defines ircd operators + */ +#operator { +# /* name: the name of the operator */ +# name = "sheep"; +# +# /* +# * user: the user@host required for this operator. Multiple user +# * lines are permitted within each operator {} block. +# */ +# user = "*sheep@192.0.2.0/26"; +# user = "*@192.0.2.240/28"; +# +# /* +# * password: the password required to oper. By default this will need +# * to be encrypted using the provided mkpasswd tool. +# * The availability of various password hashing algorithms may vary +# * depending on the system's crypt(3) implementation. +# */ +# password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4"; +# +# /* +# * encrypted: indicates whether the oper password above has been +# * encrypted. Default is 'yes' if nothing else is specified. +# */ +# encrypted = yes; +# +# /* +# * ssl_certificate_fingerprint: enhances security by additionally checking +# * the oper's client certificate fingerprint against the specified +# * fingerprint below. +# * +# * Hint: your users can use the following commands to obtain a SHA-256 hash +# * of their ssl certificate: +# * +# * OpenSSL/LibreSSL: +# * openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g' +# * +# * GnuTLS: +# * certtool -i < cert.pem | egrep -A 1 'SHA256 fingerprint' +# */ +## ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; +# +# /* +# * ssl_connection_required: client must be connected over SSL/TLS +# * in order to be able to use this operator {} block. +# * Default is 'no' if nothing else is specified. +# */ +# ssl_connection_required = no; +# +# /* class: the class the oper joins when they successfully OPER. */ +# class = "opers"; +# +# /* +# * whois: allows overriding the default RPL_WHOISOPERATOR numeric +# * string shown in /whois. +# * This string is propagated to all servers on the network. +# */ +## whois = "is a Smurf Target (IRC Operator)"; +# /* +# * umodes: the default usermodes opers get when they /oper or /challenge. +# * If defined, it will override oper_umodes settings in general {}. +# * Available user modes: +# * +# * +b - bots - See bot and drone flooding notices +# * +c - cconn - Client connection/quit notices +# * +D - deaf - Don't receive channel messages +# * +d - debug - See debugging notices +# * +e - external - See remote server connection and split notices +# * +F - farconnect - Remote client connection/quit notices +# * +f - full - See auth {} block full notices +# * +G - softcallerid - Server Side Ignore for users not on your channels +# * +g - callerid - Server Side Ignore (for privmsgs etc) +# * +H - hidden - Hides operator status to other users +# * +i - invisible - Not shown in NAMES or WHO unless you share a channel +# * +j - rej - See rejected client notices +# * +k - skill - See server generated KILL messages +# * +l - locops - See LOCOPS messages +# * +n - nchange - See client nick changes +# * +p - hidechans - Hides channel list in WHOIS +# * +q - hideidle - Hides idle and signon time in WHOIS +# * +R - nononreg - Only receive private messages from registered clients +# * +s - servnotice - See general server notices +# * +u - unauth - See unauthorized client notices +# * +w - wallop - See server generated WALLOPS +# * +y - spy - See LINKS, STATS, TRACE notices etc. +# * +z - operwall - See oper generated WALLOPS +# */ +# umodes = locops, servnotice, wallop; +# +# /* +# * flags: controls the activities and commands an oper is +# * allowed to do on the server. All flags default to 'no'. +# * Available flags: +# * +# * admin - gives administrator privileges | ('A' flag) +# * close - allows CLOSE | ('B' flag) +# * connect - allows local CONNECT | ('C' flag) +# * connect:remote - allows remote CONNECT | ('D' flag) +# * die - allows DIE | ('E' flag) +# * dline - allows DLINE | ('F' flag) +# * globops - allows GLOBOPS | ('G' flag) +# * join:resv - allows to JOIN resv {} channels | ('H' flag) +# * kill - allows to KILL local clients | ('I' flag) +# * kill:remote - allows remote users to be /KILL'd | ('J' flag) +# * kline - allows KLINE | ('K' flag) +# * locops - allows LOCOPS | ('L' flag) +# * module - allows MODULE | ('M' flag) +# * nick:resv - allows to use NICK on resv {} nicks | ('N' flag) +# * opme - allows OPME | ('O' flag) +# * rehash - allows oper to REHASH config | ('P' flag) +# * rehash:remote - allows oper to remotely REHASH config | ('Q' flag) +# * remoteban - allows remote KLINE/UNKLINE | ('R' flag) +# * restart - allows RESTART | ('S' flag) +# * resv - allows RESV | ('T' flag) +# * set - allows SET | ('U' flag) +# * squit - allows local SQUIT | ('V' flag) +# * squit:remote - allows remote SQUIT | ('W' flag) +# * undline - allows UNDLINE | ('X' flag) +# * unkline - allows UNKLINE | ('Y' flag) +# * unresv - allows UNRESV | ('Z' flag) +# * unxline - allows UNXLINE | ('a' flag) +# * wallops - allows WALLOPS | ('b' flag) +# * xline - allows XLINE | ('c' flag) +# */ +# flags = admin, connect, connect:remote, die, globops, kill, kill:remote, +# kline, module, rehash, restart, set, unkline, unxline, xline; +#}; + +/* + * connect {}: define a server to connect to + * IMPORTANT NOTE for Debian users: before you configure any links to + * other servers, change the sid earlier in this config file to a + * value which will be unique within the network. + */ +#connect { +# /* name: the name of the server. */ +# name = "uplink.example.net"; +# +# /* +# * host: the host or IP address to connect to. If a hostname is used, +# * it must match the reverse DNS of the server. +# */ +# host = "192.0.2.4"; +# +# /* +# * vhost: the IP address to bind to when making outgoing connections to +# * servers. serverinfo::vhost and serverinfo::vhost6 will be overridden +# * by this directive. +# */ +# vhost = "192.0.2.5"; +# +# /* +# * send_password, accept_password: the passwords to send and accept. +# * The remote server will have these passwords swapped. +# */ +# send_password = "password"; +# accept_password = "anotherpassword"; +# +# /* +# * encrypted: indicates whether the accept_password above has been +# * encrypted. +# */ +# encrypted = no; +# +# /* port: the port to connect to this server on. */ +# port = 6666; +# +# /* +# * hub_mask: the mask of servers that this server may hub. Multiple +# * entries are permitted. +# */ +# hub_mask = "*"; +# +# /* +# * leaf_mask: the mask of servers this server may not hub. Multiple +# * entries are permitted. Useful for forbidding EU -> US -> EU routes. +# */ +## leaf_mask = "*.uk"; +# +# /* class: the class this server is in. */ +# class = "server"; +# +# /* +# * ssl_cipher_list: list of ciphers that the server we are connecting to +# * must support. If the server is not capable of using any of the ciphers +# * listed below, the connection will simply be rejected. +# * the connection will simply be rejected. +# * Can be used to enforce stronger ciphers, even though this option +# * is not necessarily required to establish a SSL/TLS connection. +# * +# * Multiple ciphers are separated by colons. The order of preference +# * is from left to right. +# */ +## ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA"; +# +# /* +# * ssl_certificate_fingerprint: enhances security by additionally checking +# * the server's client certificate fingerprint against the specified +# * fingerprint below. +# */ +## ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; +# +# /* +# * autoconn - controls whether we autoconnect to this server or not, +# * dependent on class limits. By default, this is disabled. +# * ssl - Initiates a TLS/SSL connection. +# */ +## flags = autoconn, ssl; +#}; + +#connect { +# name = "ipv6.example.net"; +# host = "2001:DB8::3"; +# send_password = "password"; +# accept_password = "password"; +# port = 6666; +# +# /* +# * aftype: controls whether the connection uses "ipv4" or "ipv6". +# * Default is ipv4. +# */ +# aftype = ipv6; +# class = "server"; +#}; + +/* + * cluster {}: servers that share klines/unkline/xline/unxline/resv/unresv/locops + * automatically + */ +#cluster { +# /* +# * name: the server to share with; this can take wildcards +# * +# * NOTE: only local actions will be clustered, meaning that if +# * the server receives a shared kline/unkline/etc, it +# * will not be propagated to clustered servers. +# * +# * Remote servers are not necessarily required to accept +# * clustered lines, they need a shared {} block for *THIS* +# * server in order to accept them. +# */ +# name = "*.example.net"; +# +# /* +# * type: list of what to share; options are as follows: +# * dline - share dlines +# * undline - share undlines +# * kline - share klines +# * unkline - share unklines +# * xline - share xlines +# * unxline - share unxlines +# * resv - share resvs +# * unresv - share unresvs +# * locops - share locops +# * all - share all of the above (default) +# */ +# type = kline, unkline, locops, xline, resv; +#}; + +/* + * shared {}: users that are allowed to remote kline + * + * NOTE: This can effectively be used for remote klines. + * Please note that there is no password authentication + * for users setting remote klines. You must also be + * /oper'd in order to issue a remote kline. + */ +shared { + /* + * name: the server the user must be connected to in order to set klines. + * If this is not specified, the user will be allowed to kline from all + * servers. + */ + name = "hybrid8.debian.local"; + + /* + * user: the user@host mask that is allowed to set klines. If this is + * not specified, all users on the server above will be allowed to set + * a remote kline. + */ + user = "root@localhost"; + + /* + * type: list of what to share, options are as follows: + * dline - allow oper/server to dline + * undline - allow oper/server to undline + * kline - allow oper/server to kline + * unkline - allow oper/server to unkline + * xline - allow oper/server to xline + * unxline - allow oper/server to unxline + * rehash - allow oper/server to rehash + * resv - allow oper/server to resv + * unresv - allow oper/server to unresv + * locops - allow oper/server to locops - only used for servers that cluster + * all - allow oper/server to do all of the above (default) + */ + type = kline, unkline, resv; +}; + +/* + * kill {}: users that are not allowed to connect + * Oper issued klines will be added to the specified kline database + */ +#kill { +# user = "bad@*.example.net"; +# reason = "Obviously hacked account"; +#}; + +/* + * deny {}: IP addresses that are not allowed to connect + * (before DNS/ident lookup) + * Oper issued dlines will be added to the specified dline database + */ +#deny { +# ip = "192.0.2.0/28"; +# reason = "Reconnecting vhosted bots"; +#}; + +/* + * exempt {}: IP addresses that are exempt from deny {} and Dlines + */ +#exempt { +# ip = "192.0.2.240/28"; +# +# /* The 'ip' directives can be stacked */ +# ip = "10.0.0.0/8"; +# ip = "fc00::/7"; +#}; + +/* + * resv {}: nicks and channels users may not use/join + */ +resv { mask = "clone*"; reason = "Clone bots"; }; +resv { mask = "Global"; reason = "Reserved for services"; }; +resv { mask = "ChanServ"; reason = "Reserved for services"; }; +resv { mask = "NickServ"; reason = "Reserved for services"; }; +resv { mask = "OperServ"; reason = "Reserved for services"; }; +resv { mask = "MemoServ"; reason = "Reserved for services"; }; +resv { mask = "BotServ"; reason = "Reserved for services"; }; +resv { mask = "HelpServ"; reason = "Reserved for services"; }; +resv { mask = "HostServ"; reason = "Reserved for services"; }; +resv { mask = "StatServ"; reason = "Reserved for services"; }; +resv { mask = "#*services*"; reason = "Reserved for services"; }; + +#resv { +# /* +# * mask: masks starting with a '#' are automatically considered +# * as channel name masks. +# */ +# mask = "#helsinki"; +# reason = "Channel is reserved for Finnish inhabitants"; +# +# /* +# * exempt: can be either a ISO 3166 alpha-2 two letter country +# * code, or a nick!user@host mask. CIDR is supported. Exempt +# * entries can be stacked. +# */ +# exempt = "FI"; +#}; + +/* + * gecos {}: used for banning users based on their "realname". + */ +#gecos { +# name = "*sex*"; +# reason = "Possible spambot"; +#}; + +#gecos { +# name = "sub7server"; +# reason = "Trojan drone"; +#}; + +/* + * service {}: specifies a server which may act as a network service + * + * NOTE: it is very important that every server on the network + * has the same service {} block. + */ +#service { +# /* name: the actual name of the service. Wildcards are not allowed. */ +# name = "service.example.net"; +# +# /* The 'name' directives can be stacked. */ +# name = "stats.example.net"; +#}; + +/* + * pseudo {}: adds pseudo/custom commands also known as service aliases + */ +#pseudo { +# /* command: the actual command/alias. */ +# command = "IDENTIFY"; +# +# /* prepend: optional text that can be prepended to the user's message. */ +# prepend = "IDENTIFY "; +# +# /* name: the service name, used for error messages. */ +# name = "NickServ"; +# +# /* target: the actual target where this message should be sent to. */ +# target = "NickServ@service.example.net"; +#}; +# +#pseudo { +# command = "CHANSERV"; +# name = "ChanServ"; +# target = "ChanServ@service.example.net"; +#}; +# +#pseudo { +# command = "CS"; +# name = "ChanServ"; +# target = "ChanServ@service.example.net"; +#}; +# +#pseudo { +# command = "NICKSERV"; +# name = "NickServ"; +# target = "NickServ@service.example.net"; +#}; +# +#pseudo { +# command = "NS"; +# name = "NickServ"; +# target = "NickServ@service.example.net"; +#}; +# +#pseudo { +# command = "MEMOSERV"; +# name = "MemoServ"; +# target = "MemoServ@service.example.net"; +#}; +# +#pseudo { +# command = "MS"; +# name = "MemoServ"; +# target = "MemoServ@service.example.net"; +#}; +# +#pseudo { +# command = "OPERSERV"; +# name = "OperServ"; +# target = "OperServ@service.example.net"; +#}; +# +#pseudo { +# command = "OS"; +# name = "OperServ"; +# target = "OperServ@service.example.net"; +#}; +# +#pseudo { +# command = "HOSTSERV"; +# name = "HostServ"; +# target = "HostServ@service.example.net"; +#}; +# +#pseudo { +# command = "HS"; +# name = "HostServ"; +# target = "HostServ@service.example.net"; +#}; +# +#pseudo { +# command = "BOTSERV"; +# name = "BotServ"; +# target = "BotServ@service.example.net"; +#}; +# +#pseudo { +# command = "BS"; +# name = "BotServ"; +# target = "BotServ@service.example.net"; +#}; + +/* + * channel {}: the channel block contains options pertaining to channels + */ +channel { + /* + * disable_fake_channels: this option, if set to 'yes', will + * disallow clients from creating or joining channels that have one + * of the following ASCII characters in their name: + * + * 2 | bold + * 3 | mirc color + * 15 | plain text + * 22 | reverse + * 29 | italic + * 31 | underline + * 160 | non-breaking space + */ + disable_fake_channels = yes; + + /* + * invite_client_count, invite_client_time: how many INVITE commands + * are permitted per client per invite_client_time. + */ + invite_client_count = 10; + invite_client_time = 5 minutes; + + /* + * invite_delay_channel: how often an INVITE to any specific channel + * is permitted, regardless of the user sending the INVITE. + */ + invite_delay_channel = 5 seconds; + + /* + * knock_client_count, knock_client_time: how many KNOCK commands + * are permitted per client per knock_client_time. + */ + knock_client_count = 1; + knock_client_time = 5 minutes; + + /* + * knock_delay_channel: how often a KNOCK to any specific channel + * is permitted, regardless of the user sending the KNOCK. + */ + knock_delay_channel = 1 minute; + + /* + * max_channels: the maximum number of channels a user can join/be on. + * This is a default value which can be overriden with class {} blocks. + */ + max_channels = 25; + + /* max_bans: maximum number of +b/e/I modes in a channel. */ + max_bans = 100; + + /* + * default_join_flood_count, default_join_flood_time: + * how many joins in how many seconds constitute a flood. Use 0 to disable. + * +b opers will be notified. These are only default values which can be + * changed via "/QUOTE SET JFLOODCOUNT" and "/QUOTE SET JFLOODTIME". + */ + default_join_flood_count = 18; + default_join_flood_time = 6 seconds; +}; + +/* + * serverhide {}: the serverhide block contains the options regarding + * to server hiding. For more information regarding server hiding, + * please see doc/serverhide.txt + */ +serverhide { + /* + * disable_remote_commands: disable users issuing commands + * on remote servers. + */ + disable_remote_commands = no; + + /* + * flatten_links: this option will show all servers in /links appear + * as though they are linked to this current server. + */ + flatten_links = no; + + /* + * flatten_links_delay: how often to update the links file when it is + * flattened. + */ + flatten_links_delay = 5 minutes; + + /* + * flatten_links_file: path to the flatten links cache file. + */ + flatten_links_file = "/var/cache/ircd-hybrid/links.txt"; + + /* + * hidden: hide this server from a /links output on servers that + * support it. This allows hub servers to be hidden etc. + */ + hidden = no; + + /* + * hide_servers: hide remote servernames everywhere and instead use + * hidden_name and network_desc. + */ + hide_servers = no; + + /* + * hide_services: define this if you want to hide the location of + * services servers that are specified in the service {} block. + */ + hide_services = no; + + /* + * hidden_name: use this as the servername users see if hide_servers = yes. + */ + hidden_name = "*.example.net"; + + /* + * hide_server_ips: if this is disabled, opers will be unable to see + * servers' IP addresses and will be shown a masked IP address; admins + * will be shown the real IP address. + * + * If this is enabled, nobody can see a server's IP address. + * *This is a kludge*: it has the side effect of hiding the IP addresses + * everywhere, including logfiles. + * + * We recommend you leave this disabled, and just take care with who you + * give administrator privileges to. + */ + hide_server_ips = no; +}; + +/* + * general {}: the general block contains many of the options that were once + * compiled in options in config.h + */ +general { + /* + * cycle_on_host_change: sends a fake QUIT/JOIN combination + * when services change the hostname of a specific client. + */ + cycle_on_host_change = yes; + + /* max_watch: maximum WATCH entries a client can have. */ + max_watch = 50; + + /* max_accept: maximum allowed /accept's for +g user mode. */ + max_accept = 50; + + /* whowas_history_length: maximum length of the WHOWAS nick name history. */ + whowas_history_length = 15000; + + /* + * dline_min_cidr: the minimum required length of a CIDR bitmask + * for IPv4 based D-lines. + */ + dline_min_cidr = 16; + + /* + * dline_min_cidr6: the minimum required length of a CIDR bitmask + * for IPv6 based D-lines. + */ + dline_min_cidr6 = 48; + + /* + * kline_min_cidr: the minimum required length of a CIDR bitmask + * for IPv4 based K-lines. + */ + kline_min_cidr = 16; + + /* + * kline_min_cidr6: the minimum required length of a CIDR bitmask + * for IPv6 based K-lines. + */ + kline_min_cidr6 = 48; + + /* + * invisible_on_connect: whether to automatically set user mode +i + * on connecting users. + */ + invisible_on_connect = yes; + + /* + * kill_chase_time_limit: KILL chasing is a feature whereby a KILL + * issued for a user who has recently changed nickname will be applied + * automatically to the new nick. kill_chase_time_limit is the maximum + * time following a nickname change that this chasing will apply. + */ + kill_chase_time_limit = 30 seconds; + + /* + * ignore_bogus_ts: ignore bogus timestamps from other servers. + * Yes, this will desync the network, but it will allow chanops + * to resync with a valid non TS 0. + * + * This should be enabled network wide, or not at all. + */ + ignore_bogus_ts = no; + + /* + * disable_auth: completely disable ident lookups; if you enable this, + * be careful of what you set need_ident to in your auth {} blocks. + */ + disable_auth = no; + + /* + * tkline_expire_notices: enables or disables temporary kline/xline + * expire notices. + */ + tkline_expire_notices = no; + + /* + * default_floodcount: the default value of floodcount that is configurable + * via /quote set floodcount. This is the number of lines a user may send + * to any other user/channel in one second. Set to 0 to disable. + */ + default_floodcount = 10; + + /* + * failed_oper_notice: send a notice to all opers on the server when + * someone tries to OPER and uses the wrong password, host or ident. + */ + failed_oper_notice = yes; + + /* + * dots_in_ident: the number of '.' characters permitted in an ident + * reply before the user is rejected. + */ + dots_in_ident = 2; + + /* + * min_nonwildcard: the minimum number of non-wildcard characters in + * k/d lines placed via the server. K-lines hand-placed are exempt from + * this limit. + * Wildcard characters: '.', ':', '*', '?' + */ + min_nonwildcard = 4; + + /* + * min_nonwildcard_simple: the minimum number of non-wildcard characters + * in gecos bans. Wildcard characters: '*', '?' + */ + min_nonwildcard_simple = 3; + + /* anti_nick_flood: enable the nickflood control code. */ + anti_nick_flood = yes; + + /* + * max_nick_changes, max_nick_time: the number of nick changes allowed in + * the specified period. + */ + max_nick_changes = 5; + max_nick_time = 20 seconds; + + /* + * away_count, away_time: how many AWAY commands are permitted per + * client per away_time. + */ + away_count = 2; + away_time = 10 seconds; + + /* + * anti_spam_exit_message_time: the minimum time a user must be connected + * before custom quit messages are allowed. + */ + anti_spam_exit_message_time = 5 minutes; + + /* + * ts_warn_delta, ts_max_delta: the time delta allowed between server + * clocks before a warning is given, or before the link is dropped. + * All servers should run ntpdate/rdate to keep clocks in sync. + */ + ts_warn_delta = 3 seconds; + ts_max_delta = 15 seconds; + + /* + * warn_no_connect_block: warn opers about servers that try to connect + * but for which we don't have a connect {} block. Twits with + * misconfigured servers can become really annoying with this enabled. + */ + warn_no_connect_block = yes; + + /* + * stats_e_disabled: set this to 'yes' to disable "STATS e" for both + * operators and administrators. Doing so is a good idea in case + * there are any exempted (exempt {}) server IP addresses you don't + * want to see leaked. + */ + stats_e_disabled = no; + + /* stats_m_oper_only: make /stats m/M (messages) oper only. */ + stats_m_oper_only = yes; + + /* stats_o_oper only: make stats o (opers) oper only. */ + stats_o_oper_only = yes; + + /* stats_P_oper_only: make stats P (ports) oper only. */ + stats_P_oper_only = yes; + + /* stats_u_oper_only: make stats u (uptime) oper only. */ + stats_u_oper_only = no; + + /* + * stats_i_oper_only: make stats i (auth {}) oper only. Set to: + * yes - show users no auth {} blocks, made oper only + * masked - show users the first matching auth {} block + * no - show users all auth {} blocks + */ + stats_i_oper_only = yes; + + /* + * stats_k_oper_only: make stats k/K (klines) oper only. Set to: + * yes - show users no klines + * masked - show users the first matching kline + * no - show users all klines + */ + stats_k_oper_only = yes; + + /* + * caller_id_wait: time between notifying a +g user that somebody + * is messaging them. + */ + caller_id_wait = 1 minute; + + /* + * opers_bypass_callerid: allows operators to bypass +g and message + * anyone who has it set. + */ + opers_bypass_callerid = no; + + /* + * pace_wait_simple: minimum time required between use of less + * intensive commands + * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS) + */ + pace_wait_simple = 1 second; + + /* + * pace_wait: minimum time required between use of more intensive commands + * (INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS) + */ + pace_wait = 10 seconds; + + /* + * short_motd: send clients a notice telling them to read the MOTD + * instead of forcing an MOTD to clients who may simply ignore it. + */ + short_motd = no; + + /* + * ping_cookie: require clients to respond exactly to a PING command, + * can help block certain types of drones and FTP PASV mode spoofing. + */ + ping_cookie = no; + + /* no_oper_flood: increase flood limits for opers. */ + no_oper_flood = yes; + + /* + * max_targets: the maximum number of targets in a single + * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited. + */ + max_targets = 4; + + /* + * user modes configurable: a list of user modes for the options below + * + * +b - bots - See bot and drone flooding notices + * +c - cconn - Client connection/quit notices + * +D - deaf - Don't receive channel messages + * +d - debug - See debugging notices + * +e - external - See remote server connection and split notices + * +F - farconnect - Remote client connection/quit notices + * +f - full - See auth {} block full notices + * +G - softcallerid - Server Side Ignore for users not on your channels + * +g - callerid - Server Side Ignore (for privmsgs etc) + * +H - hidden - Hides operator status to other users + * +i - invisible - Not shown in NAMES or WHO unless you share a channel + * +j - rej - See rejected client notices + * +k - skill - See server generated KILL messages + * +l - locops - See LOCOPS messages + * +n - nchange - See client nick changes + * +p - hidechans - Hides channel list in WHOIS + * +q - hideidle - Hides idle and signon time in WHOIS + * +R - nononreg - Only receive private messages from registered clients + * +s - servnotice - See general server notices + * +u - unauth - See unauthorized client notices + * +w - wallop - See server generated WALLOPS + * +y - spy - See LINKS, STATS, TRACE notices etc. + */ + + /* oper_only_umodes: user modes only operators may set. */ + oper_only_umodes = bots, cconn, debug, external, farconnect, full, hidden, + locops, nchange, rej, skill, spy, unauth; + + /* oper_umodes: default user modes operators get when they successfully OPER. */ + oper_umodes = bots, locops, servnotice, wallop; + + /* + * throttle_count: the maximum number of connections from the same + * IP address allowed in throttle_time duration. + */ + throttle_count = 1; + + /* + * throttle_time: the minimum amount of time required between + * connections from the same IP address. exempt {} blocks are + * excluded from this throttling. + * Offers protection against flooders who reconnect quickly. + * Set to 0 to disable. + */ + throttle_time = 2 seconds; +}; + +modules { + /* + * path: other paths to search for modules specified below + * and in "/module load". + */ + path = "/usr/lib/ircd-hybrid/modules"; +# path = "/usr/local/lib/ircd-hybrid/modules/extra"; + path = "/usr/lib/ircd-hybrid/modules/autoload"; + + /* module: the name of a module to load on startup/rehash. */ +# module = "some_module.la"; +}; + +/* + * log {}: contains information about logfiles. + */ +log { + /* Do you want to enable logging to ircd.log? */ + use_logging = yes; + + file { + type = oper; + name = "/var/log/ircd/ircd-hybrid-oper.log"; + size = 10 megabytes; + }; + + file { + type = user; + name = "/var/log/ircd/ircd-hybrid-user.log"; + size = 10 megabytes; + }; + + file { + type = kill; + name = "/var/log/ircd/ircd-hybrid-kill.log"; + size = 10 megabytes; + }; + + file { + type = kline; + name = "/var/log/ircd/ircd-hybrid-kline.log"; + size = 10 megabytes; + }; + + file { + type = dline; + name = "/var/log/ircd/ircd-hybrid-dline.log"; + size = 10 megabytes; + }; + + file { + type = xline; + name = "/var/log/ircd/ircd-hybrid-xline.log"; + size = 10 megabytes; + }; + + file { + type = resv; + name = "/var/log/ircd/ircd-hybrid-resv.log"; + size = 10 megabytes; + }; + + file { + type = debug; + name = "/var/log/ircd/ircd-hybrid-debug.log"; + size = 10 megabytes; + }; +}; diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf.nossl ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf.nossl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf.nossl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf.nossl 1970-01-01 00:00:00.000000000 +0000 @@ -1,1242 +0,0 @@ -/* - * This is an example configuration file for ircd-hybrid - * - * Copyright (c) 2000-2015 ircd-hybrid development team - * - * $Id: reference.conf 6794 2015-11-17 20:51:46Z michael $ - * - * This version has been customized for Debian. - */ - -/* - * ######################################################################## - * IMPORTANT NOTE: - * - * auth {} blocks MUST be specified in order of precedence. The first one - * that matches a user will be used. So place spoofs first, then specials, - * then general access. - * ######################################################################## - * - * Shell style (#), C++ style (//) and C style comments are supported. - * - * Files may be included by either: - * .include "filename" - * .include - * - * Times/durations are written as: - * 12 hours 30 minutes 1 second - * - * Valid units of time: - * year, month, week, day, hour, minute, second - * - * Valid units of size: - * megabyte/mbyte/mb, kilobyte/kbyte/kb, byte - * - * Sizes and times may be singular or plural. - */ - - -/* - * serverinfo {}: contains information about the server - */ -serverinfo { - /* - * name: the name of this server. This cannot be changed at runtime. - */ - name = "hybrid8.debian.local"; - - /* - * sid: a server's unique ID. This is three characters long and must - * be in the form [0-9][A-Z0-9][A-Z0-9]. The first character must be - * a digit, followed by 2 alpha-numerical letters. - * - * NOTE: The letters must be capitalized. This cannot be changed at runtime. - * - * A sid is automatically generated at runtime, if you want to configure - * a specific sid, uncomment the following line. - */ -# sid = "0HY"; - - /* - * description: the description of the server. - */ - description = "ircd-hybrid 8.1-debian"; - - /* - * network_name, network_desc: the name and description of the network this - * server is on. Shown in the 005 reply and used with serverhiding. - */ - network_name = "debian"; - network_desc = "This is My Network"; - - /* - * hub: allow this server to act as a hub and have multiple servers - * connected to it. - */ - hub = no; - - /* - * vhost: the IP address to bind to when we connect outward to IPv4 servers. - * This should be an IPv4 address, or "*" for INADDR_ANY. - */ -# vhost = "192.0.2.1"; - - /* - * vhost6: the IP address to bind to when we connect outward to IPv6 servers. - * This should be an IPv6 address, or "*" for in6addr_any. - */ -# vhost6 = "2001:DB8::1"; - - /* - * default_max_clients: the default maximum number of clients allowed - * to connect. This can be changed from within IRC via /QUOTE SET MAX. - */ - default_max_clients = 512; - - /* - * max_nick_length: only applies to local clients. Must be in the - * range of 9 to 30. Default is 9 if nothing else is specified. - */ - max_nick_length = 15; - - /* - * max_topic_length: only applies to topics set by local clients. - * Must be in the range of 80 to 300. Default is 80 if nothing - * else is specified. - */ - max_topic_length = 300; - -}; - -/* - * admin {}: contains administrative information about the server - */ -admin { - name = "Smurf target"; - description = "Main Server Administrator"; - email = ""; -}; - -/* - * class {}: contains information about classes for users - */ -class { - /* name: the name of the class. */ - name = "users"; - - /* - * ping_time: how often a client must reply to a PING from the - * server before they are dropped. - */ - ping_time = 90 seconds; - - /* - * number_per_ip: how many local users are allowed to connect - * from a single IP address (optional) - */ - number_per_ip = 2; - - /* - * max_local: how many local users are allowed to connect - * from a single ident@host (optional) - */ - max_local = 2; - - /* - * max_global: network-wide limit of users per ident@host (optional) - */ - max_global = 10; - - /* - * max_number: the maximum number of users allowed in this class (optional) - */ - max_number = 100; - - /* - * The following lines are optional and allow you to define - * how many users can connect from one /NN subnet. - */ - cidr_bitlen_ipv4 = 24; - cidr_bitlen_ipv6 = 120; - number_per_cidr = 16; - - /* - * sendq: the amount of data allowed in a client's send queue before - * they are dropped. - */ - sendq = 100 kbytes; - - /* - * recvq: the amount of data allowed in a client's receive queue before - * they are dropped for flooding. Defaults to 2560 if the chosen value - * isn't within the range of 512 to 8000. - */ - recvq = 2560 bytes; -}; - -class { - name = "opers"; - ping_time = 90 seconds; - number_per_ip = 10; - max_number = 100; - sendq = 100 kbytes; - - /* - * max_channels: maximum number of channels users in this class can join. - */ - max_channels = 60; - - /* - * min_idle: minimum idle time that is shown in WHOIS. - */ - min_idle = 3 hours; - - /* - * max_idle: maximum idle time that is shown in WHOIS. - */ - max_idle = 8 hours; - - /* - * flags: - * - * random_idle - a fake idle time is set randomly between - * min_idle and max_idle - * hide_idle_from_opers - the fake idle time will also be shown to operators - */ - flags = random_idle, hide_idle_from_opers; -}; - -class { - name = "server"; - ping_time = 90 seconds; - - /* - * connectfreq: only used in server classes. Specifies the delay - * between autoconnecting to servers. - */ - connectfreq = 5 minutes; - - /* max number: the number of servers to autoconnect to. */ - max_number = 1; - - /* sendq: servers need a higher sendq as they send more data. */ - sendq = 2 megabytes; -}; - -/* - * motd {}: Allows the display of a different MOTD to a client - * depending on its origin. Applies to local users only. - */ -motd { - /* - * mask: multiple mask entries are permitted. Mask can either be - * a class name or a hostname. CIDR is supported. - */ - mask = "*.at"; - mask = "*.de"; - mask = "*.ch"; - - /* - * file: path to the actual motd file. - */ - file = "/etc/ircd-hybrid/german.motd"; -}; - -/* - * listen {}: contains information about the ports ircd listens on - */ -listen { - /* - * port: the port to listen on. If no host is specified earlier in the - * listen {} block, it will listen on all available IP addresses. - * - * Ports are separated by commas; a range may be specified using ".." - */ - - /* port: listen on all available IP addresses, ports 6665 to 6669. */ - port = 6665 .. 6669; - - /* - * host: set a specific IP address to listen on using the - * subsequent port definitions. This may be IPv4 or IPv6. - */ - #host = "1.2.3.4"; - #port = 7000, 7001; - - #host = "3ffe:1234:a:b:c::d"; - #port = 7002; -}; - -/* - * auth {}: allow users to connect to the ircd - */ -auth { - /* - * user: the user@host allowed to connect. Multiple user - * lines are permitted within each auth {} block. - */ - user = "*@127.0.0.1"; - #user = "*test@123D:B567:*"; - - /* password: an optional password that is required to use this block. */ - #password = "letmein"; - - /* - * encrypted: controls whether the auth password above has been - * encrypted. Default is 'no' if nothing else is specified. - */ - #encrypted = yes; - - /* - * spoof: fake the user's host to this. This is free-form, just do - * everyone a favor and don't abuse it. ('=' prefix on /stats I) - */ - spoof = "i.love.debian.org"; - - /* class: the class the user is placed in. */ - class = "opers"; - - /* - * need_password - don't allow users who haven't supplied the correct | ('&' prefix on /stats I if disabled) - * password to connect using another auth {} block - * need_ident - require the user to have identd to connect | ('+' prefix on /stats I) - * spoof_notice - enable spoofing notification to admins - * exceed_limit - allow a user to exceed class limits | ('>' prefix on /stats I) - * kline_exempt - exempt this user from k-lines | ('^' prefix on /stats I) - * xline_exempt - exempt this user from x-lines | ('!' prefix on /stats I) - * resv_exempt - exempt this user from resvs | ('$' prefix on /stats I) - * no_tilde - remove ~ from a user with no ident | ('-' prefix on /stats I) - * can_flood - allow this user to exceed flood limits | ('|' prefix on /stats I) - * webirc - enables WEBIRC authentication for web-based | ('<' prefix on /stats I) - * clients such as Mibbit - */ - flags = need_password, spoof_notice, exceed_limit, kline_exempt, - xline_exempt, resv_exempt, no_tilde, can_flood; -}; - -#auth { -# /* -# * redirserv, redirport: the server and port to redirect a user to. -# * A user does not have to obey the redirection; the ircd just -# * suggests an alternative server for them. -# */ -# redirserv = "server2.example.net"; -# redirport = 6667; -# -# user = "*@*.ch"; -# -# /* class: a class is required even though it is not used. */ -# class = "users"; -#}; - -auth { - user = "*@*"; - class = "users"; - flags = need_ident; -}; - -/* - * operator {}: defines ircd operators - */ -#operator { -# /* name: the name of the operator */ -# name = "sheep"; -# -# /* -# * user: the user@host required for this operator. Multiple user -# * lines are permitted within each operator {} block. -# */ -# user = "*sheep@192.0.2.0/26"; -# user = "*@192.0.2.240/28"; -# -# /* -# * password: the password required to oper. By default this will need -# * to be encrypted by using the provided mkpasswd tool. -# * The availability of various password hash algorithms may vary -# * depending on the system's crypt(3) implementation. -# */ -# password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4"; -# -# /* -# * encrypted: controls whether the oper password above has been -# * encrypted. -# */ -# encrypted = yes; -# -# /* class: the class the oper joins when they successfully OPER */ -# class = "opers"; -# -# /* -# * whois: allows to override the default RPL_WHOISOPERATOR numeric -# * string shown in /whois. -# * This string is propagated to all servers on the network. -# */ -## whois = "is a Smurf Target (IRC Operator)"; -# -# /* -# * umodes: the default usermodes opers get when they successfully OPER. -# * If defined, it will override oper_umodes settings in general {}. -# * Available user modes: -# * -# * +b - bots - See bot and drone flooding notices -# * +c - cconn - Client connection/quit notices -# * +D - deaf - Don't receive channel messages -# * +d - debug - See debugging notices -# * +e - external - See remote server connection and split notices -# * +F - farconnect - Remote client connection/quit notices -# * +f - full - See auth {} block full notices -# * +G - softcallerid - Server Side Ignore for users not on your channels -# * +g - callerid - Server Side Ignore (for privmsgs etc) -# * +H - hidden - Hides operator status to other users -# * +i - invisible - Not shown in NAMES or WHO unless you share a channel -# * +j - rej - See rejected client notices -# * +k - skill - See server generated KILL messages -# * +l - locops - See LOCOPS messages -# * +n - nchange - See client nick changes -# * +p - hidechans - Hides channel list in WHOIS -# * +q - hideidle - Hides idle and signon time in WHOIS -# * +R - nononreg - Only receive private messages from registered clients -# * +s - servnotice - See general server notices -# * +u - unauth - See unauthorized client notices -# * +w - wallop - See server generated WALLOPS -# * +y - spy - See LINKS, STATS, TRACE notices etc. -# * +z - operwall - See oper generated WALLOPS -# */ -# umodes = locops, servnotice, wallop; -# -# /* -# * flags: controls the activities and commands an oper is -# * allowed to do on the server. All flags default to 'no'. -# * Available flags: -# * -# * admin - gives administrator privileges | ('A' flag) -# * close - allows CLOSE | ('B' flag) -# * connect - allows local CONNECT | ('C' flag) -# * connect:remote - allows remote CONNECT | ('D' flag) -# * die - allows DIE | ('E' flag) -# * dline - allows DLINE | ('F' flag) -# * globops - allows GLOBOPS | ('G' flag) -# * join:resv - allows to JOIN resv {} channels | ('H' flag) -# * kill - allows to KILL local clients | ('I' flag) -# * kill:remote - allows remote users to be /KILL'd | ('J' flag) -# * kline - allows KLINE | ('K' flag) -# * locops - allows LOCOPS | ('L' flag) -# * module - allows MODULE | ('M' flag) -# * nick:resv - allows to use NICK on resv {} nicks | ('N' flag) -# * opme - allows OPME | ('O' flag) -# * rehash - allows oper to REHASH config | ('P' flag) -# * remoteban - allows remote KLINE/UNKLINE | ('Q' flag) -# * restart - allows RESTART | ('R' flag) -# * resv - allows RESV | ('S' flag) -# * set - allows SET | ('T' flag) -# * squit - allows local SQUIT | ('U' flag) -# * squit:remote - allows remote SQUIT | ('V' flag) -# * undline - allows UNDLINE | ('W' flag) -# * unkline - allows UNKLINE | ('X' flag) -# * unresv - allows UNRESV | ('Y' flag) -# * unxline - allows UNXLINE | ('Z' flag) -# * wallops - allows WALLOPS | ('a' flag) -# * xline - allows XLINE | ('b' flag) -# */ -# flags = admin, connect, connect:remote, die, globops, kill, kill:remote, -# kline, module, rehash, restart, set, unkline, unxline, xline; -#}; - -/* - * connect {}: define a server to connect to - * IMPORTANT NOTE for Debian users: before you configure any links to - * other servers, change the sid earlier in this config file to a - * value which will be unique within the network. - */ -#connect { -# /* name: the name of the server. */ -# name = "uplink.example.net"; -# -# /* -# * host: the host or IP address to connect to. If a hostname is used it -# * must match the reverse DNS of the server. -# */ -# host = "192.0.2.4"; -# -# /* -# * vhost: the IP address to bind to when making outgoing connections to -# * servers. -# * serverinfo::vhost and serverinfo::vhost6 will be overridden -# * by this directive. -# */ -# vhost = "192.0.2.5"; -# -# /* -# * send_password, accept_password: the passwords to send and accept. -# * The remote server will have these passwords swapped. -# */ -# send_password = "password"; -# accept_password = "anotherpassword"; -# -# /* -# * encrypted: controls whether the accept_password above has been -# * encrypted. -# */ -# encrypted = no; -# -# /* port: the port to connect to this server on. */ -# port = 6666; -# -# /* -# * hub_mask: the mask of servers that this server may hub. Multiple -# * entries are permitted. -# */ -# hub_mask = "*"; -# -# /* -# * leaf_mask: the mask of servers this server may not hub. Multiple -# * entries are permitted. Useful for forbidding EU -> US -> EU routes. -# */ -## leaf_mask = "*.uk"; -# -# /* class: the class this server is in */ -# class = "server"; -# -# /* -# * autoconn - controls whether we autoconnect to this server or not, -# * dependent on class limits. By default, this is disabled. -# */ -## flags = autoconn; -#}; - -#connect { -# name = "ipv6.example.net"; -# host = "2001:DB8::3"; -# send_password = "password"; -# accept_password = "password"; -# port = 6666; -# -# /* -# * aftype: controls whether the connection uses "ipv4" or "ipv6". -# * Default is ipv4. -# */ -# aftype = ipv6; -# class = "server"; -#}; - -/* - * cluster {}: servers that share klines/unkline/xline/unxline/resv/unresv/locops - * automatically - */ -#cluster { -# /* -# * name: the server to share with; this can take wildcards -# * -# * NOTE: only local actions will be clustered, meaning that if -# * the server receives a shared kline/unkline/etc, it -# * will not be propagated to clustered servers. -# * -# * Remote servers are not necessarily required to accept -# * clustered lines, they need a shared {} block for *THIS* -# * server in order to accept them. -# */ -# name = "*.example.net"; -# -# /* -# * type: list of what to share; options are as follows: -# * dline - share dlines -# * undline - share undlines -# * kline - share klines -# * unkline - share unklines -# * xline - share xlines -# * unxline - share unxlines -# * resv - share resvs -# * unresv - share unresvs -# * locops - share locops -# * all - share all of the above (default) -# */ -# type = kline, unkline, locops, xline, resv; -#}; - -/* - * shared {}: users that are allowed to remote kline - * - * NOTE: This can effectively be used for remote klines. - * Please note that there is no password authentication - * for users setting remote klines. You must also be - * /oper'd in order to issue a remote kline. - */ -shared { - /* - * name: the server the user must be connected to in order to set klines. - * If this is not specified, the user will be allowed to kline from all - * servers. - */ - name = "hybrid8.debian.local"; - - /* - * user: the user@host mask that is allowed to set klines. If this is - * not specified, all users on the server above will be allowed to set - * a remote kline. - */ - user = "root@localhost"; - - /* - * type: list of what to share, options are as follows: - * dline - allow oper/server to dline - * undline - allow oper/server to undline - * kline - allow oper/server to kline - * unkline - allow oper/server to unkline - * xline - allow oper/server to xline - * unxline - allow oper/server to unxline - * resv - allow oper/server to resv - * unresv - allow oper/server to unresv - * locops - allow oper/server to locops - only used for servers that cluster - * all - allow oper/server to do all of the above (default) - */ - type = kline, unkline, resv; -}; - -/* - * kill {}: users that are not allowed to connect - * Oper issued klines will be added to the specified kline database - */ -#kill { -# user = "bad@*.example.net"; -# reason = "Obviously hacked account"; -#}; - -/* - * deny {}: IP addresses that are not allowed to connect - * (before DNS/ident lookup) - * Oper issued dlines will be added to the specified dline database - */ -#deny { -# ip = "192.0.2.0/28"; -# reason = "Reconnecting vhosted bots"; -#}; - -/* - * exempt {}: IP addresses that are exempt from deny {} and Dlines - */ -#exempt { -# ip = "192.0.2.240/28"; -#}; - -/* - * resv {}: nicks and channels users may not use/join - */ -resv { mask = "clone*"; reason = "Clone bots"; }; -resv { mask = "Global"; reason = "Reserved for services"; }; -resv { mask = "ChanServ"; reason = "Reserved for services"; }; -resv { mask = "NickServ"; reason = "Reserved for services"; }; -resv { mask = "OperServ"; reason = "Reserved for services"; }; -resv { mask = "MemoServ"; reason = "Reserved for services"; }; -resv { mask = "BotServ"; reason = "Reserved for services"; }; -resv { mask = "HelpServ"; reason = "Reserved for services"; }; -resv { mask = "HostServ"; reason = "Reserved for services"; }; -resv { mask = "StatServ"; reason = "Reserved for services"; }; -resv { mask = "#*services*"; reason = "Reserved for services"; }; - -#resv { -# /* -# * mask: masks starting with a '#' are automatically considered -# * as channel name masks. -# */ -# mask = "#helsinki"; -# reason = "Channel is reserved for Finnish inhabitants"; -# -# /* -# * exempt: can be either a ISO 3166 alpha-2 two letter country -# * code, or a nick!user@host mask. CIDR is supported. Exempt -# * entries can be stacked. -# */ -# exempt = "FI"; -#}; - -/* - * gecos {}: used for banning users based on their "realname". - */ -#gecos { -# name = "*sex*"; -# reason = "Possible spambot"; -#}; - -#gecos { -# name = "sub7server"; -# reason = "Trojan drone"; -#}; - -/* - * service {}: specifies a server which may act as a network service - * - * NOTE: it is very important that every server on the network - * has the same service {} block. - */ -#service { -# name = "service.example.net"; -# name = "stats.example.net"; -#}; - -/* - * pseudo {}: adds pseudo/custom commands also known as service aliases - */ -#pseudo { -# /* command: the actual command/alias. */ -# command = "IDENTIFY"; -# -# /* prepend: optional text that can be prepended before the user's message. */ -# prepend = "IDENTIFY "; -# -# /* name: the service name, used for error messages. */ -# name = "NickServ"; -# -# /* target: the actual target where this message should be sent to. */ -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "CHANSERV"; -# name = "ChanServ"; -# target = "ChanServ@service.example.net"; -#}; -# -#pseudo { -# command = "CS"; -# name = "ChanServ"; -# target = "ChanServ@service.example.net"; -#}; -# -#pseudo { -# command = "NICKSERV"; -# name = "NickServ"; -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "NS"; -# name = "NickServ"; -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "MEMOSERV"; -# name = "MemoServ"; -# target = "MemoServ@service.example.net"; -#}; -# -#pseudo { -# command = "MS"; -# name = "MemoServ"; -# target = "MemoServ@service.example.net"; -#}; -# -#pseudo { -# command = "OPERSERV"; -# name = "OperServ"; -# target = "OperServ@service.example.net"; -#}; -# -#pseudo { -# command = "OS"; -# name = "OperServ"; -# target = "OperServ@service.example.net"; -#}; -# -#pseudo { -# command = "HOSTSERV"; -# name = "HostServ"; -# target = "HostServ@service.example.net"; -#}; -# -#pseudo { -# command = "HS"; -# name = "HostServ"; -# target = "HostServ@service.example.net"; -#}; -# -#pseudo { -# command = "BOTSERV"; -# name = "BotServ"; -# target = "BotServ@service.example.net"; -#}; -# -#pseudo { -# command = "BS"; -# name = "BotServ"; -# target = "BotServ@service.example.net"; -#}; - -/* - * channel {}: the channel block contains options pertaining to channels - */ -channel { - /* - * disable_fake_channels: this option, if set to 'yes', will - * disallow clients from creating or joining channels that have one - * of the following ASCII characters in their name: - * - * 2 | bold - * 3 | mirc color - * 15 | plain text - * 22 | reverse - * 29 | italic - * 31 | underline - * 160 | non-breaking space - */ - disable_fake_channels = yes; - - /* - * invite_client_count, invite_client_time: how many INVITE commands - * are permitted per client per invite_client_time. - */ - invite_client_count = 10; - invite_client_time = 5 minutes; - - /* - * invite_delay_channel: how often an INVITE to any specific channel - * is permitted, regardless of the user sending the INVITE. - */ - invite_delay_channel = 5 seconds; - - /* - * knock_client_count, knock_client_time: how many KNOCK commands - * are permitted per client per knock_client_time. - */ - knock_client_count = 1; - knock_client_time = 5 minutes; - - /* - * knock_delay_channel: how often a KNOCK to any specific channel - * is permitted, regardless of the user sending the KNOCK. - */ - knock_delay_channel = 1 minute; - - /* - * max_channels: the maximum number of channels a user can join/be on. - * This is a default value which can be overriden with class {} blocks. - */ - max_channels = 25; - - /* max_bans: maximum number of +b/e/I modes in a channel. */ - max_bans = 100; - - /* - * default_join_flood_count, default_join_flood_time: - * how many joins in how many seconds constitute a flood. Use 0 to disable. - * +b opers will be notified. These are only default values which can be - * changed via "/QUOTE SET JFLOODCOUNT" and "/QUOTE SET JFLOODTIME". - */ - default_join_flood_count = 18; - default_join_flood_time = 6 seconds; -}; - -/* - * serverhide {}: the serverhide block contains the options regarding - * to server hiding. For more information regarding server hiding, - * please see doc/serverhide.txt - */ -serverhide { - /* - * disable_remote_commands: disable users issuing commands - * on remote servers. - */ - disable_remote_commands = no; - - /* - * flatten_links: this option will show all servers in /links appear - * as though they are linked to this current server. - */ - flatten_links = no; - - /* - * flatten_links_delay: how often to update the links file when it is - * flattened. - */ - flatten_links_delay = 5 minutes; - - /* - * flatten_links_file: path to the flatten links cache file. - */ - flatten_links_file = "/var/cache/ircd-hybrid/links.txt"; - - /* - * hidden: hide this server from a /links output on servers that - * support it. This allows hub servers to be hidden etc. - */ - hidden = no; - - /* - * hide_servers: hide remote servernames everywhere and instead use - * hidden_name and network_desc. - */ - hide_servers = no; - - /* - * hide_services: define this if you want to hide the location of - * services servers that are specified in the service {} block. - */ - hide_services = no; - - /* - * hidden_name: use this as the servername users see if hide_servers = yes. - */ - hidden_name = "*.example.net"; - - /* - * hide_server_ips: if this is disabled, opers will be unable to see - * servers' IP addresses and will be shown a masked IP address; admins - * will be shown the real IP address. - * - * If this is enabled, nobody can see a server's IP address. - * *This is a kludge*: it has the side effect of hiding the IP addresses - * everywhere, including logfiles. - * - * We recommend you leave this disabled, and just take care with who you - * give administrator privileges to. - */ - hide_server_ips = no; -}; - -/* - * general {}: the general block contains many of the options that were once - * compiled in options in config.h - */ -general { - /* - * cycle_on_host_change: sends a fake QUIT/JOIN combination - * when services change the hostname of a specific client. - */ - cycle_on_host_change = yes; - - /* max_watch: maximum WATCH entries a client can have. */ - max_watch = 50; - - /* max_accept: maximum allowed /accept's for +g user mode. */ - max_accept = 50; - - /* - * dline_min_cidr: the minimum required length of a CIDR bitmask - * for IPv4 based D-lines. - */ - dline_min_cidr = 16; - - /* - * dline_min_cidr6: the minimum required length of a CIDR bitmask - * for IPv6 based D-lines. - */ - dline_min_cidr6 = 48; - - /* - * kline_min_cidr: the minimum required length of a CIDR bitmask - * for IPv4 based K-lines. - */ - kline_min_cidr = 16; - - /* - * kline_min_cidr6: the minimum required length of a CIDR bitmask - * for IPv6 based K-lines. - */ - kline_min_cidr6 = 48; - - /* - * invisible_on_connect: whether to automatically set user mode +i - * on connecting users. - */ - invisible_on_connect = yes; - - /* - * kill_chase_time_limit: KILL chasing is a feature whereby a KILL - * issued for a user who has recently changed nickname will be applied - * automatically to the new nick. kill_chase_time_limit is the maximum - * time following a nickname change that this chasing will apply. - */ - kill_chase_time_limit = 30 seconds; - - /* - * ignore_bogus_ts: ignore bogus timestamps from other servers. - * Yes, this will desync the network, but it will allow chanops - * to resync with a valid non TS 0. - * - * This should be enabled network wide, or not at all. - */ - ignore_bogus_ts = no; - - /* - * disable_auth: completely disable ident lookups; if you enable this, - * be careful of what you set need_ident to in your auth {} blocks. - */ - disable_auth = no; - - /* - * tkline_expire_notices: enables or disables temporary kline/xline - * expire notices. - */ - tkline_expire_notices = no; - - /* - * default_floodcount: the default value of floodcount that is configurable - * via /quote set floodcount. This is the number of lines a user may send - * to any other user/channel in one second. Set to 0 to disable. - */ - default_floodcount = 10; - - /* - * failed_oper_notice: send a notice to all opers on the server when - * someone tries to OPER and uses the wrong password, host or ident. - */ - failed_oper_notice = yes; - - /* - * dots_in_ident: the number of '.' characters permitted in an ident - * reply before the user is rejected. - */ - dots_in_ident = 2; - - /* - * min_nonwildcard: the minimum number of non-wildcard characters in - * k/d lines placed via the server. K-lines hand-placed are exempt from - * this limit. - * Wildcard characters: '.', ':', '*', '?' - */ - min_nonwildcard = 4; - - /* - * min_nonwildcard_simple: the minimum number of non-wildcard characters - * in gecos bans. Wildcard characters: '*', '?' - */ - min_nonwildcard_simple = 3; - - /* anti_nick_flood: enable the nickflood control code. */ - anti_nick_flood = yes; - - /* - * max_nick_changes, max_nick_time: the number of nick changes allowed in - * the specified period. - */ - max_nick_changes = 5; - max_nick_time = 20 seconds; - - /* - * away_count, away_time: how many AWAY command are permitted per - * client per away_time. - */ - away_count = 2; - away_time = 10 seconds; - - /* - * anti_spam_exit_message_time: the minimum time a user must be connected - * before custom quit messages are allowed. - */ - anti_spam_exit_message_time = 5 minutes; - - /* - * ts_warn_delta, ts_max_delta: the time delta allowed between server - * clocks before a warning is given, or before the link is dropped. - * All servers should run ntpdate/rdate to keep clocks in sync. - */ - ts_warn_delta = 3 seconds; - ts_max_delta = 15 seconds; - - /* - * warn_no_connect_block: warn opers about servers that try to connect - * but for which we don't have a connect {} block. Twits with - * misconfigured servers can become really annoying with this enabled. - */ - warn_no_connect_block = yes; - - /* - * stats_e_disabled: set this to 'yes' to disable "STATS e" for both - * operators and administrators. Doing so is a good idea in case - * there are any exempted (exempt {}) server IP addresses you don't - * want to see leaked. - */ - stats_e_disabled = no; - - /* stats_m_oper_only: make /stats m/M (messages) oper only. */ - stats_m_oper_only = yes; - - /* stats_o_oper only: make stats o (opers) oper only. */ - stats_o_oper_only = yes; - - /* stats_P_oper_only: make stats P (ports) oper only. */ - stats_P_oper_only = yes; - - /* stats_u_oper_only: make stats u (uptime) oper only. */ - stats_u_oper_only = no; - - /* - * stats_i_oper_only: make stats i (auth {}) oper only. Set to: - * yes - show users no auth {} blocks, made oper only - * masked - show users the first matching auth {} block - * no - show users all auth {} blocks - */ - stats_i_oper_only = yes; - - /* - * stats_k_oper_only: make stats k/K (klines) oper only. Set to: - * yes - show users no klines, made oper only - * masked - show users the first matching line - * no - show users all klines - */ - stats_k_oper_only = yes; - - /* - * caller_id_wait: time between notifying a +g user that somebody - * is messaging them. - */ - caller_id_wait = 1 minute; - - /* - * opers_bypass_callerid: allows operators to bypass +g and message - * anyone who has it set. - */ - opers_bypass_callerid = no; - - /* - * pace_wait_simple: minimum time required between use of less - * intensive commands - * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS) - */ - pace_wait_simple = 1 second; - - /* - * pace_wait: minimum time required between use of more intensive commands - * (INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS) - */ - pace_wait = 10 seconds; - - /* - * short_motd: send clients a notice telling them to read the MOTD - * instead of forcing an MOTD to clients who may simply ignore it. - */ - short_motd = no; - - /* - * ping_cookie: require clients to respond exactly to a PING command, - * can help block certain types of drones and FTP PASV mode spoofing. - */ - ping_cookie = no; - - /* no_oper_flood: increase flood limits for opers. */ - no_oper_flood = yes; - - /* - * max_targets: the maximum number of targets in a single - * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited. - */ - max_targets = 4; - - /* - * user modes configurable: a list of user modes for the options below - * - * +b - bots - See bot and drone flooding notices - * +c - cconn - Client connection/quit notices - * +D - deaf - Don't receive channel messages - * +d - debug - See debugging notices - * +e - external - See remote server connection and split notices - * +F - farconnect - Remote client connection/quit notices - * +f - full - See auth {} block full notices - * +G - softcallerid - Server Side Ignore for users not on your channels - * +g - callerid - Server Side Ignore (for privmsgs etc) - * +H - hidden - Hides operator status to other users - * +i - invisible - Not shown in NAMES or WHO unless you share a channel - * +j - rej - See rejected client notices - * +k - skill - See server generated KILL messages - * +l - locops - See LOCOPS messages - * +n - nchange - See client nick changes - * +p - hidechans - Hides channel list in WHOIS - * +q - hideidle - Hides idle and signon time in WHOIS - * +R - nononreg - Only receive private messages from registered clients - * +s - servnotice - See general server notices - * +u - unauth - See unauthorized client notices - * +w - wallop - See server generated WALLOPS - * +y - spy - See LINKS, STATS, TRACE notices etc. - */ - - /* oper_only_umodes: user modes only operators may set. */ - oper_only_umodes = bots, cconn, debug, external, farconnect, full, hidden, - locops, nchange, rej, skill, spy, unauth; - - /* oper_umodes: default user modes operators get when they successfully OPER. */ - oper_umodes = bots, locops, servnotice, wallop; - - /* - * throttle_count: the maximum number of connections from the same - * IP address allowed in throttle_time duration. - */ - throttle_count = 1; - - /* - * throttle_time: the minimum amount of time required between - * connections from the same IP address. exempt {} blocks are - * excluded from this throttling. - * Offers protection against flooders who reconnect quickly. - * Set to 0 to disable. - */ - throttle_time = 2 seconds; -}; - -modules { - /* - * path: other paths to search for modules specified below - * and in "/module load". - */ - path = "/usr/lib/ircd-hybrid/modules"; -# path = "/usr/local/lib/ircd-hybrid/modules/extra"; - path = "/usr/lib/ircd-hybrid/modules/autoload"; - - /* module: the name of a module to load on startup/rehash. */ -# module = "some_module.la"; -}; - -/* - * log {}: contains information about logfiles. - */ -log { - /* Do you want to enable logging to ircd.log? */ - use_logging = yes; - - file { - type = oper; - name = "/var/log/ircd/ircd-hybrid-oper.log"; - size = 10 megabytes; - }; - - file { - type = user; - name = "/var/log/ircd/ircd-hybrid-user.log"; - size = 10 megabytes; - }; - - file { - type = kill; - name = "/var/log/ircd/ircd-hybrid-kill.log"; - size = 10 megabytes; - }; - - file { - type = kline; - name = "/var/log/ircd/ircd-hybrid-kline.log"; - size = 10 megabytes; - }; - - file { - type = dline; - name = "/var/log/ircd/ircd-hybrid-dline.log"; - size = 10 megabytes; - }; - - file { - type = xline; - name = "/var/log/ircd/ircd-hybrid-xline.log"; - size = 10 megabytes; - }; - - file { - type = resv; - name = "/var/log/ircd/ircd-hybrid-resv.log"; - size = 10 megabytes; - }; - - file { - type = debug; - name = "/var/log/ircd/ircd-hybrid-debug.log"; - size = 10 megabytes; - }; -}; diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf.ssl ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf.ssl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd.conf.ssl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd.conf.ssl 1970-01-01 00:00:00.000000000 +0000 @@ -1,1385 +0,0 @@ -/* - * This is an example configuration file for ircd-hybrid - * - * Copyright (c) 2000-2015 ircd-hybrid development team - * - * $Id: reference.conf 6794 2015-11-17 20:51:46Z michael $ - * - * This version has been customized for Debian. - */ - -/* - * ######################################################################## - * IMPORTANT NOTE: - * - * auth {} blocks MUST be specified in order of precedence. The first one - * that matches a user will be used. So place spoofs first, then specials, - * then general access. - * ######################################################################## - * - * Shell style (#), C++ style (//) and C style comments are supported. - * - * Files may be included by either: - * .include "filename" - * .include - * - * Times/durations are written as: - * 12 hours 30 minutes 1 second - * - * Valid units of time: - * year, month, week, day, hour, minute, second - * - * Valid units of size: - * megabyte/mbyte/mb, kilobyte/kbyte/kb, byte - * - * Sizes and times may be singular or plural. - */ - - -/* - * serverinfo {}: contains information about the server - */ -serverinfo { - /* - * name: the name of this server. This cannot be changed at runtime. - */ - name = "hybrid8.debian.local"; - - /* - * sid: a server's unique ID. This is three characters long and must - * be in the form [0-9][A-Z0-9][A-Z0-9]. The first character must be - * a digit, followed by 2 alpha-numerical letters. - * - * NOTE: The letters must be capitalized. This cannot be changed at runtime. - * - * A sid is automatically generated at runtime, if you want to configure - * a specific sid, uncomment the following line. - */ -# sid = "0HY"; - - /* - * description: the description of the server. - */ - description = "ircd-hybrid 8.1-debian"; - - /* - * network_name, network_desc: the name and description of the network this - * server is on. Shown in the 005 reply and used with serverhiding. - */ - network_name = "debian"; - network_desc = "This is My Network"; - - /* - * hub: allow this server to act as a hub and have multiple servers - * connected to it. - */ - hub = no; - - /* - * vhost: the IP address to bind to when we connect outward to IPv4 servers. - * This should be an IPv4 address, or "*" for INADDR_ANY. - */ -# vhost = "192.0.2.1"; - - /* - * vhost6: the IP address to bind to when we connect outward to IPv6 servers. - * This should be an IPv6 address, or "*" for in6addr_any. - */ -# vhost6 = "2001:DB8::1"; - - /* - * default_max_clients: the default maximum number of clients allowed - * to connect. This can be changed from within IRC via /QUOTE SET MAX. - */ - default_max_clients = 512; - - /* - * max_nick_length: only applies to local clients. Must be in the - * range of 9 to 30. Default is 9 if nothing else is specified. - */ - max_nick_length = 15; - - /* - * max_topic_length: only applies to topics set by local clients. - * Must be in the range of 80 to 300. Default is 80 if nothing - * else is specified. - */ - max_topic_length = 300; - - /* - * rsa_private_key_file: the path to the file containing the - * RSA key. RSA keys with less than 2048 bits are no longer - * supported. - * - * Example commands to store a 2048 bit RSA key in rsa.key: - * - * openssl genrsa -out rsa.key 2048 - * chown . rsa.key - * chmod 0600 rsa.key - * - * Note to Debian users: the postinst script created this - * for you. - */ - rsa_private_key_file = "/etc/ircd-hybrid/key/ircd.key"; - - /* - * ssl_certificate_file: the path to the file containing our - * SSL certificate for encrypted client connection. - * - * This assumes your private RSA key is stored in rsa.key. You - * MUST have an RSA key in order to generate the certificate. - * - * Example command: - * - * openssl req -new -days 365 -x509 -key rsa.key -out cert.pem - * - * Please use the following values when generating the cert - * - * Organization Name: Network Name - * Organization Unit Name: unit.example.net - * Common Name: irc.example.net - * E-mail: email@example.net - */ - ssl_certificate_file = "/etc/ircd-hybrid/key/ircd.pem"; - - /* - * ssl_dh_param_file: path to the PEM encoded Diffie-Hellman - * parameter file. DH parameters are required when using - * ciphers with EDH (ephemeral Diffie-Hellman) key exchange. - * - * A DH parameter file can be created by running: - * - * openssl dhparam -out dhparam.pem 2048 - * - * Prime size must be at least 2048 bits. Further information - * regarding specific OpenSSL dhparam command-line options - * can be found in the OpenSSL manual. - */ -# ssl_dh_param_file = "/etc/ircd-hybrid/dhparam.pem"; - - /* - * ssl_dh_elliptic_curve: defines the curve to use for the - * Elliptic Curve Diffie-Hellman (ECDH) algorithm. - * Default is ANSI X9.62 prime256v1/secp256r1 if nothing else is specified. - * - * A list of supported curves by OpenSSL can be obtained by running: - * - * openssl ecparam -list_curves - */ -# ssl_dh_elliptic_curve = "secp521r1"; - - /* - * ssl_cipher_list: list of ciphers to support on _this_ server. - * Can be used to enforce specific ciphers for incoming SSL/TLS - * connections. If a client (which also includes incoming server connections) - * is not capable of using any of the ciphers listed here, the connection will - * simply be rejected. - * - * A list of supported ciphers by OpenSSL can be obtained by running: - * - * openssl ciphers -tls1 -v - * - * Multiple ciphers are separated by colons. The order of preference is - * from left to right. - */ -# ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA"; - - /* - * ssl_message_digest_algorithm: defines what cryptographic hash function - * to use for generating fingerprint hashes of X.509 certificates. - * Default is SHA-256 if nothing else is specified. - * - * A list of supported message digest algorithms by OpenSSL can be obtained by running: - * - * openssl list-message-digest-algorithms - */ -# ssl_message_digest_algorithm = "sha256"; -}; - -/* - * admin {}: contains administrative information about the server - */ -admin { - name = "Smurf target"; - description = "Main Server Administrator"; - email = ""; -}; - -/* - * class {}: contains information about classes for users - */ -class { - /* name: the name of the class. */ - name = "users"; - - /* - * ping_time: how often a client must reply to a PING from the - * server before they are dropped. - */ - ping_time = 90 seconds; - - /* - * number_per_ip: how many local users are allowed to connect - * from a single IP address (optional) - */ - number_per_ip = 2; - - /* - * max_local: how many local users are allowed to connect - * from a single ident@host (optional) - */ - max_local = 2; - - /* - * max_global: network-wide limit of users per ident@host (optional) - */ - max_global = 10; - - /* - * max_number: the maximum number of users allowed in this class (optional) - */ - max_number = 100; - - /* - * The following lines are optional and allow you to define - * how many users can connect from one /NN subnet. - */ - cidr_bitlen_ipv4 = 24; - cidr_bitlen_ipv6 = 120; - number_per_cidr = 16; - - /* - * sendq: the amount of data allowed in a client's send queue before - * they are dropped. - */ - sendq = 100 kbytes; - - /* - * recvq: the amount of data allowed in a client's receive queue before - * they are dropped for flooding. Defaults to 2560 if the chosen value - * isn't within the range of 512 to 8000. - */ - recvq = 2560 bytes; -}; - -class { - name = "opers"; - ping_time = 90 seconds; - number_per_ip = 10; - max_number = 100; - sendq = 100 kbytes; - - /* - * max_channels: maximum number of channels users in this class can join. - */ - max_channels = 60; - - /* - * min_idle: minimum idle time that is shown in WHOIS. - */ - min_idle = 3 hours; - - /* - * max_idle: maximum idle time that is shown in WHOIS. - */ - max_idle = 8 hours; - - /* - * flags: - * - * random_idle - a fake idle time is set randomly between - * min_idle and max_idle - * hide_idle_from_opers - the fake idle time will also be shown to operators - */ - flags = random_idle, hide_idle_from_opers; -}; - -class { - name = "server"; - ping_time = 90 seconds; - - /* - * connectfreq: only used in server classes. Specifies the delay - * between autoconnecting to servers. - */ - connectfreq = 5 minutes; - - /* max number: the number of servers to autoconnect to. */ - max_number = 1; - - /* sendq: servers need a higher sendq as they send more data. */ - sendq = 2 megabytes; -}; - -/* - * motd {}: Allows the display of a different MOTD to a client - * depending on its origin. Applies to local users only. - */ -motd { - /* - * mask: multiple mask entries are permitted. Mask can either be - * a class name or a hostname. CIDR is supported. - */ - mask = "*.at"; - mask = "*.de"; - mask = "*.ch"; - - /* - * file: path to the actual motd file. - */ - file = "/etc/ircd-hybrid/german.motd"; -}; - -/* - * listen {}: contains information about the ports ircd listens on - */ -listen { - /* - * port: the port to listen on. If no host is specified earlier in the - * listen {} block, it will listen on all available IP addresses. - * - * Ports are separated by commas; a range may be specified using ".." - */ - - /* port: listen on all available IP addresses, ports 6665 to 6669. */ - port = 6665 .. 6669; - - /* - * Listen on 192.0.2.2/6697 with SSL enabled and hidden from STATS P - * unless you are an administrator. - * - * NOTE: The "flags" directive always has to come before "port". - * - * Currently available flags are: - * - * ssl - Port may only accept TLS/SSL connections - * server - Only server connections are permitted - * hidden - Port is hidden from /stats P, unless you're an admin - */ - flags = hidden, ssl; - host = "127.0.0.1"; # change this! - port = 6697; - - /* - * host: set a specific IP address to listen on using the - * subsequent port definitions. This may be IPv4 or IPv6. - */ - #host = "192.0.2.3"; - #port = 7000, 7001; - - #host = "2001:DB8::2"; - #port = 7002; -}; - -/* - * auth {}: allow users to connect to the ircd - */ -auth { - /* - * user: the user@host allowed to connect. Multiple user - * lines are permitted within each auth {} block. - */ - user = "*@127.0.0.1"; - #user = "*test@2001:DB8:*"; - - /* password: an optional password that is required to use this block. */ - #password = "letmein"; - - /* - * encrypted: controls whether the auth password above has been - * encrypted. Default is 'no' if nothing else is specified. - */ - #encrypted = yes; - - /* - * spoof: fake the user's host to this. This is free-form, just do - * everyone a favor and don't abuse it. ('=' prefix on /stats I) - */ - spoof = "i.love.debian.org"; - - /* class: the class the user is placed in. */ - class = "opers"; - - /* - * need_password - don't allow users who haven't supplied the correct | ('&' prefix on /stats I if disabled) - * password to connect using another auth {} block - * need_ident - require the user to have identd to connect | ('+' prefix on /stats I) - * spoof_notice - enable spoofing notification to admins - * exceed_limit - allow a user to exceed class limits | ('>' prefix on /stats I) - * kline_exempt - exempt this user from k-lines | ('^' prefix on /stats I) - * xline_exempt - exempt this user from x-lines | ('!' prefix on /stats I) - * resv_exempt - exempt this user from resvs | ('$' prefix on /stats I) - * no_tilde - remove ~ from a user with no ident | ('-' prefix on /stats I) - * can_flood - allow this user to exceed flood limits | ('|' prefix on /stats I) - * webirc - enables WEBIRC authentication for web-based | ('<' prefix on /stats I) - * clients such as Mibbit - */ - flags = need_password, spoof_notice, exceed_limit, kline_exempt, - xline_exempt, resv_exempt, no_tilde, can_flood; -}; - -#auth { -# /* -# * redirserv, redirport: the server and port to redirect a user to. -# * A user does not have to obey the redirection; the ircd just -# * suggests an alternative server for them. -# */ -# redirserv = "server2.example.net"; -# redirport = 6667; -# -# user = "*@*.ch"; -# -# /* class: a class is required even though it is not used. */ -# class = "users"; -#}; - -auth { - user = "*@*"; - class = "users"; - flags = need_ident; -}; - -/* - * operator {}: defines ircd operators - */ -#operator { -# /* name: the name of the operator */ -# name = "sheep"; -# -# /* -# * user: the user@host required for this operator. Multiple user -# * lines are permitted within each operator {} block. -# */ -# user = "*sheep@192.0.2.0/26"; -# user = "*@192.0.2.240/28"; -# -# /* -# * password: the password required to oper. By default this will need -# * to be encrypted by using the provided mkpasswd tool. -# * The availability of various password hashing algorithms may vary -# * depending on the system's crypt(3) implementation. -# */ -# password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4"; -# -# /* -# * encrypted: controls whether the oper password above has been -# * encrypted. Default is 'yes' if nothing else is specified. -# */ -# encrypted = yes; -# -# /* -# * ssl_certificate_fingerprint: enhances security by additionally checking -# * the oper's client certificate fingerprint against the specified -# * fingerprint below. -# * -# * Hint: your users can use the following command to obtain a SHA-256 hash -# * of their ssl certificate: -# * -# * openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g' -# */ -## ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; -# -# /* -# * ssl_connection_required: client must be connected over SSL/TLS -# * in order to be able to use this operator {} block. -# * Default is 'no' if nothing else is specified. -# */ -# ssl_connection_required = no; -# -# /* class: the class the oper joins when they successfully OPER. */ -# class = "opers"; -# -# /* -# * whois: allows to override the default RPL_WHOISOPERATOR numeric -# * string shown in /whois. -# * This string is propagated to all servers on the network. -# */ -## whois = "is a Smurf Target (IRC Operator)"; -# /* -# * umodes: the default usermodes opers get when they /oper or /challenge. -# * If defined, it will override oper_umodes settings in general {}. -# * Available user modes: -# * -# * +b - bots - See bot and drone flooding notices -# * +c - cconn - Client connection/quit notices -# * +D - deaf - Don't receive channel messages -# * +d - debug - See debugging notices -# * +e - external - See remote server connection and split notices -# * +F - farconnect - Remote client connection/quit notices -# * +f - full - See auth {} block full notices -# * +G - softcallerid - Server Side Ignore for users not on your channels -# * +g - callerid - Server Side Ignore (for privmsgs etc) -# * +H - hidden - Hides operator status to other users -# * +i - invisible - Not shown in NAMES or WHO unless you share a channel -# * +j - rej - See rejected client notices -# * +k - skill - See server generated KILL messages -# * +l - locops - See LOCOPS messages -# * +n - nchange - See client nick changes -# * +p - hidechans - Hides channel list in WHOIS -# * +q - hideidle - Hides idle and signon time in WHOIS -# * +R - nononreg - Only receive private messages from registered clients -# * +s - servnotice - See general server notices -# * +u - unauth - See unauthorized client notices -# * +w - wallop - See server generated WALLOPS -# * +y - spy - See LINKS, STATS, TRACE notices etc. -# * +z - operwall - See oper generated WALLOPS -# */ -# umodes = locops, servnotice, wallop; -# -# /* -# * flags: controls the activities and commands an oper is -# * allowed to do on the server. All flags default to 'no'. -# * Available flags: -# * -# * admin - gives administrator privileges | ('A' flag) -# * close - allows CLOSE | ('B' flag) -# * connect - allows local CONNECT | ('C' flag) -# * connect:remote - allows remote CONNECT | ('D' flag) -# * die - allows DIE | ('E' flag) -# * dline - allows DLINE | ('F' flag) -# * globops - allows GLOBOPS | ('G' flag) -# * join:resv - allows to JOIN resv {} channels | ('H' flag) -# * kill - allows to KILL local clients | ('I' flag) -# * kill:remote - allows remote users to be /KILL'd | ('J' flag) -# * kline - allows KLINE | ('K' flag) -# * locops - allows LOCOPS | ('L' flag) -# * module - allows MODULE | ('M' flag) -# * nick:resv - allows to use NICK on resv {} nicks | ('N' flag) -# * opme - allows OPME | ('O' flag) -# * rehash - allows oper to REHASH config | ('P' flag) -# * remoteban - allows remote KLINE/UNKLINE | ('Q' flag) -# * restart - allows RESTART | ('R' flag) -# * resv - allows RESV | ('S' flag) -# * set - allows SET | ('T' flag) -# * squit - allows local SQUIT | ('U' flag) -# * squit:remote - allows remote SQUIT | ('V' flag) -# * undline - allows UNDLINE | ('W' flag) -# * unkline - allows UNKLINE | ('X' flag) -# * unresv - allows UNRESV | ('Y' flag) -# * unxline - allows UNXLINE | ('Z' flag) -# * wallops - allows WALLOPS | ('a' flag) -# * xline - allows XLINE | ('b' flag) -# */ -# flags = admin, connect, connect:remote, die, globops, kill, kill:remote, -# kline, module, rehash, restart, set, unkline, unxline, xline; -#}; - -/* - * connect {}: define a server to connect to - * IMPORTANT NOTE for Debian users: before you configure any links to - * other servers, change the sid earlier in this config file to a - * value which will be unique within the network. - */ -#connect { -# /* name: the name of the server. */ -# name = "uplink.example.net"; -# -# /* -# * host: the host or IP address to connect to. If a hostname is used it -# * must match the reverse DNS of the server. -# */ -# host = "192.0.2.4"; -# -# /* -# * vhost: the IP address to bind to when making outgoing connections to -# * servers. -# * serverinfo::vhost and serverinfo::vhost6 will be overridden -# * by this directive. -# */ -# vhost = "192.0.2.5"; -# -# /* -# * send_password, accept_password: the passwords to send and accept. -# * The remote server will have these passwords swapped. -# */ -# send_password = "password"; -# accept_password = "anotherpassword"; -# -# /* -# * encrypted: controls whether the accept_password above has been -# * encrypted. -# */ -# encrypted = no; -# -# /* port: the port to connect to this server on. */ -# port = 6666; -# -# /* -# * hub_mask: the mask of servers that this server may hub. Multiple -# * entries are permitted. -# */ -# hub_mask = "*"; -# -# /* -# * leaf_mask: the mask of servers this server may not hub. Multiple -# * entries are permitted. Useful for forbidding EU -> US -> EU routes. -# */ -## leaf_mask = "*.uk"; -# -# /* class: the class this server is in. */ -# class = "server"; -# -# /* -# * ssl_cipher_list: list of ciphers that the server we are connecting to -# * must support. If the server is not capable of using any of the ciphers -# * listed below, the connection will simply be rejected. -# * the connection will simply be rejected. -# * Can be used to enforce stronger ciphers, even though this option -# * is not necessarily required to establish a SSL/TLS connection. -# * -# * Multiple ciphers are separated by colons. The order of preference -# * is from left to right. -# */ -## ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA"; -# -# /* -# * ssl_certificate_fingerprint: enhances security by additionally checking -# * the server's client certificate fingerprint against the specified -# * fingerprint below. -# */ -## ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; -# -# /* -# * autoconn - controls whether we autoconnect to this server or not, -# * dependent on class limits. By default, this is disabled. -# * ssl - Initiates a TLS/SSL connection. -# */ -## flags = autoconn, ssl; -#}; - -#connect { -# name = "ipv6.example.net"; -# host = "2001:DB8::3"; -# send_password = "password"; -# accept_password = "password"; -# port = 6666; -# -# /* -# * aftype: controls whether the connection uses "ipv4" or "ipv6". -# * Default is ipv4. -# */ -# aftype = ipv6; -# class = "server"; -#}; - -/* - * cluster {}: servers that share klines/unkline/xline/unxline/resv/unresv/locops - * automatically - */ -#cluster { -# /* -# * name: the server to share with; this can take wildcards -# * -# * NOTE: only local actions will be clustered, meaning that if -# * the server receives a shared kline/unkline/etc, it -# * will not be propagated to clustered servers. -# * -# * Remote servers are not necessarily required to accept -# * clustered lines, they need a shared {} block for *THIS* -# * server in order to accept them. -# */ -# name = "*.example.net"; -# -# /* -# * type: list of what to share; options are as follows: -# * dline - share dlines -# * undline - share undlines -# * kline - share klines -# * unkline - share unklines -# * xline - share xlines -# * unxline - share unxlines -# * resv - share resvs -# * unresv - share unresvs -# * locops - share locops -# * all - share all of the above (default) -# */ -# type = kline, unkline, locops, xline, resv; -#}; - -/* - * shared {}: users that are allowed to remote kline - * - * NOTE: This can effectively be used for remote klines. - * Please note that there is no password authentication - * for users setting remote klines. You must also be - * /oper'd in order to issue a remote kline. - */ -shared { - /* - * name: the server the user must be connected to in order to set klines. - * If this is not specified, the user will be allowed to kline from all - * servers. - */ - name = "hybrid8.debian.local"; - - /* - * user: the user@host mask that is allowed to set klines. If this is - * not specified, all users on the server above will be allowed to set - * a remote kline. - */ - user = "root@localhost"; - - /* - * type: list of what to share, options are as follows: - * dline - allow oper/server to dline - * undline - allow oper/server to undline - * kline - allow oper/server to kline - * unkline - allow oper/server to unkline - * xline - allow oper/server to xline - * unxline - allow oper/server to unxline - * resv - allow oper/server to resv - * unresv - allow oper/server to unresv - * locops - allow oper/server to locops - only used for servers that cluster - * all - allow oper/server to do all of the above (default) - */ - type = kline, unkline, resv; -}; - -/* - * kill {}: users that are not allowed to connect - * Oper issued klines will be added to the specified kline database - */ -#kill { -# user = "bad@*.example.net"; -# reason = "Obviously hacked account"; -#}; - -/* - * deny {}: IP addresses that are not allowed to connect - * (before DNS/ident lookup) - * Oper issued dlines will be added to the specified dline database - */ -#deny { -# ip = "192.0.2.0/28"; -# reason = "Reconnecting vhosted bots"; -#}; - -/* - * exempt {}: IP addresses that are exempt from deny {} and Dlines - */ -#exempt { -# ip = "192.0.2.240/28"; -#}; - -/* - * resv {}: nicks and channels users may not use/join - */ -resv { mask = "clone*"; reason = "Clone bots"; }; -resv { mask = "Global"; reason = "Reserved for services"; }; -resv { mask = "ChanServ"; reason = "Reserved for services"; }; -resv { mask = "NickServ"; reason = "Reserved for services"; }; -resv { mask = "OperServ"; reason = "Reserved for services"; }; -resv { mask = "MemoServ"; reason = "Reserved for services"; }; -resv { mask = "BotServ"; reason = "Reserved for services"; }; -resv { mask = "HelpServ"; reason = "Reserved for services"; }; -resv { mask = "HostServ"; reason = "Reserved for services"; }; -resv { mask = "StatServ"; reason = "Reserved for services"; }; -resv { mask = "#*services*"; reason = "Reserved for services"; }; - -#resv { -# /* -# * mask: masks starting with a '#' are automatically considered -# * as channel name masks. -# */ -# mask = "#helsinki"; -# reason = "Channel is reserved for Finnish inhabitants"; -# -# /* -# * exempt: can be either a ISO 3166 alpha-2 two letter country -# * code, or a nick!user@host mask. CIDR is supported. Exempt -# * entries can be stacked. -# */ -# exempt = "FI"; -#}; - -/* - * gecos {}: used for banning users based on their "realname". - */ -#gecos { -# name = "*sex*"; -# reason = "Possible spambot"; -#}; - -#gecos { -# name = "sub7server"; -# reason = "Trojan drone"; -#}; - -/* - * service {}: specifies a server which may act as a network service - * - * NOTE: it is very important that every server on the network - * has the same service {} block. - */ -#service { -# name = "service.example.net"; -# name = "stats.example.net"; -#}; - -/* - * pseudo {}: adds pseudo/custom commands also known as service aliases - */ -#pseudo { -# /* command: the actual command/alias. */ -# command = "IDENTIFY"; -# -# /* prepend: optional text that can be prepended before the user's message. */ -# prepend = "IDENTIFY "; -# -# /* name: the service name, used for error messages. */ -# name = "NickServ"; -# -# /* target: the actual target where this message should be sent to. */ -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "CHANSERV"; -# name = "ChanServ"; -# target = "ChanServ@service.example.net"; -#}; -# -#pseudo { -# command = "CS"; -# name = "ChanServ"; -# target = "ChanServ@service.example.net"; -#}; -# -#pseudo { -# command = "NICKSERV"; -# name = "NickServ"; -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "NS"; -# name = "NickServ"; -# target = "NickServ@service.example.net"; -#}; -# -#pseudo { -# command = "MEMOSERV"; -# name = "MemoServ"; -# target = "MemoServ@service.example.net"; -#}; -# -#pseudo { -# command = "MS"; -# name = "MemoServ"; -# target = "MemoServ@service.example.net"; -#}; -# -#pseudo { -# command = "OPERSERV"; -# name = "OperServ"; -# target = "OperServ@service.example.net"; -#}; -# -#pseudo { -# command = "OS"; -# name = "OperServ"; -# target = "OperServ@service.example.net"; -#}; -# -#pseudo { -# command = "HOSTSERV"; -# name = "HostServ"; -# target = "HostServ@service.example.net"; -#}; -# -#pseudo { -# command = "HS"; -# name = "HostServ"; -# target = "HostServ@service.example.net"; -#}; -# -#pseudo { -# command = "BOTSERV"; -# name = "BotServ"; -# target = "BotServ@service.example.net"; -#}; -# -#pseudo { -# command = "BS"; -# name = "BotServ"; -# target = "BotServ@service.example.net"; -#}; - -/* - * channel {}: the channel block contains options pertaining to channels - */ -channel { - /* - * disable_fake_channels: this option, if set to 'yes', will - * disallow clients from creating or joining channels that have one - * of the following ASCII characters in their name: - * - * 2 | bold - * 3 | mirc color - * 15 | plain text - * 22 | reverse - * 29 | italic - * 31 | underline - * 160 | non-breaking space - */ - disable_fake_channels = yes; - - /* - * invite_client_count, invite_client_time: how many INVITE commands - * are permitted per client per invite_client_time. - */ - invite_client_count = 10; - invite_client_time = 5 minutes; - - /* - * invite_delay_channel: how often an INVITE to any specific channel - * is permitted, regardless of the user sending the INVITE. - */ - invite_delay_channel = 5 seconds; - - /* - * knock_client_count, knock_client_time: how many KNOCK commands - * are permitted per client per knock_client_time. - */ - knock_client_count = 1; - knock_client_time = 5 minutes; - - /* - * knock_delay_channel: how often a KNOCK to any specific channel - * is permitted, regardless of the user sending the KNOCK. - */ - knock_delay_channel = 1 minute; - - /* - * max_channels: the maximum number of channels a user can join/be on. - * This is a default value which can be overriden with class {} blocks. - */ - max_channels = 25; - - /* max_bans: maximum number of +b/e/I modes in a channel. */ - max_bans = 100; - - /* - * default_join_flood_count, default_join_flood_time: - * how many joins in how many seconds constitute a flood. Use 0 to disable. - * +b opers will be notified. These are only default values which can be - * changed via "/QUOTE SET JFLOODCOUNT" and "/QUOTE SET JFLOODTIME". - */ - default_join_flood_count = 18; - default_join_flood_time = 6 seconds; -}; - -/* - * serverhide {}: the serverhide block contains the options regarding - * to server hiding. For more information regarding server hiding, - * please see doc/serverhide.txt - */ -serverhide { - /* - * disable_remote_commands: disable users issuing commands - * on remote servers. - */ - disable_remote_commands = no; - - /* - * flatten_links: this option will show all servers in /links appear - * as though they are linked to this current server. - */ - flatten_links = no; - - /* - * flatten_links_delay: how often to update the links file when it is - * flattened. - */ - flatten_links_delay = 5 minutes; - - /* - * flatten_links_file: path to the flatten links cache file. - */ - flatten_links_file = "/var/cache/ircd-hybrid/links.txt"; - - /* - * hidden: hide this server from a /links output on servers that - * support it. This allows hub servers to be hidden etc. - */ - hidden = no; - - /* - * hide_servers: hide remote servernames everywhere and instead use - * hidden_name and network_desc. - */ - hide_servers = no; - - /* - * hide_services: define this if you want to hide the location of - * services servers that are specified in the service {} block. - */ - hide_services = no; - - /* - * hidden_name: use this as the servername users see if hide_servers = yes. - */ - hidden_name = "*.example.net"; - - /* - * hide_server_ips: if this is disabled, opers will be unable to see - * servers' IP addresses and will be shown a masked IP address; admins - * will be shown the real IP address. - * - * If this is enabled, nobody can see a server's IP address. - * *This is a kludge*: it has the side effect of hiding the IP addresses - * everywhere, including logfiles. - * - * We recommend you leave this disabled, and just take care with who you - * give administrator privileges to. - */ - hide_server_ips = no; -}; - -/* - * general {}: the general block contains many of the options that were once - * compiled in options in config.h - */ -general { - /* - * cycle_on_host_change: sends a fake QUIT/JOIN combination - * when services change the hostname of a specific client. - */ - cycle_on_host_change = yes; - - /* max_watch: maximum WATCH entries a client can have. */ - max_watch = 50; - - /* max_accept: maximum allowed /accept's for +g user mode. */ - max_accept = 50; - - /* - * dline_min_cidr: the minimum required length of a CIDR bitmask - * for IPv4 based D-lines. - */ - dline_min_cidr = 16; - - /* - * dline_min_cidr6: the minimum required length of a CIDR bitmask - * for IPv6 based D-lines. - */ - dline_min_cidr6 = 48; - - /* - * kline_min_cidr: the minimum required length of a CIDR bitmask - * for IPv4 based K-lines. - */ - kline_min_cidr = 16; - - /* - * kline_min_cidr6: the minimum required length of a CIDR bitmask - * for IPv6 based K-lines. - */ - kline_min_cidr6 = 48; - - /* - * invisible_on_connect: whether to automatically set user mode +i - * on connecting users. - */ - invisible_on_connect = yes; - - /* - * kill_chase_time_limit: KILL chasing is a feature whereby a KILL - * issued for a user who has recently changed nickname will be applied - * automatically to the new nick. kill_chase_time_limit is the maximum - * time following a nickname change that this chasing will apply. - */ - kill_chase_time_limit = 30 seconds; - - /* - * ignore_bogus_ts: ignore bogus timestamps from other servers. - * Yes, this will desync the network, but it will allow chanops - * to resync with a valid non TS 0. - * - * This should be enabled network wide, or not at all. - */ - ignore_bogus_ts = no; - - /* - * disable_auth: completely disable ident lookups; if you enable this, - * be careful of what you set need_ident to in your auth {} blocks. - */ - disable_auth = no; - - /* - * tkline_expire_notices: enables or disables temporary kline/xline - * expire notices. - */ - tkline_expire_notices = no; - - /* - * default_floodcount: the default value of floodcount that is configurable - * via /quote set floodcount. This is the number of lines a user may send - * to any other user/channel in one second. Set to 0 to disable. - */ - default_floodcount = 10; - - /* - * failed_oper_notice: send a notice to all opers on the server when - * someone tries to OPER and uses the wrong password, host or ident. - */ - failed_oper_notice = yes; - - /* - * dots_in_ident: the number of '.' characters permitted in an ident - * reply before the user is rejected. - */ - dots_in_ident = 2; - - /* - * min_nonwildcard: the minimum number of non-wildcard characters in - * k/d lines placed via the server. K-lines hand-placed are exempt from - * this limit. - * Wildcard characters: '.', ':', '*', '?' - */ - min_nonwildcard = 4; - - /* - * min_nonwildcard_simple: the minimum number of non-wildcard characters - * in gecos bans. Wildcard characters: '*', '?' - */ - min_nonwildcard_simple = 3; - - /* anti_nick_flood: enable the nickflood control code. */ - anti_nick_flood = yes; - - /* - * max_nick_changes, max_nick_time: the number of nick changes allowed in - * the specified period. - */ - max_nick_changes = 5; - max_nick_time = 20 seconds; - - /* - * away_count, away_time: how many AWAY command are permitted per - * client per away_time. - */ - away_count = 2; - away_time = 10 seconds; - - /* - * anti_spam_exit_message_time: the minimum time a user must be connected - * before custom quit messages are allowed. - */ - anti_spam_exit_message_time = 5 minutes; - - /* - * ts_warn_delta, ts_max_delta: the time delta allowed between server - * clocks before a warning is given, or before the link is dropped. - * All servers should run ntpdate/rdate to keep clocks in sync. - */ - ts_warn_delta = 3 seconds; - ts_max_delta = 15 seconds; - - /* - * warn_no_connect_block: warn opers about servers that try to connect - * but for which we don't have a connect {} block. Twits with - * misconfigured servers can become really annoying with this enabled. - */ - warn_no_connect_block = yes; - - /* - * stats_e_disabled: set this to 'yes' to disable "STATS e" for both - * operators and administrators. Doing so is a good idea in case - * there are any exempted (exempt {}) server IP addresses you don't - * want to see leaked. - */ - stats_e_disabled = no; - - /* stats_m_oper_only: make /stats m/M (messages) oper only. */ - stats_m_oper_only = yes; - - /* stats_o_oper only: make stats o (opers) oper only. */ - stats_o_oper_only = yes; - - /* stats_P_oper_only: make stats P (ports) oper only. */ - stats_P_oper_only = yes; - - /* stats_u_oper_only: make stats u (uptime) oper only. */ - stats_u_oper_only = no; - - /* - * stats_i_oper_only: make stats i (auth {}) oper only. Set to: - * yes - show users no auth {} blocks, made oper only - * masked - show users the first matching auth {} block - * no - show users all auth {} blocks - */ - stats_i_oper_only = yes; - - /* - * stats_k_oper_only: make stats k/K (klines) oper only. Set to: - * yes - show users no klines - * masked - show users the first matching kline - * no - show users all klines - */ - stats_k_oper_only = yes; - - /* - * caller_id_wait: time between notifying a +g user that somebody - * is messaging them. - */ - caller_id_wait = 1 minute; - - /* - * opers_bypass_callerid: allows operators to bypass +g and message - * anyone who has it set. - */ - opers_bypass_callerid = no; - - /* - * pace_wait_simple: minimum time required between use of less - * intensive commands - * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS) - */ - pace_wait_simple = 1 second; - - /* - * pace_wait: minimum time required between use of more intensive commands - * (INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS) - */ - pace_wait = 10 seconds; - - /* - * short_motd: send clients a notice telling them to read the MOTD - * instead of forcing an MOTD to clients who may simply ignore it. - */ - short_motd = no; - - /* - * ping_cookie: require clients to respond exactly to a PING command, - * can help block certain types of drones and FTP PASV mode spoofing. - */ - ping_cookie = no; - - /* no_oper_flood: increase flood limits for opers. */ - no_oper_flood = yes; - - /* - * max_targets: the maximum number of targets in a single - * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited. - */ - max_targets = 4; - - /* - * user modes configurable: a list of user modes for the options below - * - * +b - bots - See bot and drone flooding notices - * +c - cconn - Client connection/quit notices - * +D - deaf - Don't receive channel messages - * +d - debug - See debugging notices - * +e - external - See remote server connection and split notices - * +F - farconnect - Remote client connection/quit notices - * +f - full - See auth {} block full notices - * +G - softcallerid - Server Side Ignore for users not on your channels - * +g - callerid - Server Side Ignore (for privmsgs etc) - * +H - hidden - Hides operator status to other users - * +i - invisible - Not shown in NAMES or WHO unless you share a channel - * +j - rej - See rejected client notices - * +k - skill - See server generated KILL messages - * +l - locops - See LOCOPS messages - * +n - nchange - See client nick changes - * +p - hidechans - Hides channel list in WHOIS - * +q - hideidle - Hides idle and signon time in WHOIS - * +R - nononreg - Only receive private messages from registered clients - * +s - servnotice - See general server notices - * +u - unauth - See unauthorized client notices - * +w - wallop - See server generated WALLOPS - * +y - spy - See LINKS, STATS, TRACE notices etc. - */ - - /* oper_only_umodes: user modes only operators may set. */ - oper_only_umodes = bots, cconn, debug, external, farconnect, full, hidden, - locops, nchange, rej, skill, spy, unauth; - - /* oper_umodes: default user modes operators get when they successfully OPER. */ - oper_umodes = bots, locops, servnotice, wallop; - - /* - * throttle_count: the maximum number of connections from the same - * IP address allowed in throttle_time duration. - */ - throttle_count = 1; - - /* - * throttle_time: the minimum amount of time required between - * connections from the same IP address. exempt {} blocks are - * excluded from this throttling. - * Offers protection against flooders who reconnect quickly. - * Set to 0 to disable. - */ - throttle_time = 2 seconds; -}; - -modules { - /* - * path: other paths to search for modules specified below - * and in "/module load". - */ - path = "/usr/lib/ircd-hybrid/modules"; -# path = "/usr/local/lib/ircd-hybrid/modules/extra"; - path = "/usr/lib/ircd-hybrid/modules/autoload"; - - /* module: the name of a module to load on startup/rehash. */ -# module = "some_module.la"; -}; - -/* - * log {}: contains information about logfiles. - */ -log { - /* Do you want to enable logging to ircd.log? */ - use_logging = yes; - - file { - type = oper; - name = "/var/log/ircd/ircd-hybrid-oper.log"; - size = 10 megabytes; - }; - - file { - type = user; - name = "/var/log/ircd/ircd-hybrid-user.log"; - size = 10 megabytes; - }; - - file { - type = kill; - name = "/var/log/ircd/ircd-hybrid-kill.log"; - size = 10 megabytes; - }; - - file { - type = kline; - name = "/var/log/ircd/ircd-hybrid-kline.log"; - size = 10 megabytes; - }; - - file { - type = dline; - name = "/var/log/ircd/ircd-hybrid-dline.log"; - size = 10 megabytes; - }; - - file { - type = xline; - name = "/var/log/ircd/ircd-hybrid-xline.log"; - size = 10 megabytes; - }; - - file { - type = resv; - name = "/var/log/ircd/ircd-hybrid-resv.log"; - size = 10 megabytes; - }; - - file { - type = debug; - name = "/var/log/ircd/ircd-hybrid-debug.log"; - size = 10 megabytes; - }; -}; diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e +. /usr/share/debconf/confmodule + +if dpkg --compare-versions "$2" lt-nl "1:8.0.4.dfsg.1-1"; then + db_input high ircd-hybrid/upgrade_secure_links_warn || true + db_go + db_get ircd-hybrid/upgrade_secure_links_warn + if [ "$RET" = "false" ]; then + echo "Aborting install"; + db_fset ircd-hybrid/upgrade_secure_links_warn seen false + exit 1 + fi +fi + +if [ "$1" = "configure" ]; then + if dpkg --compare-versions "$2" ge "1:7.2.2-1"; then + db_input medium ircd-hybrid/restart_on_upgrade || true + fi +fi +db_go + +exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config.nossl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config.nossl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config.nossl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config.nossl 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e -. /usr/share/debconf/confmodule - -if dpkg --compare-versions "$2" lt-nl "1:8.0.9.dfsg.1-2"; then - db_input high ircd-hybrid/upgrade_no_services_warn || true - db_go - db_get ircd-hybrid/upgrade_no_services_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_no_services_warn seen false - exit 1 - fi -fi - -if test "${2#*ssl}" != "$2"; then - db_input high ircd-hybrid/upgrade_to_nossl_warn || true - db_go - db_get ircd-hybrid/upgrade_to_nossl_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_to_nossl_warn seen false - exit 1 - fi -fi - -if [ "$1" = "configure" ]; then - if dpkg --compare-versions "$2" ge "1:7.2.2-1"; then - db_input medium ircd-hybrid/restart_on_upgrade || true - fi -fi -db_go - -exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config.ssl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config.ssl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.config.ssl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.config.ssl 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e -. /usr/share/debconf/confmodule - -if dpkg --compare-versions "$2" lt-nl "1:8.0.4.dfsg.1-1"; then - db_input high ircd-hybrid/upgrade_secure_links_warn || true - db_go - db_get ircd-hybrid/upgrade_secure_links_warn - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_secure_links_warn seen false - exit 1 - fi -fi - -if dpkg --compare-versions "$2" lt-nl "1:8.0.9.dfsg.1-2"; then - db_input high ircd-hybrid/upgrade_no_services_warn || true - db_go - db_get ircd-hybrid/upgrade_no_services_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_no_services_warn seen false - exit 1 - fi -fi - -if [ "$1" = "configure" ]; then - if dpkg --compare-versions "$2" ge "1:7.2.2-1"; then - db_input medium ircd-hybrid/restart_on_upgrade || true - fi -fi -db_go - -exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.docs ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.docs --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.docs 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.docs 2016-04-23 12:00:42.000000000 +0000 @@ -1,3 +1,2 @@ AUTHORS doc/* -debian/README.SSL diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,97 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + +# Automatically added by dh_installinit, edited for use with debconf +# Not added anymore due to dh_installinit -n, so we manage it manually. +if [ -x "/etc/init.d/ircd-hybrid" ]; then + update-rc.d ircd-hybrid defaults >/dev/null + + if [ "$1" = "configure" ]; then + if dpkg --compare-versions "$2" le "1:7.2.2-1"; then + RET="true" + else + if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_get ircd-hybrid/restart_on_upgrade + else + RET="true" + fi + fi + fi +fi +# End automatically added section + +if [ "$1" = configure ]; then + +if [ ! -d /etc/ircd-hybrid/key ]; then + mkdir /etc/ircd-hybrid/key; +fi + +if [ -f /etc/ircd-hybrid/key/ircd.key ]; then + echo "You already have an SSL private key" +else + echo "ircd.key not found in /etc/ircd-hybrid!" + echo "Generating SSL private key ..." + openssl genrsa -out /etc/ircd-hybrid/key/ircd.key 2048 + chown -R irc:irc /etc/ircd-hybrid/key + echo "Correcting permissions..." + chmod 0600 /etc/ircd-hybrid/key/ircd.key + echo "ircd.key generated in /etc/ircd-hybrid/key/" +fi + +if [ ! -f /etc/ircd-hybrid/key/ircd.pem ]; then + echo "Generating ircd.pem for SSL client connections... (365 days)" + openssl req -config /etc/ircd-hybrid/cert.cnf -new -x509 -key /etc/ircd-hybrid/key/ircd.key -out /etc/ircd-hybrid/key/ircd.pem -days 365 + echo "See README.Debian about personalizing the data in ircd.pem." +fi + +# These directories may have been created before, but we need to make them +# owned by irc. Or the initscript will get owned. If it's already this +# way, this operation makes no difference. +# As of 1:8.2.8+dfsg.1-1 /var/lib/ircd-hybrid is created +# and /etc/ircd-hybrid becomes root-owned + mkdir -p /var/lib/ircd-hybrid + chown irc:irc /var/log/ircd /var/lib/ircd-hybrid + chown root:irc /etc/ircd-hybrid + chmod 750 /etc/ircd-hybrid + chmod 770 /var/lib/ircd-hybrid + chown root:irc /etc/ircd-hybrid/ircd.conf + chmod 640 /etc/ircd-hybrid/ircd.conf + + if [ "$RET" = "true" ]; then + invoke-rc.d ircd-hybrid stop || exit $? + if ls /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt > /dev/null 2>&1; then + sleep 3 + if invoke-rc.d ircd-hybrid status > /dev/null 2>&1; then + echo "ircd-hybrid is still running, so I can't automatically" + echo "migrate files to /var/lib/ircd-hybrid. You should fix" + echo "this up manually." + exit 1 + else + for file in /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt; do + cp -p $file /var/lib/ircd-hybrid; + mv $file $file.bak + done + echo "I have migrated data files from /etc/ircd-hybrid to /var/lib/ircd-hybrid" + echo "If you are happy that everything is okay, you can delete the backups in /etc/ircd-hybrid" + fi + fi + invoke-rc.d ircd-hybrid start || exit $? + else + echo "I have not stopped or restarted the ircd-hybrid daemon." + echo "You should do this yourself whenever you're ready." + if ls /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt > /dev/null 2>&1; then + echo "Type \`\`invoke-rc.d ircd-hybrid stop, then move the following" + echo "files to /var/lib/ircd-hybrid:" + echo /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt + echo "Then type \`\`invoke-rc.d ircd-hybrid start" + else + echo "Type \`\`invoke-rc.d ircd-hybrid restart''." + fi + fi +fi + +#DEBHELPER# diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst.in ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst.in --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst.in 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -# Automatically added by dh_installinit, edited for use with debconf -# Not added anymore due to dh_installinit -n, so we manage it manually. -if [ -x "/etc/init.d/ircd-hybrid" ]; then - update-rc.d ircd-hybrid defaults >/dev/null - - if [ "$1" = "configure" ]; then - if dpkg --compare-versions "$2" le "1:7.2.2-1"; then - RET="true" - else - if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_get ircd-hybrid/restart_on_upgrade - else - RET="true" - fi - fi - fi -fi -# End automatically added section - -if [ "$1" = configure ]; then - -@SSL_WORK@ - -# These directories may have been created before, but we need to make them -# owned by irc. Or the initscript will get owned. If it's already this -# way, this operation makes no difference. -# As of 1:8.2.8+dfsg.1-1 /var/lib/ircd-hybrid is created -# and /etc/ircd-hybrid becomes root-owned - mkdir -p /var/lib/ircd-hybrid - chown irc:irc /var/log/ircd /var/lib/ircd-hybrid - chown root:irc /etc/ircd-hybrid - chmod 750 /etc/ircd-hybrid - chmod 770 /var/lib/ircd-hybrid - chown root:irc /etc/ircd-hybrid/ircd.conf - chmod 640 /etc/ircd-hybrid/ircd.conf - - if [ "$RET" = "true" ]; then - invoke-rc.d ircd-hybrid stop || exit $? - if ls /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt > /dev/null 2>&1; then - sleep 3 - if invoke-rc.d ircd-hybrid status > /dev/null 2>&1; then - echo "ircd-hybrid is still running, so I can't automatically" - echo "migrate files to /var/lib/ircd-hybrid. You should fix" - echo "this up manually." - exit 1 - else - for file in /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt; do - cp -p $file /var/lib/ircd-hybrid; - mv $file $file.bak - done - echo "I have migrated data files from /etc/ircd-hybrid to /var/lib/ircd-hybrid" - echo "If you are happy that everything is okay, you can delete the backups in /etc/ircd-hybrid" - fi - fi - invoke-rc.d ircd-hybrid start || exit $? - else - echo "I have not stopped or restarted the ircd-hybrid daemon." - echo "You should do this yourself whenever you're ready." - if ls /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt > /dev/null 2>&1; then - echo "Type \`\`invoke-rc.d ircd-hybrid stop, then move the following" - echo "files to /var/lib/ircd-hybrid:" - echo /etc/ircd-hybrid/*.db /etc/ircd-hybrid/links.txt - echo "Then type \`\`invoke-rc.d ircd-hybrid start" - else - echo "Type \`\`invoke-rc.d ircd-hybrid restart''." - fi - fi -fi - -# Reset this question in case the user installs the SSL version and then -# tries the non-SSL version again -db_fset ircd-hybrid/upgrade_to_nossl_warn seen false - -#DEBHELPER# diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst.ssl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst.ssl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postinst.ssl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postinst.ssl 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -if [ ! -d /etc/ircd-hybrid/key ]; then mkdir /etc/ircd-hybrid/key; fi \ -\ -if [ -f /etc/ircd-hybrid/key/ircd.key ] \&\& [ -f /etc/ircd-hybrid/key/ircd.pub ] \ -then \ - echo "You already have ircd.key and ircd.pub" \ -else \ - echo "ircd.key and ircd.pub not found in /etc/ircd-hybrid!" \ - echo "Generating ircd.key for CRYPTLINK connections..." \ - openssl genrsa -out /etc/ircd-hybrid/key/ircd.key 2048 \ - echo "Generating ircd.pub (public key to give to servers)" \ - openssl rsa -in /etc/ircd-hybrid/key/ircd.key -pubout -out /etc/ircd-hybrid/key/ircd.pub \ - chown -R irc:irc /etc/ircd-hybrid/key \ - echo "Correcting permissions..." \ - chmod 0600 /etc/ircd-hybrid/key/ircd.key \ - chmod 0644 /etc/ircd-hybrid/key/ircd.pub \ - echo "ircd.key and ircd.pub generated in /etc/ircd-hybrid/key/" \ -fi \ -\ -if [ ! -f /etc/ircd-hybrid/key/ircd.pem ]; then \ - echo "Generating ircd.pem for SSL client connections... (365 days)" \ - openssl req -config /etc/ircd-hybrid/cert.cnf -new -x509 -key /etc/ircd-hybrid/key/ircd.key -out /etc/ircd-hybrid/key/ircd.pem -days 365 \ - echo "See README.Debian about personalizing the data in ircd.pem." \ -fi diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rm -rf /etc/ircd-hybrid/ircd.conf \ + /etc/ircd-hybrid/ircd.motd \ + /var/lib/ircd-hybrid + + rm -f /etc/ircd-hybrid/key/ircd.key \ + /etc/ircd-hybrid/key/ircd.pub \ + /etc/ircd-hybrid/key/ircd.pem + + if [ -d "/etc/ircd-hybrid/key" ]; then + rmdir --ignore-fail-on-non-empty /etc/ircd-hybrid/key + fi + + if [ -d "/etc/ircd-hybrid" ]; then + rmdir --ignore-fail-on-non-empty /etc/ircd-hybrid + fi + + rm -f /var/log/ircd/ircd-hybrid.log* /var/run/ircd/ircd-hybrid.pid + + if [ -d "/var/log/ircd" ]; then + rmdir --ignore-fail-on-non-empty /var/log/ircd + fi + + if [ -d "/var/run/ircd" ]; then + rmdir --ignore-fail-on-non-empty /var/run/ircd + fi + +# Not added anymore with dh_installinit -n, so we manage it manually. + update-rc.d ircd-hybrid remove >/dev/null || exit $? +fi + +#DEBHELPER# diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm.in ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm.in --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm.in 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ]; then - rm -rf /etc/ircd-hybrid/ircd.conf \ - /etc/ircd-hybrid/ircd.motd \ - /var/lib/ircd-hybrid - - @SSL_REMOVE@ - - if [ -d "/etc/ircd-hybrid" ]; then - rmdir --ignore-fail-on-non-empty /etc/ircd-hybrid - fi - - rm -f /var/log/ircd/ircd-hybrid.log* /var/run/ircd/ircd-hybrid.pid - - if [ -d "/var/log/ircd" ]; then - rmdir --ignore-fail-on-non-empty /var/log/ircd - fi - - if [ -d "/var/run/ircd" ]; then - rmdir --ignore-fail-on-non-empty /var/run/ircd - fi - -# Not added anymore with dh_installinit -n, so we manage it manually. - update-rc.d ircd-hybrid remove >/dev/null || exit $? -fi - -#DEBHELPER# diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm.ssl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm.ssl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.postrm.ssl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.postrm.ssl 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - rm -f /etc/ircd-hybrid/key/ircd.key /etc/ircd-hybrid/key/ircd.pub /etc/ircd-hybrid/key/ircd.pem \ -\ - if [ -d "/etc/ircd-hybrid/key" ]; then \ - rmdir --ignore-fail-on-non-empty /etc/ircd-hybrid/key \ - fi diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,40 @@ +#!/bin/sh + +. /usr/share/debconf/confmodule +set -e + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt "1:8.0.4.dfsg.1-1"; then + db_get ircd-hybrid/upgrade_secure_links_warn || true + if [ "$RET" = "false" ]; then + echo "Aborting install"; + db_fset ircd-hybrid/upgrade_secure_links_warn seen false + exit 1 + fi + fi + if dpkg --compare-versions "$2" lt "1:8.0.9.dfsg.1-2"; then + db_get ircd-hybrid/upgrade_no_services_warn || true + if [ "$RET" = "false" ]; then + echo "Aborting install"; + db_fset ircd-hybrid/upgrade_no_services_warn seen false + exit 1 + fi + fi + ;; + + install) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst.nossl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst.nossl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst.nossl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst.nossl 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/bin/sh - -. /usr/share/debconf/confmodule -set -e - -case "$1" in - upgrade) - if dpkg --compare-versions "$2" lt "1:8.0.9.dfsg.1-2"; then - db_get ircd-hybrid/upgrade_no_services_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_no_services_warn seen false - exit 1 - fi - fi - ;; - - install) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst.ssl ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst.ssl --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.preinst.ssl 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.preinst.ssl 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -#!/bin/sh - -. /usr/share/debconf/confmodule -set -e - -case "$1" in - upgrade) - if dpkg --compare-versions "$2" lt "1:8.0.4.dfsg.1-1"; then - db_get ircd-hybrid/upgrade_secure_links_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_secure_links_warn seen false - exit 1 - fi - fi - if dpkg --compare-versions "$2" lt "1:8.0.9.dfsg.1-2"; then - db_get ircd-hybrid/upgrade_no_services_warn || true - if [ "$RET" = "false" ]; then - echo "Aborting install"; - db_fset ircd-hybrid/upgrade_no_services_warn seen false - exit 1 - fi - fi - ;; - - install) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.README.Debian ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.README.Debian --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.README.Debian 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.README.Debian 2016-04-23 12:00:42.000000000 +0000 @@ -4,10 +4,6 @@ SSL Certificate =============== -Important note: ircd-hybrid is not compiled with SSL support by default; -for information about how to produce an SSL-enabled build, and why support -is not enabled by default, please see /usr/share/doc/ircd-hybrid/README.SSL. - For the sake of simplicity a SSL certificate (for use with client SSL connections) is generated with rather bogus info during after ircd-hybrid installs. If you would like to change the info in the certificate, edit diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.templates ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.templates --- ircd-hybrid-8.2.12+dfsg.1/debian/ircd-hybrid.templates 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/ircd-hybrid.templates 2016-04-23 12:00:42.000000000 +0000 @@ -33,23 +33,3 @@ server, you should plan to either upgrade all servers in lock-step, or temporarily configure non-cryptlink server links, to ensure the continuity of your IRC links. - -Template: ircd-hybrid/upgrade_no_services_warn -Type: boolean -Default: true -_Description: Upgrade ircd-hybrid to version without compatible services? - The 8.x version of ircd-hybrid includes a change to the way services are - supported, losing compatibility with hybserv. - . - The recommended services daemon for Hybrid 8 is Anope, for which no - package is available yet, although one is planned. - -Template: ircd-hybrid/upgrade_to_nossl_warn -Type: boolean -Default: true -_Description: Upgrade ircd-hybrid to version without SSL support? - The currently installed version of this package is one with "ssl" in the - version number, which suggests that it is a locally compiled package with - SSL support. If this is the case, you probably don't want to install this - package but instead rebuild the SSL version following the instructions in - /usr/share/doc/ircd-hybrid/README.SSL. diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/NEWS ircd-hybrid-8.2.17+dfsg.1/debian/NEWS --- ircd-hybrid-8.2.12+dfsg.1/debian/NEWS 2016-01-17 19:04:10.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/NEWS 2016-04-23 12:00:42.000000000 +0000 @@ -1,3 +1,14 @@ +ircd-hybrid (1:8.2.16+dfsg.1-1) unstable; urgency=medium + + This package now builds SSL/TLS support in by default, thanks to the + new upstream support for GnuTLS. + + Since the release of Anope 2, Anope has been the recommended services + for ircd-hybrid. This is now (as of May 2015) in Debian, meaning there + is out of the box services support for ircd-hybrid in Debian again. + + -- Dominic Hargreaves Sun, 03 Apr 2016 12:38:50 +0100 + ircd-hybrid (1:8.2.12+dfsg.1-1) unstable; urgency=medium Character case mapping is 'ascii' now. It is recommended diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/patches/fhs_comply.patch ircd-hybrid-8.2.17+dfsg.1/debian/patches/fhs_comply.patch --- ircd-hybrid-8.2.12+dfsg.1/debian/patches/fhs_comply.patch 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/patches/fhs_comply.patch 2016-04-23 12:00:43.000000000 +0000 @@ -1,4 +1,4 @@ -From 70ca23474007447eabb61a016f6fca50322ea808 Mon Sep 17 00:00:00 2001 +From a5c34434daa298805c96f8a118ca5288799987d5 Mon Sep 17 00:00:00 2001 From: Dominic Hargreaves Date: Sat, 12 Jan 2013 00:24:56 +0000 Subject: Adjust paths for Debian/FHS @@ -48,7 +48,7 @@ /* * This file is included to supply default values for things which diff --git a/src/Makefile.am b/src/Makefile.am -index 832bc84..6ca38be 100644 +index 9acb834..dbbc612 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/patches/no_ltdl_build.patch ircd-hybrid-8.2.17+dfsg.1/debian/patches/no_ltdl_build.patch --- ircd-hybrid-8.2.12+dfsg.1/debian/patches/no_ltdl_build.patch 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/patches/no_ltdl_build.patch 2016-04-23 12:00:43.000000000 +0000 @@ -1,4 +1,4 @@ -From 4f6ca62fd10604fbb9fc60aedaaf56969490e233 Mon Sep 17 00:00:00 2001 +From 8aa0e2c5ebd304c150d713241d0278868057218f Mon Sep 17 00:00:00 2001 From: Dominic Hargreaves Date: Sun, 8 Sep 2013 10:58:57 +0100 Subject: Don't build bundled libltdl diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/patches/patchlevel_debian.patch ircd-hybrid-8.2.17+dfsg.1/debian/patches/patchlevel_debian.patch --- ircd-hybrid-8.2.12+dfsg.1/debian/patches/patchlevel_debian.patch 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/patches/patchlevel_debian.patch 2016-04-23 12:00:43.000000000 +0000 @@ -1,4 +1,4 @@ -From c2133410c3bc8273722618b5c31fb1a2909d933f Mon Sep 17 00:00:00 2001 +From 85183ccaac1bb466d09105620737d1263498b7d2 Mon Sep 17 00:00:00 2001 From: Dominic Hargreaves Date: Sun, 30 Dec 2012 20:36:40 +0000 Subject: Patchlevel for Debian package. @@ -11,14 +11,14 @@ 1 file changed, 1 insertion(+) diff --git a/include/patchlevel.h b/include/patchlevel.h -index 8a4a317..ab3027a 100644 +index 586519c..c44cafc 100644 --- a/include/patchlevel.h +++ b/include/patchlevel.h @@ -24,6 +24,7 @@ - * \version $Id: patchlevel.h 7038 2016-01-05 14:40:00Z michael $ + * \version $Id: patchlevel.h 7519 2016-03-30 18:26:55Z michael $ */ +#include "patchlevel-debian.h" #ifndef PATCHLEVEL - #define PATCHLEVEL "hybrid-8.2.12" + #define PATCHLEVEL "hybrid-8.2.17" #endif diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/patches/reproducible_date_time.patch ircd-hybrid-8.2.17+dfsg.1/debian/patches/reproducible_date_time.patch --- ircd-hybrid-8.2.12+dfsg.1/debian/patches/reproducible_date_time.patch 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/patches/reproducible_date_time.patch 2016-04-23 12:00:43.000000000 +0000 @@ -1,4 +1,4 @@ -From fdb826ac4ba165b6f81b5c0374b7f8f6748c21a0 Mon Sep 17 00:00:00 2001 +From 74c0350fe0f05c06f82dc812cc3f8508dbe41832 Mon Sep 17 00:00:00 2001 From: Dominic Hargreaves Date: Wed, 2 Sep 2015 22:15:22 +0100 Subject: Allow the build date/time to be overridden by BUILD_DATE @@ -22,7 +22,7 @@ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 6ca38be..9d6c117 100644 +index dbbc612..10295e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,9 +2,11 @@ AUTOMAKE_OPTIONS = foreign @@ -39,10 +39,10 @@ ircd_LDADD = $(LIBLTDL) ircd_DEPENDENCIES = $(LTDLDEPS) diff --git a/src/user.c b/src/user.c -index c91404e..fcc5ab6 100644 +index 1f17e62..9dc6bed 100644 --- a/src/user.c +++ b/src/user.c -@@ -254,7 +254,11 @@ introduce_client(struct Client *source_p) +@@ -256,7 +256,11 @@ introduce_client(struct Client *source_p) static void user_welcome(struct Client *source_p) { @@ -52,5 +52,5 @@ static const char built_date[] = __DATE__ " at " __TIME__; +#endif - #ifdef HAVE_LIBCRYPTO if (HasFlag(source_p, FLAGS_SSL)) + { diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/cs.po ircd-hybrid-8.2.17+dfsg.1/debian/po/cs.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/cs.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/cs.po 2016-04-23 12:00:42.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-09 09:21+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -91,101 +91,3 @@ "Máte-li na tomto serveru nakonfigurované nÄ›jaké bezpeÄné serverové odkazy " "(cryptlink), mÄ›li byste pro zachování kontinuity IRC odkazů buÄ aktualizovat " "vÅ¡echny servery najednou, nebo doÄasnÄ› nastavit neÅ¡ifrované odkazy." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Aktualizovat ircd-hybrid na verzi bez kompatibilních služeb?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"ircd-hybrid ve verzi 8.x zmÄ›nil způsob, jakým podporuje služby, Äímž ztratil " -"kompatibilitu s hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"DoporuÄeným daemonem pro služby Hybrid 8 je Anope, pro který zatím " -"neexistuje .deb balík, i když je v plánu." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Aktualizovat ircd-hybrid na verzi bez podpory SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"MomentálnÄ› nainstalovaná verze tohoto balíku obsahuje v Äíslu verze Å™etÄ›zec " -"„ssl“, což naznaÄuje, že se jedná o lokálnÄ› sestavený balík s podporou SSL. " -"Pokud tomu tak skuteÄnÄ› je, nejspíš nebudete chtít instalovat tento balík " -"a budete si chtít sestavit verzi s podporou SSL, jak je popsáno v souboru " -"/usr/share/doc/ircd-hybrid/README.SSL." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "VeÅ¡kerá podpora SSL je nyní vypnutá. PokraÄovat?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Kvůli licenÄním problémům již není ircd-hybrid sestaven s podporou " -#~ "OpenSSL. To bude vyÅ™eÅ¡eno v příští verzi, až nÄ›kdo pÅ™epíše SSL vrstvu s " -#~ "podporou GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Pokud nÄ›který z vaÅ¡ich stávajících serverů využívá cryptlinks, podívejte " -#~ "se do souboru /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt, kde naleznete " -#~ "jednoduchý návod, jak sestavit ircd-hybrid s podporou SSL." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "NÄ›kdy to není žádoucí, například pokud provádíte aktualizaci a nahráváte " -#~ "moduly IRCd za bÄ›hu. Pokud server nerestartujete, nejspíše se dostanete " -#~ "do problémů." - -#~ msgid "ircd-hybrid should not configure servlink_path variable" -#~ msgstr "ircd-hybrid by nemÄ›l nastavovat promÄ›nnou servlink_path" - -#~ msgid "" -#~ "If your possibly existing ircd.conf that you may wish to import contains " -#~ "a servlink_path directive, either change it to:" -#~ msgstr "" -#~ "Pokud váš stávající konfiguraÄní soubor ircd.conf obsahuje promÄ›nnou " -#~ "servlink_path, buÄ ji změňte na:" - -#~ msgid "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" -#~ msgstr "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" - -#~ msgid "" -#~ "or simply remove the entire line as the correct path is hardcoded into " -#~ "the ircd." -#~ msgstr "" -#~ "nebo jednoduÅ¡e celý řádek odstraňte, protože správná cesta je zadrátovaná " -#~ "přímo v ircd." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/da.po ircd-hybrid-8.2.17+dfsg.1/debian/po/da.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/da.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/da.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-09 05:26+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -84,52 +84,3 @@ "med denne server, sÃ¥ bør du planlægge enten at opgradere alle servere i lock-" "step, eller midlertidig konfigurere ikke-cryptlink-serverhenvisninger, for " "at sikre fortsat funktion for dine IRC-henvisninger." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Opgrader ircd-hybrid til version uden kompatible tjenester?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"8.x-versionen af ircd-hybrid inkluderer en ændring af mÃ¥den tjenester " -"understøttes, hvilket medfører tab af kompatibilitet med hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Den anbefalede tjenestedæmon for Hybrid 8 er Anope, som dog endnu ikke har " -"en pakke tilgængelig, selvom en er planlagt." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Opgrader ircd-hybrid til version uden SSL-understøttelse?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Den installerede version af denne pakke er en med »ssl« i versionsnummeret, " -"hvilket antyder, at det er en lokalt kompileret pakke med SSL-understøttelse. " -"Hvis dette er tilfældet, sÃ¥ ønsker du sikkert ikke at installere denne " -"pakke men i stedet genbygge SSL-versionen ved at følge instruktionerne " -"i /usr/share/doc/ircd-hybrid/README.SSL." - diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/de.po ircd-hybrid-8.2.17+dfsg.1/debian/po/de.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/de.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/de.po 2016-04-23 12:00:42.000000000 +0000 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:8.1.14.dfsg.1-1\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-08 17:29+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -96,109 +96,3 @@ "Server auf einmal durchführen oder temporär Server-Verbindungen ohne " "Cryptlinks konfigurieren, um die Kontinuität Ihrer IRC-Verbindungen " "sicherzustellen." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" -"Upgrade von Ircd-Hybrid auf eine Version ohne kompatible Dienste durchführen?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"Die 8.x-Version von Ircd-Hybrid enthält eine Änderung bezüglich der Art, in " -"der Dienste unterstützt werden. Dadurch besteht keine Kompatibilität mit " -"Hybserv mehr." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Der empfohlene Dienste-Daemon für Hybrid 8 ist Anope, für das ein Paket " -"geplant, aber noch nicht verfügbar ist." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Upgrade von Ircd-hybrid auf eine Version ohne SSL-Unterstützung?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Die korrekt installierte Version dieses Paket enthält »ssl« in der " -"Versionsnummer. Das deutet an, dass es sich hierbei um ein lokal übersetztes " -"Paket mit SSL-Unterstützung handelt. Falls dies der Fall ist, möchten Sie " -"wahrscheinlich nicht dieses Paket installieren sondern stattdessen die SSL-" -"Version neu bauen. Folgen Sie dafür den Anweisungen in /" -"usr/share/doc/ircd-hybrid/README.SSL." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "" -#~ "Jegliche Unterstützung für OpenSSL ist nun standardmäßig ausgeschaltet. " -#~ "Fortfahren?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Aus Lizenzgründen wird Ircd-hybrid standardmäßig nicht mehr mit OpenSSL " -#~ "gebaut. Dieses Problem wird in einer zukünftigen Veröffentlichung " -#~ "angegangen, da hierfür zuerst die SSL-Schicht mittels GNUTLS " -#~ "neugeschrieben werden muss." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Sollte eine Ihrer vorhandenen Server-Anbindungen cryptlinks verwenden, " -#~ "dann lesen Sie bitte /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt, um " -#~ "herauszufinden, wie Sie Ircd-hybrid (auf einfache Art) mit SSL-" -#~ "Unterstützung bauen können." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Manchmal möchten Sie das nicht tun. Beispielsweise, falls Sie das Upgrade " -#~ "durchführen und IRCd-Module zur Laufzeit laden. Wird der Daemon nicht neu " -#~ "gestartet, würde dies wahrscheinlich zu Problemen führen." - -#~ msgid "ircd-hybrid should not configure servlink_path variable" -#~ msgstr "Ircd-hybrid sollte die Variable servlink_path nicht setzen" - -#~ msgid "" -#~ "If your possibly existing ircd.conf that you may wish to import contains " -#~ "a servlink_path directive, either change it to:" -#~ msgstr "" -#~ "Sollte Ihre möglicherweise vorhandene ircd.conf, die Sie eventuell " -#~ "weiterhin verwenden möchten, eine »servlink_path«-Direktive enthalten, " -#~ "dann ändern Sie diese entweder zu:" - -#~ msgid "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" -#~ msgstr "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" - -#~ msgid "" -#~ "or simply remove the entire line as the correct path is hardcoded into " -#~ "the ircd." -#~ msgstr "" -#~ "oder entfernen Sie einfach die gesamte Zeile, da der korrekte Pfad " -#~ "ohnehin im Programmcode festgeschrieben ist." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/es.po ircd-hybrid-8.2.17+dfsg.1/debian/po/es.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/es.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/es.po 2016-04-23 12:00:42.000000000 +0000 @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:8.0.9.dfsg.1-3\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-12 18:41+0200\n" "Last-Translator: Camaleón \n" "Language-Team: Debian Spanish \n" @@ -104,85 +104,3 @@ "debería plantearse o bien actualizar todos los servidores al mismo tiempo, o " "configurar temporalmente enlaces sin cifrar para asegurarse la continuidad " "de los enlaces IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" -"¿Desea actualizar ircd-hybrid a una versión que no dispone de servicios " -"compatibles?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"La versión 8.x de ircd-hybrid introduce un cambio en la forma en que se " -"gestionan los servicios que no es compatible con hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"El demonio recomendado para Hybrid 8 es Anope del que actualmente no hay " -"disponible ningún paquete aunque se espera que haya uno pronto." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "¿Desea actualizar ircd-hybrid a una versión sin SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"El paquete que se encuentra instalado actualmente contiene «ssl» en el " -"número de versión lo que sugiere que se trata de un paquete compilado " -"localmente con SSL. Si este es el caso, es probable que no quiera instalar " -"este paquete sino construir la versión SSL siguiendo las instrucciones que " -"se encuentran en el archivo «/usr/share/doc/ircd-hybrid/README.SSL»." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "" -#~ "El uso de OpenSSL está desactivado de forma predeterminada, ¿desea " -#~ "continuar?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Debido a problemas con la licencia, de forma predeterminada ircd-hybrid " -#~ "no usa OpenSSL. Se intentará solucionar en una versión posterior, que " -#~ "está pendiente de una reescritura de la capa SSL con GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Si alguno de sus enlaces de servidor está utilizando «cryptlinks», " -#~ "consulte el archivo «/usr/share/doc/ircd-hybrid/CRYPTLINKS.txt» para " -#~ "saber cómo puede generar (fácilmente) ircd-hybrid con soporte SSL." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Es posible que en ocasiones no quiera hacerlo. Por ejemplo, si está " -#~ "realizando una actualización y carga los módulos IRCd durante la " -#~ "ejecución. Un error al reiniciar el demonio le podría causar problemas." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/eu.po ircd-hybrid-8.2.17+dfsg.1/debian/po/eu.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/eu.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/eu.po 2016-04-23 12:00:42.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid-eu\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-04-09 10:26+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" @@ -88,83 +88,3 @@ "konfiguratuta baduzu, zerbitzari guztiak batera bertsio-berritzea erabaki " "dezakezu, edo aldi baterako zerbitzarien estekak ez-cryptlink bezala " "konfiguratu, IRC esteken jarraitasuna ziurtatzeko." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" -"ircd-hybrid bertsio-berritu zerbitzu bateragarririk gabeko bertsioarekin?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"ircd-hybrid paketearen 8.x bertsioak zerbitzuak nola onartzen diren moduan " -"aldaketa bat du, hybserv-ekin bateragarritasuna galduz." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Hybrid 8 bertsioarentzako zerbitzuen gomendatutako daemon-a Anope da, baina " -"oraindik ez dago paketerik eskuragarri, nahiz eta bat planifikatuta egon." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "ircd-hybrid bertsio-berritu SSL euskarririk gabekoarekin?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Unean instalatuta dagoen pakete honen bertsioa 'ssl' dauka bere bertsio-" -"zenbakian, lokalean SSL euskarriarekin konpilatutako paketea dela " -"iradokituz. Halaxe bada, ziurrenik ez duzu pakete hau instalatzea nahiko, " -"horren ordez saia zaitez SSL bertsioa berriro eraikitzen fitxategi honetako " -"argibideak jarraituz: /usr/share/doc/ircd-hybrid/README.SSL" - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "" -#~ "OpenSSL onarpen guztia ezaiturik dago orain lehenespen bezala, jarraitu?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Lizentzia arazoak medio ircd-hybrid ez da aurrerantzean lehenespen bezala " -#~ "OpenSSL-rekin eraikiko. Hau berriz aldatu daiteke aurrerantzean SSL kapa " -#~ "GNUTLS erabiliaz berridazten denean." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Dituzun zerbitzari loturetako batenbatek kriptloturez (cryptolinks) " -#~ "baliatzen bada, begiratu /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt ircd-" -#~ "hybrid era erraz batean SSL onarpenaz erakitzeaz." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Batzuetan baliteke ez hori egin nahi izatea. Adibidez, bertsio berritzea " -#~ "eta IRCd modulu karga exekuzio-denboran egien baduzu. Deabrua abiaraztean " -#~ "huts egiteak arazoak sortu diezazkizu ziurrenik." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/fi.po ircd-hybrid-8.2.17+dfsg.1/debian/po/fi.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/fi.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/fi.po 2016-04-23 12:00:42.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2008-04-23 22:34+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" @@ -81,72 +81,3 @@ "temporarily configure non-cryptlink server links, to ensure the continuity " "of your IRC links." msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "Kaikki OpenSSL-tuki on oletuksena poissa käytöstä. Jatketaanko?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Lisensseihin liittyvistä syistä ircd-hybridiä ei oletuksena enää käännetä " -#~ "OpenSSL:n kanssa. Tulevaisuudessa SSL-kerros tullaan kirjoittamaan " -#~ "uudelleen käyttäen GNUTLS:ää." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Jos mikään olemassa olevista palvelinlinkeistä käyttää cryptlinksiä, " -#~ "katso tiedostosta /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt ohjeet ircd-" -#~ "hybridin kääntämiseen SSL-tuen kanssa (helposti)." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Joskus tätä ei haluta tehdä, jos esimerkiksi tehdään päivitystä ja ollaan " -#~ "lataamassa IRCd-moduuleita ajon aikana. Jos taustaohjelmaa ei käynnistetä " -#~ "uudelleen, se luultavasti aiheuttaa ongelmia." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/fr.po ircd-hybrid-8.2.17+dfsg.1/debian/po/fr.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/fr.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/fr.po 2016-04-23 12:00:42.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:7.0-5\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-08 08:09+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -96,104 +96,3 @@ "prévoir de mettre tous les serveurs à jour en mode verrouillé (« lock-" "step ») ou de temporairement configurer des liens non sécurisés, afin de " "garantir la continuité de service entre les liens IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Faut-il mettre à jour ircd-hybrid avec des services incompatibles ?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"La version 8.x d'ircd-hybrid modifie le mode de gestion des services et " -"n'est plus compatible avec hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Le démon de gestion de services recommandé avec Hybrid 8 est Anope. Il " -"n'existe pas encore de paquet pour ce démon." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "" -"Faut-il mettre à jour ircd-hybrid avec une version sans gestion de SSL ?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"La version actuellement installée d'ircd-hybrid comporte la mention « ssl » " -"dans le nom du paquet, ce qui suggère qu'il s'agit d'un paquet local " -"incluant la gestion SSL. Si c'est le cas, vous ne souhaitez probablement pas " -"installer ce paquet, mais plutôt reconstruire la version SSL à l'aide des " -"instructions du document /usr/share/doc/ircd-hybrid/README.SSL." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "Faut-il continuer la configuration même sans la gestion d'OpenSSL ?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "En raison de problèmes de licences, ircd-hybrid n'est plus fourni par " -#~ "défaut avec la gestion d'OpenSSL. Celle-ci sera réintégrée dans une " -#~ "prochaine version, qui utilisera la réécriture de la couche SSL par " -#~ "GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Si l'un de vos serveurs existants utilise des liens chiffrés, veuillez " -#~ "consulter le fichier /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt pour " -#~ "savoir comment compiler (facilement) ircd-hybrid avec la gestion de SSL." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Dans certains cas, par exemple si vous mettez à jour et chargez des " -#~ "modules du serveur IRC pendant son fonctionnement, il peut être " -#~ "préférable de ne pas utiliser de redémarrage automatique, car un échec " -#~ "provoquerait probablement des problèmes." - -#~ msgid "ircd-hybrid should not configure servlink_path variable" -#~ msgstr "Variable « servlink_path » non configurable" - -#~ msgid "" -#~ "If your possibly existing ircd.conf that you may wish to import contains " -#~ "a servlink_path directive, either change it to:" -#~ msgstr "" -#~ "Un fichier ircd.conf, que vous pourriez vouloir importer, existe déjà et " -#~ "contient une entrée « servlink_path ». Veuillez la changer en :" - -#~ msgid "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" -#~ msgstr "servlink_path = \"/usr/lib/ircd-hybrid/servlink\";" - -#~ msgid "" -#~ "or simply remove the entire line as the correct path is hardcoded into " -#~ "the ircd." -#~ msgstr "" -#~ "ou supprimez simplement la ligne entière, car le chemin correct est codé " -#~ "en dur dans ircd." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/gl.po ircd-hybrid-8.2.17+dfsg.1/debian/po/gl.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/gl.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/gl.po 2016-04-23 12:00:42.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2008-05-06 20:54+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -83,73 +83,3 @@ "temporarily configure non-cryptlink server links, to ensure the continuity " "of your IRC links." msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "" -#~ "O soporte de OpenSSL está desactivado por defecto; ¿quere continuar?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Debido a problemas con licencias, ircd-hybrid xa non se compila por " -#~ "defecto con OpenSSL. Isto hase revisar nunha versión futura, á espera de " -#~ "que se reescriba a capa SSL con GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Se algunha das ligazóns a servidores actuais emprega cryptlinks, " -#~ "consulte /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt para averiguar como " -#~ "compilar ircd-hybrid con soporte de SSL (é doado)." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Ãs veces, non o quere facer. Por exemplo, se está a actualizar e carga " -#~ "módulos de IRCd en tempo de execución. Non reiniciar o servizo podería " -#~ "causar problemas." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/it.po ircd-hybrid-8.2.17+dfsg.1/debian/po/it.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/it.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/it.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-16 18:46+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -87,51 +87,3 @@ "server, dovranno essere aggiornati tutti i server in lock-step, oppure " "dovranno essere temporaneamente configurati dei collegamenti non cryptlink " "al server per garantire la continuità dei collegamenti IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Aggiornare ircd-hybrid alla versione senza servizi compatibili?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"La versione 8.x di ircd-hybrid include una modifica al modo in cui sono " -"gestiti i servizi e non è più compatibile con hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Il demone per i servizi raccomandato per Hybrid 8 è Anope, per il quale non " -"è ancora disponibile un pacchetto, sebbene uno sia in progetto." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Aggiornare ircd-hybrid alla versione senza supporto per SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"La versione attualmente installata di questo pacchetto contiene «ssl» nel " -"numero di versione, il che suggerisce che sia un pacchetto compilato " -"localmente con il supporto per SSL. Se è così, probabilmente non si vorrà " -"installare questo pacchetto, ma ricompilare invece la versione SSL seguendo " -"le istruzioni in /usr/share/doc/ircd-hybrid/README.SSL." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/ja.po ircd-hybrid-8.2.17+dfsg.1/debian/po/ja.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/ja.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/ja.po 2016-04-23 12:00:42.000000000 +0000 @@ -1,22 +1,22 @@ -# +# # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to # this format, e.g. by running: # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' -# +# # Some information specific to po-debconf are available at # /usr/share/doc/po-debconf/README-trans # or http://www.debian.org/intl/l10n/po-debconf/README-trans -# +# # Developers do not need to manually edit POT or PO files. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: ircd-hybrid 1:8.0.9\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-08 07:09+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" @@ -93,52 +93,3 @@ "ã“ã®ã‚µãƒ¼ãƒã§å®‰å…¨ãªã‚µãƒ¼ãƒãƒªãƒ³ã‚¯ (cryptlinks) を設定ã—ã¦ã„ã‚‹å ´åˆã€ã‚µãƒ¼ãƒã‚’å…¨ã¦" "ã¾ã¨ã‚ã¦ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã‹ cryptlink ã§ãªã„サーãƒãƒªãƒ³ã‚¯ã‚’一時的ã«è¨­å®šã—ã€" "IRC リンクを継続的ã«ç¢ºä¿ã§ãるよã†ãªè¨ˆç”»ã‚’ç«‹ã¦ã‚‹ã¹ãã§ã™ã€‚" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" -"ircd-hybrid をサービスã®äº’æ›æ€§ãŒãªããªã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã‹?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"ircd-hybrid ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 8.x ã§ã‚µãƒ¼ãƒ“スをサãƒãƒ¼ãƒˆã™ã‚‹æ–¹æ³•ãŒå¤‰æ›´ã•ã‚Œã€hybserv " -"ã¨ã®äº’æ›æ€§ã¯å¤±ã‚ã‚Œã¾ã—ãŸã€‚" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Hybrid 8 ã§æŽ¨å¥¨ã™ã‚‹ã‚µãƒ¼ãƒ“スデーモン㯠Anope ã§ã€ã¾ã åˆ©ç”¨å¯èƒ½ãªãƒ‘ッケージã¯ã‚" -"ã‚Šã¾ã›ã‚“ãŒãƒ‘ッケージ化ãŒäºˆå®šã•ã‚Œã¦ã„ã¾ã™ã€‚" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "SSL をサãƒãƒ¼ãƒˆã—ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã« ircd-hybrid をアップグレードã—ã¾ã™ã‹?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"ã“ã®ãƒ‘ッケージã®ç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã«ã€Œsslã€" -"ãŒå«ã¾ã‚Œã‚‹ã‚‚ã®ã§ã€ãƒ­ãƒ¼ã‚«ãƒ«ã§ SSL をサãƒãƒ¼ãƒˆã™ã‚‹ã‚ˆã†ã«ã‚³ãƒ³ãƒ‘イルã—ãŸãƒ‘ッケージ" -"ã ã¨æ€ã‚ã‚Œã¾ã™ã€‚ãã®å ´åˆã¯æらãインストールã—ãŸã„ã®ã¯ã“ã®ãƒ‘ッケージã§ã¯ãªã„ã§" -"ã—ょã†ã€‚代ã‚ã‚Šã« /usr/share/doc/ircd-hybrid/README.SSL ã®æŒ‡ç¤ºã«å¾“ã£ã¦ SSL 対応" -"版をå†ãƒ“ルドã—ã¦ãã ã•ã„。" diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/nl.po ircd-hybrid-8.2.17+dfsg.1/debian/po/nl.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/nl.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/nl.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-09-18 17:50+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Dutch \n" @@ -33,8 +33,8 @@ "a new version of this package is installed." msgstr "" "Gelieve aan te geven of u wilt dat de ircd-hybrid-achtergronddienst opnieuw " -"opgestart " -"wordt, telkens er een nieuwe versie van dit pakket geïnstalleerd wordt." +"opgestart wordt, telkens er een nieuwe versie van dit pakket geïnstalleerd " +"wordt." #. Type: boolean #. Description @@ -55,9 +55,9 @@ "If you reject this option, you will have to restart ircd-hybrid via " "\"service ircd-hybrid restart\" when needed." msgstr "" -"Indien u niet voor deze optie kiest, zult u ircd-hybrid op een g zelchikt moment zelf opnieuw " -"moeten opstarten. U kunt dit doen met het commando 'invoke-rc.d ircd-hybrid " -"restart'." +"Indien u niet voor deze optie kiest, zult u ircd-hybrid op een g zelchikt " +"moment zelf opnieuw moeten opstarten. U kunt dit doen met het commando " +"'invoke-rc.d ircd-hybrid restart'." #. Type: boolean #. Description @@ -75,10 +75,9 @@ "links are implemented, which is not backwards-compatible with ircd-hybrid 7." "x, from which you are upgrading." msgstr "" -"Versie 8.x van ircd-hybrid bevat een wijziging in de manier waarop beveiligde " -"serververbindingen geïmplementeerd worden. Die is niet terugwaarts " -"compatibel met " -"versie 7.x van waaruit u opwaardeert." +"Versie 8.x van ircd-hybrid bevat een wijziging in de manier waarop " +"beveiligde serververbindingen geïmplementeerd worden. Die is niet " +"terugwaarts compatibel met versie 7.x van waaruit u opwaardeert." #. Type: boolean #. Description @@ -90,57 +89,7 @@ "of your IRC links." msgstr "" "Indien voor deze server beveiligde serververbindingen (cryptlinks) " -"geconfigureerd zijn, kunt u twee dingen doen om de continuïteit van bestaande " -"IRC-verbindingen te garanderen. U kunt ofwel alle servers tegelijkertijd opwaarderen, " -"of u kunt tijdelijke serververbindingen configureren " -"zonder cryptlink." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Ircd-hybrid opwaarderen naar een versie zonder compatibele diensten?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"Versie 8.x van ircd-hybrid bevat een wijziging in de wijze waarop diensten " -"ondersteund worden, die niet compatibel is met hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Het aanbevolen achtergrondproces ten behoeve van diensten van Hybrid 8 is " -"Anope. Momenteel is hiervoor nog geen pakket beschikbaar, hoewel dit wel in " -"de planning zit." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Ircd-hybrid opwaarderen naar een versie zonder ondersteuning voor SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Het versienummer van de huidige versie van dit pakket bevat de term \"ssl\" " -"hetgeen laat vermoeden dat het om een lokaal gecompileerd pakket met " -"ondersteuning voor SSL gaat. Als dit inderdaad het geval is, wilt u wellicht " -"niet dit pakket installeren, maar opnieuw een versie met SSL-ondersteuning " -"compileren volgens de instructies in /usr/share/doc/ircd-hybrid/README.SSL." - +"geconfigureerd zijn, kunt u twee dingen doen om de continuïteit van " +"bestaande IRC-verbindingen te garanderen. U kunt ofwel alle servers " +"tegelijkertijd opwaarderen, of u kunt tijdelijke serververbindingen " +"configureren zonder cryptlink." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/pl.po ircd-hybrid-8.2.17+dfsg.1/debian/po/pl.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/pl.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/pl.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-08 21:32+0100\n" "Last-Translator: MichaÅ‚ KuÅ‚ach \n" "Language-Team: Polish \n" @@ -87,51 +87,3 @@ "serwera (cryptlinki), to powinno siÄ™ zaplanować aktualizacjÄ™ wszystkich " "serwerów naraz lub tymczasowo skonfigurować dowiÄ…zania niebÄ™dÄ…ce " "cryptlinkami, aby zapewnić dziaÅ‚anie dowiÄ…zaÅ„ IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Zaktualizować ircd-hybrid do wersji bez kompatybilnych usÅ‚ug?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"Wersja 8.x ircd-hybrid zawiera zmianÄ™ w obsÅ‚udze usÅ‚ug powodujÄ…cÄ… utratÄ™ " -"kompatybilnoÅ›ci z hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Zalecanym demonem usÅ‚ug do Hybrid 8 jest Anope, do którego nie sÄ… jeszcze " -"dostÄ™pne pakiety, choć jest to planowane." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Zaktualizować ircd-hybrid do wersji bez obsÅ‚ugi SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Obecnie zainstalowana wersja tego pakietu posiada \"ssl\" w numerze wersji, " -"co sugeruje, że jest lokalnie skompilowanym pakietem z obsÅ‚ugÄ… SSL. JeÅ›li " -"tak jest w rzeczywistoÅ›ci, prawdopodobnie pożądane bÄ™dzie przebudowanie " -"wersji SSL za pomocÄ… instrukcji z pliku /usr/share/doc/ircd-hybrid/README." -"SSL, zamiast instalowania tego pakietu." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/pt_BR.po ircd-hybrid-8.2.17+dfsg.1/debian/po/pt_BR.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/pt_BR.po 2016-04-23 12:00:42.000000000 +0000 @@ -0,0 +1,88 @@ +# Debconf translations for ircd-hybrid. +# Copyright (C) 2016 THE ircd-hybrid'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ircd-hybrid package. +# Adriano Rafael Gomes , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: ircd-hybrid\n" +"Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" +"PO-Revision-Date: 2016-01-31 16:13-0200\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:2001 +msgid "Restart ircd-hybrid on each upgrade?" +msgstr "Reiniciar o ircd-hybrid a cada atualização?" + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:2001 +msgid "" +"Please choose whether the ircd-hybrid daemon should be restarted every time " +"a new version of this package is installed." +msgstr "" +"Por favor, escolha se o daemon do ircd-hybrid deve ser reiniciado a cada vez " +"que uma nova versão desse pacote for instalada." + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:2001 +msgid "" +"Automatic restarts may be problematic if, for instance, the server is " +"running with manually loaded modules, which will need to be reloaded after " +"the restart." +msgstr "" +"Reinícios automáticos podem ser problemáticos se, por exemplo, o servidor " +"estiver sendo executado com módulos carregados manualmente, os quais " +"precisarão ser recarregados depois do reinício." + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:2001 +msgid "" +"If you reject this option, you will have to restart ircd-hybrid via " +"\"service ircd-hybrid restart\" when needed." +msgstr "" +"Se você rejeitar essa opção, você terá que reiniciar o ircd-hybrid via " +"\"service ircd-hybrid restart\" quando necessário." + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:3001 +msgid "Upgrade ircd-hybrid to version without cryptlink support?" +msgstr "Atualizar o ircd-hybrid para a versão sem suporte a cryptlink?" + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:3001 +msgid "" +"The 8.x version of ircd-hybrid includes a change to the way secure server " +"links are implemented, which is not backwards-compatible with ircd-hybrid 7." +"x, from which you are upgrading." +msgstr "" +"A versão 8.x do ircd-hybrid inclui uma mudança no modo no qual os links de " +"servidores seguros são implementados, que não mantém compatibilidade " +"retroativa com o ircd-hybrid 7.x, a partir do qual você está atualizando." + +#. Type: boolean +#. Description +#: ../ircd-hybrid.templates:3001 +msgid "" +"If you have any secure server links (cryptlinks) configured with this " +"server, you should plan to either upgrade all servers in lock-step, or " +"temporarily configure non-cryptlink server links, to ensure the continuity " +"of your IRC links." +msgstr "" +"Se você tiver quaisquer links de servidores seguros (cryptlinks) " +"configurados com esse servidor, você deverá planejar atualizar todos os " +"servidores em conjunto, ou configurar temporariamente links de servidores " +"sem cryptlink, para assegurar a continuidade dos seus links de IRC." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/pt.po ircd-hybrid-8.2.17+dfsg.1/debian/po/pt.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/pt.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/pt.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:8.1.14.dfsg.1-1\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-07 23:18+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -87,83 +87,3 @@ "este servidor, deve planear actualizar todos os servidores em \"lock-step\", " "ou configurar temporariamente links de servidor não-cryptlink, para " "assegurar a continuidade dos seus links de IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Actualizar o ircd-hybrid para versão sem serviços compatíveis?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"A versão 8.x do ircd-hybrid inclui uma alteração no modo como os serviços " -"são suportados, perdendo a compatibilidade com o hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"O daemon de serviços recomendado para o Hybrid 8 é o Anope, para o qual " -"ainda não há disponível um pacote, no entanto está um planeado." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Actualizar o ircd-hybrid para versão sem suporte de SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"A versão presentemente instalada deste pacote é uma com \"ssl\" no número de " -"versão, o que sugere que é um pacote compilado localmente com suporte a SSL. " -"Se este é o caso, provavelmente você não vai querer instalar este pacote e " -"vai antes querer recompilar a versão SSL seguindo as instruções em /usr/" -"share/doc/ircd-hybrid/README.SSL." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "" -#~ "Todo o suporte OpenSSL está agora desactivado por omissão; continuar?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Devido a problemas de licenças o ircd-hybrid já não é mais compilado, por " -#~ "omissão, com OpenSSL. Isto será referido numa futura versão, dependendo " -#~ "da reescrita da camada SSL com GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Se algum dos links existentes do seu servidor tirar partido de " -#~ "cryptlinks, consulte /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt para " -#~ "descobrir como compilar o ircd-hybrid com suporte para SSL (facilmente.)" - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Às vezes, você pode não querer fazer isto. Por exemplo, se você está a " -#~ "fazer uma actualização e a carregar módulos IRCd no tempo de execução do " -#~ "programa. Uma falha ao reiniciar o processo irá provavelmente dar-lhe " -#~ "problemas." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/ru.po ircd-hybrid-8.2.17+dfsg.1/debian/po/ru.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/ru.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/ru.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:8.1.14.dfsg.1-1\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-03-11 20:09+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -87,81 +87,3 @@ "ЕÑли вы иÑпользуете безопаÑные Ñерверные ÑвÑзи (cryptlinks), то должны " "запланировать или обновление вÑех Ñерверов одновременно, или временно " "наÑтроить ÑвÑзи без cryptlink Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ñ€ÐµÑ€Ñ‹Ð²Ð½Ð¾Ñти ÑвÑзей IRC." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "Обновить ircd-hybrid на верÑию без ÑовмеÑтимых Ñлужб?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"Ð’ ircd-hybrid верÑии 8.x изменён ÑпоÑоб поддержки Ñлужб, из-за чего она не " -"ÑовмеÑтима Ñ hybserv." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"Ð’ качеÑтве обработчика Ñлужб в Hybrid 8 рекомендуетÑÑ Ð¸Ñпользовать Anope, " -"который пока отÑутÑтвует в пакете (планируетÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ)." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Обновить ircd-hybrid на верÑию без поддержки SSL?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"УÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð² наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ пакета Ñодержит в номере " -"верÑии «ssl»; предполагаетÑÑ, что Ñто локально Ñобранный пакет Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ " -"SSL. ЕÑли Ñто так, то вы, вероÑтно, не захотите уÑтанавливать Ñтот пакет, а " -"Ñоберёте верÑию Ñ SSL ÑоглаÑно инÑтрукции в /usr/share/doc/ircd-hybrid/" -"README.SSL." - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "Поддержка OpenSSL теперь по умолчанию выключена, продолжить?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Из-за лицензионных проблем ircd-hybrid по умолчанию больше не ÑобираетÑÑ " -#~ "Ñ OpenSSL. Это будет решено в будущей верÑии, в качеÑтве ÑƒÑ€Ð¾Ð²Ð½Ñ SSL будет " -#~ "иÑпользоватьÑÑ GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "ЕÑли Ð´Ð»Ñ ÑвÑзи c какими-то Ñерверами иÑпользуетÑÑ cryptlinks, то в файле /" -#~ "usr/share/doc/ircd-hybrid/CRYPTLINKS.txt дано опиÑание, как Ñобрать ircd-" -#~ "hybrid Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ SSL (легко)." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Иногда, Ñтого лучше не делать. Ðапример, еÑли обновление и загрузка " -#~ "модулей IRCd проиÑходит непоÑредÑтвенно во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹. Ðеудачный " -#~ "перезапуÑк Ñлужбы, вероÑтно, вызовет проблемы." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/sv.po ircd-hybrid-8.2.17+dfsg.1/debian/po/sv.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/sv.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/sv.po 2016-04-23 12:00:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2014-09-17 13:00+0100\n" "Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" @@ -85,52 +85,3 @@ "du antingen uppgradera alla servrar eller temporärt göra inställningar för " "att använda osäkra serverlänkar sÃ¥ att du säkerställer att IRC-länkarna " "hÃ¥lls uppe." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" -"Uppgradera ircd-hybrid till en version som inte innehÃ¥ller kompatibla " -"tjänster?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" -"I version 8.x av ircd-hybrid finns en ändring i hur tjänster hanteras, detta " -"innebär att kompatibilitet med hybserv försvinner." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" -"I Hybrid 8 rekommenderas att använda Anope för att tillhandahÃ¥lla tjänster, " -"denna finns ännu ej som paket." - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "Uppgradera ircd-hybrid till en version utan SSL-stöd?" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" -"Den nuvarande versionen av paketet har \"ssl\" i versionsnamnet, det bör " -"betyda att det är ett lokalt byggt paket med SSL-stöd. Om detta är fallet " -"vill du troligen inte installera detta paket utan istället bygga om SSL-" -"versionen enligt instruktionerna i /usr/share/doc/ircd-hybrid/README.SSL." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/templates.pot ircd-hybrid-8.2.17+dfsg.1/debian/po/templates.pot --- ircd-hybrid-8.2.12+dfsg.1/debian/po/templates.pot 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/templates.pot 2016-04-23 12:00:42.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,42 +72,3 @@ "temporarily configure non-cryptlink server links, to ensure the continuity " "of your IRC links." msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/po/vi.po ircd-hybrid-8.2.17+dfsg.1/debian/po/vi.po --- ircd-hybrid-8.2.12+dfsg.1/debian/po/vi.po 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/po/vi.po 2016-04-23 12:00:42.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: ircd-hybrid 1:7.2.2.dfsg.2-3.1\n" "Report-Msgid-Bugs-To: ircd-hybrid@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 22:09+0000\n" +"POT-Creation-Date: 2016-04-03 12:55+0100\n" "PO-Revision-Date: 2008-05-06 20:13+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -85,72 +85,3 @@ "temporarily configure non-cryptlink server links, to ensure the continuity " "of your IRC links." msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "Upgrade ircd-hybrid to version without compatible services?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The 8.x version of ircd-hybrid includes a change to the way services are " -"supported, losing compatibility with hybserv." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:4001 -msgid "" -"The recommended services daemon for Hybrid 8 is Anope, for which no package " -"is available yet, although one is planned." -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "Upgrade ircd-hybrid to version without SSL support?" -msgstr "" - -#. Type: boolean -#. Description -#: ../ircd-hybrid.templates:5001 -msgid "" -"The currently installed version of this package is one with \"ssl\" in the " -"version number, which suggests that it is a locally compiled package with " -"SSL support. If this is the case, you probably don't want to install this " -"package but instead rebuild the SSL version following the instructions in /" -"usr/share/doc/ircd-hybrid/README.SSL." -msgstr "" - -#~ msgid "All OpenSSL support is now disabled by default; continue?" -#~ msgstr "Toàn bá»™ há»— trợ OpenSSL bị tắt theo mặc định: tiếp tục không?" - -#~ msgid "" -#~ "Due to licensing issues ircd-hybrid is no longer built by default with " -#~ "OpenSSL. This will be addressed in a future release, pending a rewrite of " -#~ "the SSL layer with GNUTLS." -#~ msgstr "" -#~ "Do vấn Ä‘á» quyá»n sá»­ dụng, ircd-hybrid không còn được xây dá»±ng lại theo mặc " -#~ "định vá»›i OpenSSL. Vấn Ä‘á» này sẽ được giải quyết trong má»™t bản phát hành " -#~ "sau, phụ thuá»™c vào má»™t bả ghi lại cấp SSL dùng GNUTLS." - -#~ msgid "" -#~ "If any of your existing server links take advantage of cryptlinks, refer " -#~ "to /usr/share/doc/ircd-hybrid/CRYPTLINKS.txt to find out how to build " -#~ "ircd-hybrid with SSL support (easily.)" -#~ msgstr "" -#~ "Nếu bất kỳ liên kết máy phục vụ đá tồn tại của bạn có nhá»› dịp cryptlink " -#~ "(liên kết mật mã), xem tập tin «/usr/share/doc/ircd-hybrid/CRYPTLINKS." -#~ "txt» để tìm biết dá»… dàng xây dụng trình ircd-hybrid há»— trợ SSL nhÆ° thế " -#~ "nào." - -#~ msgid "" -#~ "Sometimes, you do not want to do this. For instance, if you are doing the " -#~ "upgrade and loading IRCd modules at runtime. Failing to restart the " -#~ "daemon would probably lead you to problems." -#~ msgstr "" -#~ "Äôi khi không nên. Ví dụ, nếu bạn nâng cấp và nạp các mô-Ä‘un ICRd vào lúc " -#~ "chạy. Không khởi chạy lại trình ná»n thì rất có thể gây ra lá»—i." diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/README.SSL ircd-hybrid-8.2.17+dfsg.1/debian/README.SSL --- ircd-hybrid-8.2.12+dfsg.1/debian/README.SSL 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/README.SSL 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -Building ircd-hybrid with SSL support -------------------------------------- - -As of 1:7.0-6, SSL support, both for clients and server links, is not -included in the default build of ircd-hybrid. However, because many people -find it an absolute necessity, the build system allows you to build with -OpenSSL ($ prompts can be run as users, # should be run as root.): - -1. $ apt-get source ircd-hybrid - You'll need to have some deb-src lines in your /etc/apt/sources.list. - -2. # apt-get build-dep ircd-hybrid - # apt-get install libssl-dev fakeroot - This will pull in everything you need to build the package. - -3. $ cd ircd-hybrid-... - $ USE_OPENSSL=1 fakeroot debian/rules binary - - Watch the packages build! - -4. You should now be left with a package with the same version as the Debian - revision, with '.ssl1' appended to it. - - This can be installed like so: - # dpkg -i ircd-hybrid_.ssl1_.deb, - - where VERSION is the Debian version and YOURARCH is one of i386, powerpc, - etc. - -Why OpenSSL cannot be linked in by default ------------------------------------------- - -The OpenSSL license and the GPLv2 license are fundamentally incompatible, -because the OpenSSL license imposes advertising requirements on people -using the software, contrary to clause 6 of the GPL. Whilst the GPLv3 adds -the capability for exclusions to this rule, it is not practical to change -the license of ircd-hybrid accordingly owing to the large numbers of authors. - -At the time of writing (April 2013) it appears that the only practical way -to get SSL support enabled by default would be to switch to a different -SSL library (for example GnuTLS or yaSSL). - -Please see Debian bug #697376 for additional information. diff -Nru ircd-hybrid-8.2.12+dfsg.1/debian/rules ircd-hybrid-8.2.17+dfsg.1/debian/rules --- ircd-hybrid-8.2.12+dfsg.1/debian/rules 2016-01-17 17:56:58.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/debian/rules 2016-04-23 12:00:42.000000000 +0000 @@ -7,16 +7,6 @@ export CFLAGS = -g export BUILD_DATE = $(shell LC_ALL=C date -u --date="`dpkg-parsechangelog -SDate`" +'%B %-e %Y at %T%z') -# We don't want debian/control to be nuked -MAINT_FILES = debian/control \ - debian/changelog \ - $(MAINT_CLEAN_FILES) -MAINT_CLEAN_FILES = debian/ircd.conf \ - debian/ircd-hybrid.postinst \ - debian/ircd-hybrid.postrm \ - debian/ircd-hybrid.preinst \ - debian/ircd-hybrid.config - # Make my life easier I = debian/ircd-hybrid I_LIB = $(I)/usr/lib/ircd-hybrid @@ -51,16 +41,9 @@ crossflags := --build=$(buildtype) --host=$(hosttype) endif -ifndef USE_OPENSSL - sslflags := --disable-openssl -endif - configure: configure-stamp configure-stamp: -ifdef USE_OPENSSL - dpkg-checkbuilddeps -endif dh_testdir /bin/echo -ne '#ifndef PATCHLEVEL\n#define PATCHLEVEL "hybrid-' > include/patchlevel-debian.h @@ -69,7 +52,9 @@ dh_autoreconf - ./configure $(crossflags) $(sslflags) \ + ./configure $(crossflags) \ + --disable-openssl \ + --enable-gnutls \ --prefix=/usr \ --sysconfdir=/etc/ircd-hybrid \ --localstatedir=/var \ @@ -85,7 +70,7 @@ build-indep: build-stamp -build-stamp: $(MAINT_FILES) configure +build-stamp: configure $(MAKE) touch build-stamp @@ -108,88 +93,12 @@ dh_testroot dh_testdir rm -rf debian/doc-pages - rm -f $(MAINT_CLEAN_FILES) -ifneq (,$(wildcard debian/control.orig)) - cp debian/control.orig debian/control -endif -ifneq (,$(wildcard debian/changelog.orig)) - mv debian/changelog.orig debian/changelog -endif rm -f build-stamp configure-stamp manpages-stamp config.log changelog-stamp control-stamp [ ! -f Makefile ] || $(MAKE) distclean rm -f include/patchlevel-debian.h dh_clean -debian/changelog: changelog-stamp - -changelog-stamp: -ifdef USE_OPENSSL - cp debian/changelog debian/changelog.orig - ( sh debian/boguschangelog.sh; cat debian/changelog ) > debian/changelog.new - mv debian/changelog.new debian/changelog -endif - - touch changelog-stamp - - -debian/control: control-stamp - -control-stamp: - cp debian/control debian/control.orig -ifdef USE_OPENSSL - sed -e 's^@SSL_BUILD_DEPENDS@^, libssl-dev^' \ - -e 's^@SSL_HYBRID_DEPENDS@^, openssl^' \ - -e 's^@SSL_CRYPTLINK_DESC@^o SSL server-to-server connections (cryptlinks)`printf \\n`^' \ - debian/control.in > debian/control -else - sed -e 's^@SSL_BUILD_DEPENDS@^^' \ - -e 's^@SSL_HYBRID_DEPENDS@^^' \ - -e 's^@SSL_CRYPTLINK_DESC@^^' debian/control.in > debian/control - cmp debian/control debian/control.orig -endif - - touch $@ - -debian/ircd.conf: -ifdef USE_OPENSSL - cp -f debian/ircd.conf.ssl debian/ircd.conf -else - cp -f debian/ircd.conf.nossl debian/ircd.conf -endif - -debian/ircd-hybrid.preinst: -ifdef USE_OPENSSL - cp debian/ircd-hybrid.preinst.ssl debian/ircd-hybrid.preinst -else - cp debian/ircd-hybrid.preinst.nossl debian/ircd-hybrid.preinst -endif - -debian/ircd-hybrid.postrm: -ifdef USE_OPENSSL - sed -e "s^@SSL_REMOVE@^`cat debian/ircd-hybrid.postrm.ssl`^" \ - debian/ircd-hybrid.postrm.in > debian/ircd-hybrid.postrm -else - sed -e "s^@SSL_REMOVE@^^" \ - debian/ircd-hybrid.postrm.in > debian/ircd-hybrid.postrm -endif - -debian/ircd-hybrid.postinst: -ifdef USE_OPENSSL - sed -e "s^@SSL_WORK@^`cat debian/ircd-hybrid.postinst.ssl`^" \ - debian/ircd-hybrid.postinst.in > debian/ircd-hybrid.postinst -else - sed -e "s^@SSL_WORK@^^" \ - debian/ircd-hybrid.postinst.in > debian/ircd-hybrid.postinst -endif - -debian/ircd-hybrid.config: -ifdef USE_OPENSSL - cp debian/ircd-hybrid.config.ssl debian/ircd-hybrid.config -else - cp debian/ircd-hybrid.config.nossl debian/ircd-hybrid.config -endif - -install: manpages $(MAINT_FILES) +install: manpages dh_testdir dh_prep @@ -200,9 +109,7 @@ dh_install -ifdef USE_OPENSSL cp debian/cert.cnf $(I_ETC) -endif binary-indep: build install @@ -259,4 +166,4 @@ binary: binary-indep binary-arch -.PHONY: binary binary-arch binary-indep clean clean1 install manpages debian/control debian/changelog +.PHONY: binary binary-arch binary-indep clean install manpages diff -Nru ircd-hybrid-8.2.12+dfsg.1/doc/ircd.8 ircd-hybrid-8.2.17+dfsg.1/doc/ircd.8 --- ircd-hybrid-8.2.12+dfsg.1/doc/ircd.8 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/doc/ircd.8 2016-04-21 18:37:06.000000000 +0000 @@ -1,14 +1,14 @@ .\" @(#)ircd.8 7b10 25 Oct 2001 -.\" $Id: ircd.8 7007 2016-01-01 00:09:08Z michael $ -.TH IRCD 8 "22 October 2015" "ircd-hybrid-8" +.\" $Id: ircd.8 7388 2016-03-04 17:05:06Z michael $ +.TH IRCD 8 "22 October 2015" "ircd-hybrid" .SH NAME -ircd \- The IRCD-Hybrid Internet Relay Chat server +ircd \- ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon .SH SYNOPSIS .hy 0 .IP \fBircd\fP -[-configfile filename] [-dlinefile filename] [-klinefile filename] -[-xlinefile filename] [-logfile filename] [-pidfile filename] [-foreground] -[-version] +[-configfile filename] [-klinefile filename] [-dlinefile filename] +[-xlinefile filename] [-resvfile filename] [-logfile filename] [-pidfile filename] +[-foreground] [-version] [-help] .SH DESCRIPTION .LP \fIircd\fP is the server (daemon) program for the Internet Relay Chat @@ -19,7 +19,7 @@ servers. This is \fIircd-hybrid\fP, the highly modified (and hopefully improved) -variant of the original ircd program by Jarkko Oikarinen. +variant of the original \fIircd\fP program by Jarkko Oikarinen. .SH OPTIONS .TP .B \-configfile filename @@ -27,57 +27,61 @@ is used to override the default ircd.conf given at compile time. By default, this is "etc/ircd.conf" within the prefix you installed the \fIircd\fP in. .TP -.B \-dlinefile filename -.TP .B \-klinefile filename .TP +.B \-dlinefile filename +.TP .B \-xlinefile filename +.TP +.B \-resvfile filename Specifies the database files to be used for D-lines (host bans), K-lines (hostmask bans), -and X-lines (gecos bans), which by default are within the var/lib/ directory of your -installation prefix as dline.db, kline.db, and xline.db. +X-lines (gecos bans) and RESVs (jupes) which by default are within the var/lib/ +directory of your installation prefix as dline.db, kline.db, xline.db and resv.db. .TP .B \-logfile filename -Specifies an alternative logfile to be used than that specified in defaults.h +Specifies an alternative logfile to be used than that specified in include/defaults.h .TP .B \-pidfile filename Specifies the file used by the \fIircd\fP to store its process ID. The option is used to override the default ircd.pid given at compile time. .TP .B \-foreground -Makes \fIircd\fP run in the foreground +Makes \fIircd\fP run in the foreground. .TP .B \-version -Makes \fIircd\fP print its version, and exit. +Makes \fIircd\fP print its version and exit. +.TP +.B \-help +Makes \fIircd\fP print available options and exit. .SH USAGE -If you plan to connect your \fIircd\fP server to an existing IRC network, +If you plan to connect your IRC server to an existing IRC network, you will need to alter your local IRC configuration file (typically named -"ircd.conf") so that it will accept and make connections to other \fIIRC\fP -servers. This file contains the hostnames, IP addresses, and sometimes -passwords for connections to other ircds around the world. +"ircd.conf") so that it will accept and make connections to other IRC servers. +This file contains the hostnames, IP addresses and sometimes passwords +for connections to other \fIircds\fP around the world. The example reference.conf in the etc/ directory documents itself. Read it carefully or you may expose a risk on your network simply by having your -ircd running! +\fIircd\fP running! .LP .SH BOOTING THE SERVER -It is sufficient to type \fBircd\fP at the command line to start -ircd-hybrid into the background. If you wish to run ircd in the +It is sufficient to type \fIircd\fP at the command line to start +\fIircd-hybrid\fP into the background. If you wish to run \fIircd\fP in the foreground (perhaps for debugging purposes), use the \fB-foreground\fP parameter. -The ircd-hybrid package in your distribution may ship with an rc-script -which handles this for you. In Debian, it is \fB/etc/init.d/ircd-hybrid.\fP - +The \fIircd-hybrid\fP package in your distribution may ship with an rc-script +which handles this for you. In Debian, it is \fB/etc/init.d/ircd-hybrid\fP. .SH EXAMPLE # ircd -configfile /usr/share/ircd/ircd.conf -logfile /var/log/ircd.log -Starts \fBircd\fP with the config file /usr/share/ircd/ircd.conf and +Starts \fIircd\fP with the config file /usr/share/ircd/ircd.conf and with a log file /var/log/ircd.log. It implicitly forks back to the -console -- to prevent this use -foreground. +console -- to prevent this, use \fB-foreground\fP. -Many of the above paths are hardcoded at compile time in the +Many of the above paths are hard-coded at compile time in the \fBinclude/defaults.h\fP file, so it may be convenient to edit these to -suit your needs before you compile the ircd. +suit your needs before you compile the \fIircd\fP. .SH COPYRIGHT (c) 1988,1989 University of Oulu, Computing Center, Finland, .LP @@ -88,19 +92,17 @@ .LP (c) 1997-2016 ircd-hybrid development team .LP -For full COPYRIGHT see the COPYING file within the IRC source package. +For full COPYRIGHT, see the COPYING file within the IRC source package. .LP .RE .SH BUGS -If you find a bug and you have a core file from ircd as a result, use a +If you find a bug and you have a core file from \fIircd\fP as a result, use a debugger like \fBgdb(1)\fP to process the core file and send a backtrace to \fBbugs@ircd-hybrid.org\fP. - .SH AUTHORS -irc2.8 and earlier: Jarkko Oikarinen, currently jto@tolsun.oulu.fi. See -doc/old/Authors for more credits. +irc2.8 and earlier: Jarkko Oikarinen, currently jto@tolsun.oulu.fi. .LP -ircd-hybrid-8: the IRCD-Hybrid Project, bugs@ircd-hybrid.org. +ircd-hybrid: ircd-hybrid development team, bugs@ircd-hybrid.org. .LP Manual page written by Jeff Trim, jtrim@orion.cair.du.edu, later modified by jto@tolsun.oulu.fi. diff -Nru ircd-hybrid-8.2.12+dfsg.1/doc/Makefile.in ircd-hybrid-8.2.17+dfsg.1/doc/Makefile.in --- ircd-hybrid-8.2.12+dfsg.1/doc/Makefile.in 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/doc/Makefile.in 2016-04-21 18:37:06.000000000 +0000 @@ -96,6 +96,7 @@ $(top_srcdir)/m4/ax_arg_enable_assert.m4 \ $(top_srcdir)/m4/ax_arg_enable_debugging.m4 \ $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \ + $(top_srcdir)/m4/ax_arg_gnutls.m4 \ $(top_srcdir)/m4/ax_arg_ioloop_mechanism.m4 \ $(top_srcdir)/m4/ax_arg_libgeoip.m4 \ $(top_srcdir)/m4/ax_arg_openssl.m4 \ diff -Nru ircd-hybrid-8.2.12+dfsg.1/doc/reference.conf ircd-hybrid-8.2.17+dfsg.1/doc/reference.conf --- ircd-hybrid-8.2.12+dfsg.1/doc/reference.conf 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/doc/reference.conf 2016-04-21 18:37:06.000000000 +0000 @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2016 ircd-hybrid development team * - * $Id: reference.conf 7024 2016-01-01 18:33:48Z michael $ + * $Id: reference.conf 7522 2016-04-03 10:16:18Z michael $ */ /* @@ -74,13 +74,13 @@ hub = no; /* - * vhost: the IP address to bind to when we connect outward to IPv4 servers. + * vhost: the IP address to bind to when connecting outward to IPv4 servers. * This should be an IPv4 address, or "*" for INADDR_ANY. */ # vhost = "192.0.2.1"; /* - * vhost6: the IP address to bind to when we connect outward to IPv6 servers. + * vhost6: the IP address to bind to when connecting outward to IPv6 servers. * This should be an IPv6 address, or "*" for in6addr_any. */ # vhost6 = "2001:DB8::1"; @@ -105,13 +105,43 @@ max_topic_length = 160; /* - * rsa_private_key_file: the path to the file containing the - * RSA key. RSA keys with less than 2048 bits are no longer - * supported. + * libgeoip_database_options: used to control the libGeoIP database handling. + * + * Available options: + * + * standard - Read database from file system. This uses the least memory. + * memory_cache - Load database into memory. Provides faster performance but + * uses more memory. + * mmap_cache - Load database into mmap shared memory. + * check_cache - Check for updated database. If database has been updated, + * reload file handle and/or memory cache. + */ +# libgeoip_database_options = memory_cache, check_cache; + + /* + * libgeoip_ipv4_database_file: the path to the GeoIP IPv4 database file. + */ +# libgeoip_ipv4_database_file = "etc/GeoIP.dat"; + + /* + * libgeoip_ipv6_database_file: the path to the GeoIP IPv6 database file. + */ +# libgeoip_ipv6_database_file = "etc/GeoIPv6.dat"; + + /* + * rsa_private_key_file: the path to the file containing the RSA key. * * Example commands to store a 2048 bit RSA key in rsa.key: * + * OpenSSL/LibreSSL: * openssl genrsa -out rsa.key 2048 + * + * GnuTLS: + * certtool --generate-privkey --sec-param=medium --outfile rsa.key + * + * Once the RSA key is generated, it is highly recommended to lock down + * its file permissions: + * * chown . rsa.key * chmod 0600 rsa.key */ @@ -126,29 +156,26 @@ * * Example command: * + * OpenSSL/LibreSSL: * openssl req -new -days 365 -x509 -key rsa.key -out cert.pem * - * Please use the following values when generating the cert - * - * Organization Name: Network Name - * Organization Unit Name: unit.example.net - * Common Name: irc.example.net - * E-mail: email@example.net + * GnuTLS: + * certtool --generate-self-signed --load-privkey rsa.key --outfile cert.pem */ # ssl_certificate_file = "etc/cert.pem"; /* - * ssl_dh_param_file: path to the PEM encoded Diffie-Hellman + * ssl_dh_param_file: the path to the PEM encoded Diffie-Hellman * parameter file. DH parameters are required when using * ciphers with EDH (ephemeral Diffie-Hellman) key exchange. * * A DH parameter file can be created by running: * + * OpenSSL/LibreSSL: * openssl dhparam -out dhparam.pem 2048 * - * Prime size must be at least 2048 bits. Further information - * regarding specific OpenSSL dhparam command-line options - * can be found in the OpenSSL manual. + * GnuTLS: + * certtool --generate-dh-params --sec-param=medium --outfile dhparam.pem */ # ssl_dh_param_file = "etc/dhparam.pem"; @@ -157,36 +184,46 @@ * Elliptic Curve Diffie-Hellman (ECDH) algorithm. * Default is ANSI X9.62 prime256v1/secp256r1 if nothing else is specified. * - * A list of supported curves by OpenSSL can be obtained by running: + * A list of curves supported by OpenSSL can be obtained by running: * * openssl ecparam -list_curves + * + * This directive currently doesn't do anything with GnuTLS support. */ # ssl_dh_elliptic_curve = "secp521r1"; /* * ssl_cipher_list: list of ciphers to support on _this_ server. * Can be used to enforce specific ciphers for incoming SSL/TLS - * connections. If a client (which also includes incoming server connections) - * is not capable of using any of the ciphers listed here, the connection will - * simply be rejected. + * connections. If a client (which also includes incoming server + * connections) is not capable of using any of the ciphers listed + * here, the connection will simply be rejected. * - * A list of supported ciphers by OpenSSL can be obtained by running: + * A list of supported ciphers can be obtained by running: * + * OpenSSL/LibreSSL: * openssl ciphers -tls1 -v * + * GnuTLS: + * gnutls-cli --list + * * Multiple ciphers are separated by colons. The order of preference is * from left to right. */ # ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA"; /* - * ssl_message_digest_algorithm: defines what cryptographic hash function + * ssl_message_digest_algorithm: defines which cryptographic hash function * to use for generating fingerprint hashes of X.509 certificates. * Default is SHA-256 if nothing else is specified. * - * A list of supported message digest algorithms by OpenSSL can be obtained by running: + * A list of supported message digest algorithms can be obtained by running: * + * OpenSSL/LibreSSL: * openssl list-message-digest-algorithms + * + * GnuTLS: + * gnutls-cli --list */ # ssl_message_digest_algorithm = "sha256"; }; @@ -320,7 +357,7 @@ mask = "*.ch"; /* - * file: path to the actual motd file. + * file: path to the motd file. */ file = "etc/german.motd"; }; @@ -381,13 +418,13 @@ password = "letmein"; /* - * encrypted: controls whether the auth password above has been + * encrypted: indicates whether the auth password above has been * encrypted. Default is 'no' if nothing else is specified. */ encrypted = yes; /* - * spoof: fake the user's host to this. This is free-form, just do + * spoof: fake the user's host to this. This is free-form; just do * everyone a favor and don't abuse it. ('=' prefix on /stats I) */ spoof = "I.still.hate.packets"; @@ -450,14 +487,14 @@ /* * password: the password required to oper. By default this will need - * to be encrypted by using the provided mkpasswd tool. + * to be encrypted using the provided mkpasswd tool. * The availability of various password hashing algorithms may vary * depending on the system's crypt(3) implementation. */ password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4"; /* - * encrypted: controls whether the oper password above has been + * encrypted: indicates whether the oper password above has been * encrypted. Default is 'yes' if nothing else is specified. */ encrypted = yes; @@ -467,10 +504,14 @@ * the oper's client certificate fingerprint against the specified * fingerprint below. * - * Hint: your users can use the following command to obtain a SHA-256 hash + * Hint: your users can use the following commands to obtain a SHA-256 hash * of their ssl certificate: * + * OpenSSL/LibreSSL: * openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g' + * + * GnuTLS: + * certtool -i < cert.pem | egrep -A 1 'SHA256 fingerprint' */ # ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; @@ -485,8 +526,8 @@ class = "opers"; /* - * whois: allows to override the default RPL_WHOISOPERATOR numeric - * string shown in /whois. + * whois: allows overriding the default RPL_WHOISOPERATOR numeric + * string shown in WHOIS. * This string is propagated to all servers on the network. */ # whois = "is a Smurf Target (IRC Operator)"; @@ -526,34 +567,35 @@ * allowed to do on the server. All flags default to 'no'. * Available flags: * - * admin - gives administrator privileges | ('A' flag) - * close - allows CLOSE | ('B' flag) - * connect - allows local CONNECT | ('C' flag) - * connect:remote - allows remote CONNECT | ('D' flag) - * die - allows DIE | ('E' flag) - * dline - allows DLINE | ('F' flag) - * globops - allows GLOBOPS | ('G' flag) - * join:resv - allows to JOIN resv {} channels | ('H' flag) - * kill - allows to KILL local clients | ('I' flag) - * kill:remote - allows remote users to be /KILL'd | ('J' flag) - * kline - allows KLINE | ('K' flag) - * locops - allows LOCOPS | ('L' flag) - * module - allows MODULE | ('M' flag) - * nick:resv - allows to use NICK on resv {} nicks | ('N' flag) - * opme - allows OPME | ('O' flag) - * rehash - allows oper to REHASH config | ('P' flag) - * remoteban - allows remote KLINE/UNKLINE | ('Q' flag) - * restart - allows RESTART | ('R' flag) - * resv - allows RESV | ('S' flag) - * set - allows SET | ('T' flag) - * squit - allows local SQUIT | ('U' flag) - * squit:remote - allows remote SQUIT | ('V' flag) - * undline - allows UNDLINE | ('W' flag) - * unkline - allows UNKLINE | ('X' flag) - * unresv - allows UNRESV | ('Y' flag) - * unxline - allows UNXLINE | ('Z' flag) - * wallops - allows WALLOPS | ('a' flag) - * xline - allows XLINE | ('b' flag) + * admin - gives administrator privileges | ('A' flag) + * close - allows CLOSE | ('B' flag) + * connect - allows local CONNECT | ('C' flag) + * connect:remote - allows remote CONNECT | ('D' flag) + * die - allows DIE | ('E' flag) + * dline - allows DLINE | ('F' flag) + * globops - allows GLOBOPS | ('G' flag) + * join:resv - allows to JOIN resv {} channels | ('H' flag) + * kill - allows to KILL local clients | ('I' flag) + * kill:remote - allows remote users to be /KILL'd | ('J' flag) + * kline - allows KLINE | ('K' flag) + * locops - allows LOCOPS | ('L' flag) + * module - allows MODULE | ('M' flag) + * nick:resv - allows to use NICK on resv {} nicks | ('N' flag) + * opme - allows OPME | ('O' flag) + * rehash - allows oper to REHASH config | ('P' flag) + * rehash:remote - allows oper to remotely REHASH config | ('Q' flag) + * remoteban - allows remote KLINE/UNKLINE | ('R' flag) + * restart - allows RESTART | ('S' flag) + * resv - allows RESV | ('T' flag) + * set - allows SET | ('U' flag) + * squit - allows local SQUIT | ('V' flag) + * squit:remote - allows remote SQUIT | ('W' flag) + * undline - allows UNDLINE | ('X' flag) + * unkline - allows UNKLINE | ('Y' flag) + * unresv - allows UNRESV | ('Z' flag) + * unxline - allows UNXLINE | ('a' flag) + * wallops - allows WALLOPS | ('b' flag) + * xline - allows XLINE | ('c' flag) */ flags = admin, connect, connect:remote, die, globops, kill, kill:remote, kline, module, rehash, restart, set, unkline, unxline, xline; @@ -567,15 +609,14 @@ name = "uplink.example.net"; /* - * host: the host or IP address to connect to. If a hostname is used it - * must match the reverse DNS of the server. + * host: the host or IP address to connect to. If a hostname is used, + * it must match the reverse DNS of the server. */ host = "192.0.2.4"; /* * vhost: the IP address to bind to when making outgoing connections to - * servers. - * serverinfo::vhost and serverinfo::vhost6 will be overridden + * servers. serverinfo::vhost and serverinfo::vhost6 will be overridden * by this directive. */ vhost = "192.0.2.5"; @@ -588,7 +629,7 @@ accept_password = "anotherpassword"; /* - * encrypted: controls whether the accept_password above has been + * encrypted: indicates whether the accept_password above has been * encrypted. */ encrypted = no; @@ -718,6 +759,7 @@ * unkline - allow oper/server to unkline * xline - allow oper/server to xline * unxline - allow oper/server to unxline + * rehash - allow oper/server to rehash * resv - allow oper/server to resv * unresv - allow oper/server to unresv * locops - allow oper/server to locops - only used for servers that cluster @@ -750,6 +792,10 @@ */ exempt { ip = "192.0.2.240/28"; + + /* The 'ip' directives can be stacked */ + ip = "10.0.0.0/8"; + ip = "fc00::/7"; }; /* @@ -803,7 +849,10 @@ * has the same service {} block. */ service { + /* name: the actual name of the service. Wildcards are not allowed. */ name = "service.example.net"; + + /* The 'name' directives can be stacked. */ name = "stats.example.net"; }; @@ -814,7 +863,7 @@ /* command: the actual command/alias. */ command = "IDENTIFY"; - /* prepend: optional text that can be prepended before the user's message. */ + /* prepend: optional text that can be prepended to the user's message. */ prepend = "IDENTIFY "; /* name: the service name, used for error messages. */ @@ -1044,6 +1093,9 @@ /* max_accept: maximum allowed /accept's for +g user mode. */ max_accept = 50; + /* whowas_history_length: maximum length of the WHOWAS nick name history. */ + whowas_history_length = 15000; + /* * dline_min_cidr: the minimum required length of a CIDR bitmask * for IPv4 based D-lines. @@ -1147,7 +1199,7 @@ max_nick_time = 20 seconds; /* - * away_count, away_time: how many AWAY command are permitted per + * away_count, away_time: how many AWAY commands are permitted per * client per away_time. */ away_count = 2; diff -Nru ircd-hybrid-8.2.12+dfsg.1/help/invite ircd-hybrid-8.2.17+dfsg.1/help/invite --- ircd-hybrid-8.2.12+dfsg.1/help/invite 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/help/invite 2016-04-21 18:37:06.000000000 +0000 @@ -1,4 +1,6 @@ -INVITE +INVITE [ ] INVITE sends a notice to the user that you have asked him/her to come to the specified channel. +If used without parameters, it displays a list +of channels you're invited to. diff -Nru ircd-hybrid-8.2.12+dfsg.1/help/Makefile.in ircd-hybrid-8.2.17+dfsg.1/help/Makefile.in --- ircd-hybrid-8.2.12+dfsg.1/help/Makefile.in 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/help/Makefile.in 2016-04-21 18:37:06.000000000 +0000 @@ -96,6 +96,7 @@ $(top_srcdir)/m4/ax_arg_enable_assert.m4 \ $(top_srcdir)/m4/ax_arg_enable_debugging.m4 \ $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \ + $(top_srcdir)/m4/ax_arg_gnutls.m4 \ $(top_srcdir)/m4/ax_arg_ioloop_mechanism.m4 \ $(top_srcdir)/m4/ax_arg_libgeoip.m4 \ $(top_srcdir)/m4/ax_arg_openssl.m4 \ diff -Nru ircd-hybrid-8.2.12+dfsg.1/help/rehash ircd-hybrid-8.2.17+dfsg.1/help/rehash --- ircd-hybrid-8.2.12+dfsg.1/help/rehash 2016-01-05 14:57:44.000000000 +0000 +++ ircd-hybrid-8.2.17+dfsg.1/help/rehash 2016-04-21 18:37:06.000000000 +0000 @@ -1,10 +1,12 @@ -REHASH [option] +REHASH