From 04f832b7783aa1973717135a04aaa89d62b12e25 Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Sun, 6 Mar 2016 23:57:10 -0600
Subject: [PATCH] Bump all extensions to AV2

Most do not yet have descriptions, but that's trivial.
---
 extensions/createauthonly.c           | 2 +-
 extensions/createoperonly.c           | 2 +-
 extensions/example_module.c           | 2 +-
 extensions/extb_account.c             | 2 +-
 extensions/extb_canjoin.c             | 2 +-
 extensions/extb_channel.c             | 2 +-
 extensions/extb_combi.c               | 2 +-
 extensions/extb_extgecos.c            | 2 +-
 extensions/extb_hostmask.c            | 2 +-
 extensions/extb_oper.c                | 2 +-
 extensions/extb_realname.c            | 2 +-
 extensions/extb_server.c              | 2 +-
 extensions/extb_ssl.c                 | 2 +-
 extensions/extb_usermode.c            | 2 +-
 extensions/force_user_invis.c         | 2 +-
 extensions/helpops.c                  | 2 +-
 extensions/hide_uncommon_channels.c   | 2 +-
 extensions/hurt.c                     | 2 +-
 extensions/ip_cloaking.c              | 2 +-
 extensions/ip_cloaking_3.0.c          | 2 +-
 extensions/ip_cloaking_4.0.c          | 2 +-
 extensions/ip_cloaking_old.c          | 2 +-
 extensions/m_42.c                     | 2 +-
 extensions/m_adminwall.c              | 2 +-
 extensions/m_echotags.c               | 2 +-
 extensions/m_extendchans.c            | 2 +-
 extensions/m_findforwards.c           | 2 +-
 extensions/m_identify.c               | 2 +-
 extensions/m_mkpasswd.c               | 2 +-
 extensions/m_ojoin.c                  | 2 +-
 extensions/m_okick.c                  | 2 +-
 extensions/m_omode.c                  | 2 +-
 extensions/m_opme.c                   | 2 +-
 extensions/m_roleplay.c               | 2 +-
 extensions/m_sendbans.c               | 2 +-
 extensions/m_webirc.c                 | 2 +-
 extensions/no_locops.c                | 2 +-
 extensions/no_oper_invis.c            | 2 +-
 extensions/override.c                 | 2 +-
 extensions/restrict-unauthenticated.c | 2 +-
 extensions/sno_channelcreate.c        | 2 +-
 extensions/sno_farconnect.c           | 2 +-
 extensions/sno_globalkline.c          | 2 +-
 extensions/sno_globalnickchange.c     | 2 +-
 extensions/sno_globaloper.c           | 2 +-
 extensions/sno_whois.c                | 2 +-
 extensions/spy_admin_notice.c         | 2 +-
 extensions/spy_info_notice.c          | 2 +-
 extensions/spy_links_notice.c         | 2 +-
 extensions/spy_motd_notice.c          | 2 +-
 extensions/spy_stats_notice.c         | 2 +-
 extensions/spy_stats_p_notice.c       | 2 +-
 extensions/spy_trace_notice.c         | 2 +-
 53 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/extensions/createauthonly.c b/extensions/createauthonly.c
index 2526c491..bd0f2e33 100644
--- a/extensions/createauthonly.c
+++ b/extensions/createauthonly.c
@@ -23,7 +23,7 @@ mapi_hfn_list_av1 restrict_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(createauthonly, NULL, NULL, NULL, NULL, restrict_hfnlist, "$Revision: 833 $");
+DECLARE_MODULE_AV2(createauthonly, NULL, NULL, NULL, NULL, restrict_hfnlist, NULL, NULL, NULL);
 
 static void
 h_can_create_channel_authenticated(hook_data_client_approval *data)
diff --git a/extensions/createoperonly.c b/extensions/createoperonly.c
index e192d062..1fdb41d3 100644
--- a/extensions/createoperonly.c
+++ b/extensions/createoperonly.c
@@ -23,7 +23,7 @@ mapi_hfn_list_av1 restrict_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(createoperonly, NULL, NULL, NULL, NULL, restrict_hfnlist, "$Revision: 3476 $");
+DECLARE_MODULE_AV2(createoperonly, NULL, NULL, NULL, NULL, restrict_hfnlist, NULL, NULL, NULL);
 
 static void
 h_can_create_channel_authenticated(hook_data_client_approval *data)
diff --git a/extensions/example_module.c b/extensions/example_module.c
index 87ba344b..a51d88f3 100644
--- a/extensions/example_module.c
+++ b/extensions/example_module.c
@@ -142,7 +142,7 @@ DECLARE_MODULE_AV1(
 			  /* Then the hook function list, if we have one */
 			  test_hfnlist,
 			  /* And finally the version number of this module. */
-			  "$Revision: 3161 $");
+			  NULL);
 
 /* Any of the above arguments can be NULL to indicate they aren't used. */
 
diff --git a/extensions/extb_account.c b/extensions/extb_account.c
index a3a374a9..b9e1560e 100644
--- a/extensions/extb_account.c
+++ b/extensions/extb_account.c
@@ -12,7 +12,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_account(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_account, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_account, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_canjoin.c b/extensions/extb_canjoin.c
index 186b52bb..de7c8dc4 100644
--- a/extensions/extb_canjoin.c
+++ b/extensions/extb_canjoin.c
@@ -15,7 +15,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_canjoin(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_canjoin, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1841 $");
+DECLARE_MODULE_AV2(extb_canjoin, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_channel.c b/extensions/extb_channel.c
index d669d0a5..36af6f13 100644
--- a/extensions/extb_channel.c
+++ b/extensions/extb_channel.c
@@ -14,7 +14,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_channel(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_channel, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1723 $");
+DECLARE_MODULE_AV2(extb_channel, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_combi.c b/extensions/extb_combi.c
index 1e9d3583..4b9a2a4c 100644
--- a/extensions/extb_combi.c
+++ b/extensions/extb_combi.c
@@ -53,7 +53,7 @@ static int eb_and(const char *data, struct Client *client_p, struct Channel *chp
 static int eb_combi(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type, int is_and);
 static int recursion_depth = 0;
 
-DECLARE_MODULE_AV1(extb_extended, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1 $");
+DECLARE_MODULE_AV2(extb_extended, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_extgecos.c b/extensions/extb_extgecos.c
index 943af37f..f1090fc2 100644
--- a/extensions/extb_extgecos.c
+++ b/extensions/extb_extgecos.c
@@ -13,7 +13,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_extended(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_extended, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1339 $");
+DECLARE_MODULE_AV2(extb_extended, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_hostmask.c b/extensions/extb_hostmask.c
index f376ffc6..d853f75a 100644
--- a/extensions/extb_hostmask.c
+++ b/extensions/extb_hostmask.c
@@ -13,7 +13,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_hostmask(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_hostmask, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_hostmask, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_oper.c b/extensions/extb_oper.c
index 0b257332..1022d56d 100644
--- a/extensions/extb_oper.c
+++ b/extensions/extb_oper.c
@@ -14,7 +14,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_oper(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_oper, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_oper, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_realname.c b/extensions/extb_realname.c
index f60a4d5e..13c09b08 100644
--- a/extensions/extb_realname.c
+++ b/extensions/extb_realname.c
@@ -12,7 +12,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_realname(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_realname, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_realname, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_server.c b/extensions/extb_server.c
index 1e56c57d..e8b5a1a7 100644
--- a/extensions/extb_server.c
+++ b/extensions/extb_server.c
@@ -12,7 +12,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_server(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_server, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_server, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_ssl.c b/extensions/extb_ssl.c
index 73e835b1..20e18786 100644
--- a/extensions/extb_ssl.c
+++ b/extensions/extb_ssl.c
@@ -9,7 +9,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_ssl(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_ssl, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(extb_ssl, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/extb_usermode.c b/extensions/extb_usermode.c
index eb087b31..79542f86 100644
--- a/extensions/extb_usermode.c
+++ b/extensions/extb_usermode.c
@@ -19,7 +19,7 @@ static int _modinit(void);
 static void _moddeinit(void);
 static int eb_usermode(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_usermode, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_usermode, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/force_user_invis.c b/extensions/force_user_invis.c
index a2c8247b..7a7d6fb8 100644
--- a/extensions/force_user_invis.c
+++ b/extensions/force_user_invis.c
@@ -22,7 +22,7 @@ mapi_hfn_list_av1 noi_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(force_user_invis, NULL, NULL, NULL, NULL, noi_hfnlist, "1.0.0");
+DECLARE_MODULE_AV2(force_user_invis, NULL, NULL, NULL, NULL, noi_hfnlist, NULL, NULL, NULL);
 
 static void
 h_noi_umode_changed(hook_data_umode_changed *hdata)
diff --git a/extensions/helpops.c b/extensions/helpops.c
index 2dad817c..4eb942b0 100644
--- a/extensions/helpops.c
+++ b/extensions/helpops.c
@@ -200,4 +200,4 @@ h_hdl_whois(hook_data_client *hdata)
 	}
 }
 
-DECLARE_MODULE_AV1(helpops, _modinit, _moddeinit, helpops_clist, NULL, helpops_hfnlist, "");
+DECLARE_MODULE_AV2(helpops, _modinit, _moddeinit, helpops_clist, NULL, helpops_hfnlist, NULL, NULL, NULL);
diff --git a/extensions/hide_uncommon_channels.c b/extensions/hide_uncommon_channels.c
index 3ba6b3ee..ff3c33e9 100644
--- a/extensions/hide_uncommon_channels.c
+++ b/extensions/hide_uncommon_channels.c
@@ -19,7 +19,7 @@ mapi_hfn_list_av1 huc_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(hide_uncommon_channels, NULL, NULL, NULL, NULL, huc_hfnlist, "");
+DECLARE_MODULE_AV2(hide_uncommon_channels, NULL, NULL, NULL, NULL, huc_hfnlist, NULL, NULL, NULL);
 
 static void
 h_huc_doing_whois_channel_visibility(hook_data_client *hdata)
diff --git a/extensions/hurt.c b/extensions/hurt.c
index 46b700e6..9181c6ca 100644
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -113,7 +113,7 @@ DECLARE_MODULE_AV1(
 	hurt_clist,
 	NULL,
 	hurt_hfnlist,
-	"$Revision: 3161 $"
+	NULL
 );
 /* }}} */
 
diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index 8aa872c6..9e9dbc22 100644
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -44,7 +44,7 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 };
 
 DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, "$Revision: 3526 $");
+			ip_cloaking_hfnlist, NULL);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_3.0.c b/extensions/ip_cloaking_3.0.c
index a63be747..dbb17655 100644
--- a/extensions/ip_cloaking_3.0.c
+++ b/extensions/ip_cloaking_3.0.c
@@ -40,7 +40,7 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 };
 
 DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, "$Revision: 3526 $");
+			ip_cloaking_hfnlist, NULL);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_4.0.c b/extensions/ip_cloaking_4.0.c
index df9a4117..1f51ab5f 100644
--- a/extensions/ip_cloaking_4.0.c
+++ b/extensions/ip_cloaking_4.0.c
@@ -44,7 +44,7 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 };
 
 DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, "$Revision: 3526 $");
+			ip_cloaking_hfnlist, NULL);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index c0b25ac8..6dc40b73 100644
--- a/extensions/ip_cloaking_old.c
+++ b/extensions/ip_cloaking_old.c
@@ -40,7 +40,7 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 };
 
 DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, "$Revision: 3522 $");
+			ip_cloaking_hfnlist, NULL);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/m_42.c b/extensions/m_42.c
index d9a07861..682acaa0 100644
--- a/extensions/m_42.c
+++ b/extensions/m_42.c
@@ -21,7 +21,7 @@ struct Message hgtg_msgtab = {
 mapi_clist_av1 hgtg_clist[] = { &hgtg_msgtab, NULL };
 
 
-DECLARE_MODULE_AV1(42, NULL, NULL, hgtg_clist, NULL, NULL, "Revision 0.42");
+DECLARE_MODULE_AV2(42, NULL, NULL, hgtg_clist, NULL, NULL, NULL, "42", NULL);
 
 
 static int
diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index 6978a871..9f492f9f 100644
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -47,7 +47,7 @@ struct Message adminwall_msgtab = {
 
 
 mapi_clist_av1 adminwall_clist[] = { &adminwall_msgtab, NULL };
-DECLARE_MODULE_AV1(adminwall, NULL, NULL, adminwall_clist, NULL, NULL, "$Revision: 20702 $");
+DECLARE_MODULE_AV2(adminwall, NULL, NULL, adminwall_clist, NULL, NULL, NULL, NULL, NULL);
 
 
 /*
diff --git a/extensions/m_echotags.c b/extensions/m_echotags.c
index dd363d43..c000a080 100644
--- a/extensions/m_echotags.c
+++ b/extensions/m_echotags.c
@@ -13,7 +13,7 @@ struct Message echotags_msgtab = {
 
 mapi_clist_av1 echotags_clist[] = { &echotags_msgtab, NULL };
 
-DECLARE_MODULE_AV1(echotags, NULL, NULL, echotags_clist, NULL, NULL, "$Id$");
+DECLARE_MODULE_AV2(echotags, NULL, NULL, echotags_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 m_echotags(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/extensions/m_extendchans.c b/extensions/m_extendchans.c
index 1db67e8b..939edbf9 100644
--- a/extensions/m_extendchans.c
+++ b/extensions/m_extendchans.c
@@ -41,7 +41,7 @@ struct Message extendchans_msgtab = {
 
 mapi_clist_av1 extendchans_clist[] = { &extendchans_msgtab, NULL };
 
-DECLARE_MODULE_AV1(extendchans, NULL, NULL, extendchans_clist, NULL, NULL, "$Revision: $");
+DECLARE_MODULE_AV2(extendchans, NULL, NULL, extendchans_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 mo_extendchans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index 686f7ec6..09a65519 100644
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -44,7 +44,7 @@ struct Message findforwards_msgtab = {
 
 mapi_clist_av1 findforwards_clist[] = { &findforwards_msgtab, NULL };
 
-DECLARE_MODULE_AV1(findforwards, NULL, NULL, findforwards_clist, NULL, NULL, "$Revision: 986 $");
+DECLARE_MODULE_AV2(findforwards, NULL, NULL, findforwards_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** mo_findforwards
diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index ba895780..9f2cb5ff 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -59,7 +59,7 @@ mapi_clist_av1 identify_clist[] = {
 	NULL
 };
 
-DECLARE_MODULE_AV1(identify, NULL, NULL, identify_clist, NULL, NULL, "$Revision: 2729 $");
+DECLARE_MODULE_AV2(identify, NULL, NULL, identify_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int m_identify(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index d1ffaf01..5981fbcc 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -36,7 +36,7 @@ struct Message mkpasswd_msgtab = {
 
 mapi_clist_av1 mkpasswd_clist[] = { &mkpasswd_msgtab, NULL };
 
-DECLARE_MODULE_AV1(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, NULL, NULL, NULL);
 
 
 /* m_mkpasswd - mkpasswd message handler
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index da940639..7a1a29b9 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -45,7 +45,7 @@ struct Message ojoin_msgtab = {
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554 $");
+DECLARE_MODULE_AV2(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** mo_ojoin
diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index a2aab63f..b5397a09 100644
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -48,7 +48,7 @@ struct Message okick_msgtab = {
 
 mapi_clist_av1 okick_clist[] = { &okick_msgtab, NULL };
 
-DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3554 $");
+DECLARE_MODULE_AV2(okick, NULL, NULL, okick_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** m_okick
diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index aed728a2..fdc141ed 100644
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -51,7 +51,7 @@ struct Message omode_msgtab = {
 
 mapi_clist_av1 omode_clist[] = { &omode_msgtab, NULL };
 
-DECLARE_MODULE_AV1(omode, NULL, NULL, omode_clist, NULL, NULL, "$Revision: 3121 $");
+DECLARE_MODULE_AV2(omode, NULL, NULL, omode_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_omode - MODE command handler
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 1c836214..11be4dbe 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -43,7 +43,7 @@ struct Message opme_msgtab = {
 
 mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
 
-DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $");
+DECLARE_MODULE_AV2(opme, NULL, NULL, opme_clist, NULL, NULL, NULL, NULL, NULL);
 
 
 /*
diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 3b2f47ab..0e3f8709 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -95,7 +95,7 @@ struct Message roleplay_msgtab = {
 
 mapi_clist_av1 roleplay_clist[] = { &scene_msgtab, &ambiance_msgtab, &fsay_msgtab, &faction_msgtab, &npc_msgtab, &npca_msgtab, &roleplay_msgtab, NULL };
 
-DECLARE_MODULE_AV1(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, "$m_roleplay$");
+DECLARE_MODULE_AV2(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/extensions/m_sendbans.c b/extensions/m_sendbans.c
index 882c82ec..ec9d049e 100644
--- a/extensions/m_sendbans.c
+++ b/extensions/m_sendbans.c
@@ -57,7 +57,7 @@ mapi_clist_av1 sendbans_clist[] = {
 	NULL
 };
 
-DECLARE_MODULE_AV1(sendbans, NULL, NULL, sendbans_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(sendbans, NULL, NULL, sendbans_clist, NULL, NULL, NULL, NULL, NULL);
 
 static const char *expand_xline(const char *mask)
 {
diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 5985eec7..c2bcf809 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -61,7 +61,7 @@ struct Message webirc_msgtab = {
 };
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
-DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 20702 $");
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mr_webirc - webirc message handler
diff --git a/extensions/no_locops.c b/extensions/no_locops.c
index e71b9249..e8635044 100644
--- a/extensions/no_locops.c
+++ b/extensions/no_locops.c
@@ -19,7 +19,7 @@ mapi_hfn_list_av1 nl_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(no_locops, NULL, NULL, NULL, NULL, nl_hfnlist, "$Revision: 3219 $");
+DECLARE_MODULE_AV2(no_locops, NULL, NULL, NULL, NULL, nl_hfnlist, NULL, NULL, NULL);
 
 static void
 h_nl_umode_changed(hook_data_umode_changed *hdata)
diff --git a/extensions/no_oper_invis.c b/extensions/no_oper_invis.c
index 98c9cb03..a89f742b 100644
--- a/extensions/no_oper_invis.c
+++ b/extensions/no_oper_invis.c
@@ -20,7 +20,7 @@ mapi_hfn_list_av1 noi_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(no_oper_invis, NULL, NULL, NULL, NULL, noi_hfnlist, "$Revision: 3219 $");
+DECLARE_MODULE_AV2(no_oper_invis, NULL, NULL, NULL, NULL, noi_hfnlist, NULL, NULL, NULL);
 
 static void
 h_noi_umode_changed(hook_data_umode_changed *hdata)
diff --git a/extensions/override.c b/extensions/override.c
index cd40ebee..f2a67e64 100644
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -278,4 +278,4 @@ _moddeinit(void)
 }
 
 DECLARE_MODULE_AV1(override, _modinit, _moddeinit, NULL, NULL,
-			override_hfnlist, "$Revision: 3526 $");
+			override_hfnlist, NULL);
diff --git a/extensions/restrict-unauthenticated.c b/extensions/restrict-unauthenticated.c
index 14ffc369..5daacacd 100644
--- a/extensions/restrict-unauthenticated.c
+++ b/extensions/restrict-unauthenticated.c
@@ -36,4 +36,4 @@ hack_channel_access(void *vdata)
 }
 
 DECLARE_MODULE_AV1(restrict_unauthenticated, NULL, NULL, NULL, NULL,
-			restrict_unauthenticated_hfnlist, "$Revision: 3526 $");
+			restrict_unauthenticated_hfnlist, NULL);
diff --git a/extensions/sno_channelcreate.c b/extensions/sno_channelcreate.c
index d9f9259a..58627999 100644
--- a/extensions/sno_channelcreate.c
+++ b/extensions/sno_channelcreate.c
@@ -21,7 +21,7 @@ mapi_hfn_list_av1 scc_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(sno_channelcreate, _modinit, _moddeinit, NULL, NULL, scc_hfnlist, "$Revision: 639 $");
+DECLARE_MODULE_AV2(sno_channelcreate, _modinit, _moddeinit, NULL, NULL, scc_hfnlist, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/sno_farconnect.c b/extensions/sno_farconnect.c
index 6bb46ecc..d1c1a900 100644
--- a/extensions/sno_farconnect.c
+++ b/extensions/sno_farconnect.c
@@ -26,7 +26,7 @@ mapi_hfn_list_av1 gcn_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(globalconnexit, _modinit, _moddeinit, NULL, NULL, gcn_hfnlist, "$Revision: 1869 $");
+DECLARE_MODULE_AV2(globalconnexit, _modinit, _moddeinit, NULL, NULL, gcn_hfnlist, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/sno_globalkline.c b/extensions/sno_globalkline.c
index ca78344d..630b0607 100644
--- a/extensions/sno_globalkline.c
+++ b/extensions/sno_globalkline.c
@@ -22,7 +22,7 @@ mapi_hfn_list_av1 gla_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(globallineactive, NULL, NULL, NULL, NULL, gla_hfnlist, "$Revision: 613 $");
+DECLARE_MODULE_AV2(globallineactive, NULL, NULL, NULL, NULL, gla_hfnlist, NULL, NULL, NULL);
 
 static void
 h_gla_client_exit(hook_data_client_exit *hdata)
diff --git a/extensions/sno_globalnickchange.c b/extensions/sno_globalnickchange.c
index dd01d8f6..3d75e8ad 100644
--- a/extensions/sno_globalnickchange.c
+++ b/extensions/sno_globalnickchange.c
@@ -19,7 +19,7 @@ mapi_hfn_list_av1 gcn_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(globalnickchange, _modinit, NULL, NULL, NULL, gcn_hfnlist, "$Revision: 1869 $");
+DECLARE_MODULE_AV2(globalnickchange, _modinit, NULL, NULL, NULL, gcn_hfnlist, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/extensions/sno_globaloper.c b/extensions/sno_globaloper.c
index 9774e68d..97509443 100644
--- a/extensions/sno_globaloper.c
+++ b/extensions/sno_globaloper.c
@@ -18,7 +18,7 @@ mapi_hfn_list_av1 sgo_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(sno_globaloper, NULL, NULL, NULL, NULL, sgo_hfnlist, "$Revision: 639 $");
+DECLARE_MODULE_AV2(sno_globaloper, NULL, NULL, NULL, NULL, sgo_hfnlist, NULL, NULL, NULL);
 
 static void
 h_sgo_umode_changed(void *vdata)
diff --git a/extensions/sno_whois.c b/extensions/sno_whois.c
index 3e6e7203..93c07c8e 100644
--- a/extensions/sno_whois.c
+++ b/extensions/sno_whois.c
@@ -38,7 +38,7 @@ fini(void)
 	snomask_modes['W'] = 0;
 }
 
-DECLARE_MODULE_AV1(sno_whois, init, fini, NULL, NULL, whois_hfnlist, "$Revision: 3498 $");
+DECLARE_MODULE_AV2(sno_whois, init, fini, NULL, NULL, whois_hfnlist, NULL, NULL, NULL);
 
 void
 show_whois(hook_data_client *data)
diff --git a/extensions/spy_admin_notice.c b/extensions/spy_admin_notice.c
index e09f43e0..3bc706ac 100644
--- a/extensions/spy_admin_notice.c
+++ b/extensions/spy_admin_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 admin_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(admin_spy, NULL, NULL, NULL, NULL, admin_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(admin_spy, NULL, NULL, NULL, NULL, admin_hfnlist, NULL, NULL, NULL);
 
 void
 show_admin(hook_data *data)
diff --git a/extensions/spy_info_notice.c b/extensions/spy_info_notice.c
index 2c447096..b23dfab3 100644
--- a/extensions/spy_info_notice.c
+++ b/extensions/spy_info_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 info_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(info_spy, NULL, NULL, NULL, NULL, info_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(info_spy, NULL, NULL, NULL, NULL, info_hfnlist, NULL, NULL, NULL);
 
 void
 show_info(hook_data *data)
diff --git a/extensions/spy_links_notice.c b/extensions/spy_links_notice.c
index c0d7bb3f..ffe718c6 100644
--- a/extensions/spy_links_notice.c
+++ b/extensions/spy_links_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 links_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(links_spy, NULL, NULL, NULL, NULL, links_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(links_spy, NULL, NULL, NULL, NULL, links_hfnlist, NULL, NULL, NULL);
 
 void
 show_links(hook_data *data)
diff --git a/extensions/spy_motd_notice.c b/extensions/spy_motd_notice.c
index cf41b8b2..51471787 100644
--- a/extensions/spy_motd_notice.c
+++ b/extensions/spy_motd_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 motd_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(motd_spy, NULL, NULL, NULL, NULL, motd_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(motd_spy, NULL, NULL, NULL, NULL, motd_hfnlist, NULL, NULL, NULL);
 
 void
 show_motd(hook_data *data)
diff --git a/extensions/spy_stats_notice.c b/extensions/spy_stats_notice.c
index f104800c..73c63e5c 100644
--- a/extensions/spy_stats_notice.c
+++ b/extensions/spy_stats_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 stats_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(stats_spy, NULL, NULL, NULL, NULL, stats_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(stats_spy, NULL, NULL, NULL, NULL, stats_hfnlist, NULL, NULL, NULL);
 
 void
 show_stats(hook_data_int *data)
diff --git a/extensions/spy_stats_p_notice.c b/extensions/spy_stats_p_notice.c
index d31ecb44..b5b4524d 100644
--- a/extensions/spy_stats_p_notice.c
+++ b/extensions/spy_stats_p_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 stats_p_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(stats_p_spy, NULL, NULL, NULL, NULL, stats_p_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(stats_p_spy, NULL, NULL, NULL, NULL, stats_p_hfnlist, NULL, NULL, NULL);
 
 void
 show_stats_p(hook_data *data)
diff --git a/extensions/spy_trace_notice.c b/extensions/spy_trace_notice.c
index 55d654c3..d7f830fd 100644
--- a/extensions/spy_trace_notice.c
+++ b/extensions/spy_trace_notice.c
@@ -33,7 +33,7 @@ mapi_hfn_list_av1 trace_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(trace_spy, NULL, NULL, NULL, NULL, trace_hfnlist, "$Revision: 498 $");
+DECLARE_MODULE_AV2(trace_spy, NULL, NULL, NULL, NULL, trace_hfnlist, NULL, NULL, NULL);
 
 void
 show_trace(hook_data_client *data)