Attachment #121766 for bug #164822

View | Details | Raw Unified | Return to bug 164822
Collapse All | Expand All

Lines 7-19 Link Here

(-)/root/tmp/exilog/Makefile (-1 / +3 lines)
7		7
8	PORTNAME= exilog	8	PORTNAME= exilog
9	PORTVERSION= 0.5	9	PORTVERSION= 0.5
10	PORTREVISION= 5	10	PORTREVISION= 6
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= http://duncanthrax.net/exilog/	12	MASTER_SITES= http://duncanthrax.net/exilog/
13		13
14	MAINTAINER= ler@lerctr.org	14	MAINTAINER= ler@lerctr.org
15	COMMENT= Tool to centralize and visualize Exim logs with a web front end	15	COMMENT= Tool to centralize and visualize Exim logs with a web front end
16		16
		17	LICENSE= GPLv2
		18
17	RUN_DEPENDS= ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask	19	RUN_DEPENDS= ${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
18		20
19	USE_PERL5= yes	21	USE_PERL5= yes




--- doc/mysql-db-script.sql.orig	2012-02-06 14:35:52.000000000 +0200
+++ doc/mysql-db-script.sql	2012-02-06 14:36:11.000000000 +0200
@@ -20,7 +20,7 @@
   `rcpt` varchar(200) NOT NULL default '',
   `rcpt_intermediate` varchar(200) default NULL,
   `rcpt_final` varchar(200) NOT NULL default '',
-  `host_addr` varchar(15) default NULL,
+  `host_addr` varchar(45) default NULL,
   `host_dns` varchar(255) default NULL,
   `tls_cipher` varchar(128) default NULL,
   `router` varchar(128) default NULL,
@@ -48,7 +48,7 @@
   `rcpt` varchar(200) NOT NULL default '',
   `rcpt_intermediate` varchar(200) default NULL,
   `rcpt_final` varchar(200) NOT NULL default '',
-  `host_addr` varchar(15) default NULL,
+  `host_addr` varchar(45) default NULL,
   `host_dns` varchar(255) default NULL,
   `tls_cipher` varchar(128) default NULL,
   `router` varchar(128) default NULL,
@@ -76,7 +76,7 @@
   `rcpt` varchar(200) NOT NULL default '',
   `rcpt_intermediate` varchar(200) default NULL,
   `rcpt_final` varchar(200) NOT NULL default '',
-  `host_addr` varchar(15) default NULL,
+  `host_addr` varchar(45) default NULL,
   `host_dns` varchar(255) default NULL,
   `tls_cipher` varchar(128) default NULL,
   `router` varchar(128) default NULL,
@@ -104,7 +104,7 @@
   `msgid` varchar(255) default NULL,
   `completed` bigint(20) default NULL,
   `mailfrom` varchar(255) default NULL,
-  `host_addr` varchar(15) default NULL,
+  `host_addr` varchar(45) default NULL,
   `host_rdns` varchar(255) default NULL,
   `host_ident` varchar(255) default NULL,
   `host_helo` varchar(255) default NULL,
@@ -164,7 +164,7 @@
   `server` varchar(32) NOT NULL default '',
   `message_id` varchar(16) binary default NULL,
   `timestamp` bigint(20) NOT NULL default '0',
-  `host_addr` varchar(15) NOT NULL default '',
+  `host_addr` varchar(45) NOT NULL default '',
   `host_rdns` varchar(255) NOT NULL default '',
   `host_ident` varchar(255) default NULL,
   `host_helo` varchar(255) default NULL,
--- exilog_cgi_messages.pm.orig	2012-02-06 14:39:16.000000000 +0200
+++ exilog_cgi_messages.pm	2012-02-06 14:40:02.000000000 +0200
@@ -145,8 +145,8 @@
   }
 
   my @queries;
-  if ($param->{'qs'} =~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/) {
-    # IPv4 address
+  if ($param->{'qs'} =~ /^[0-9A-Fa-f.:]+$/) {
+    # IPv4 or IPv6 address
     push @queries, { 'table' => 'messages',
                      'criteria' => { 'host_addr' => $param->{'qs'} } },
                    { 'table' => 'rejects',

Return to bug 164822

Line 0 Link Here

(-)/root/tmp/exilog/files/patch-ipv6 (+60 lines)
	1	--- doc/mysql-db-script.sql.orig 2012-02-06 14:35:52.000000000 +0200
	2	+++ doc/mysql-db-script.sql 2012-02-06 14:36:11.000000000 +0200
	3	@@ -20,7 +20,7 @@
	4	`rcpt` varchar(200) NOT NULL default '',
	5	`rcpt_intermediate` varchar(200) default NULL,
	6	`rcpt_final` varchar(200) NOT NULL default '',
	7	- `host_addr` varchar(15) default NULL,
	8	+ `host_addr` varchar(45) default NULL,
	9	`host_dns` varchar(255) default NULL,
	10	`tls_cipher` varchar(128) default NULL,
	11	`router` varchar(128) default NULL,
	12	@@ -48,7 +48,7 @@
	13	`rcpt` varchar(200) NOT NULL default '',
	14	`rcpt_intermediate` varchar(200) default NULL,
	15	`rcpt_final` varchar(200) NOT NULL default '',
	16	- `host_addr` varchar(15) default NULL,
	17	+ `host_addr` varchar(45) default NULL,
	18	`host_dns` varchar(255) default NULL,
	19	`tls_cipher` varchar(128) default NULL,
	20	`router` varchar(128) default NULL,
	21	@@ -76,7 +76,7 @@
	22	`rcpt` varchar(200) NOT NULL default '',
	23	`rcpt_intermediate` varchar(200) default NULL,
	24	`rcpt_final` varchar(200) NOT NULL default '',
	25	- `host_addr` varchar(15) default NULL,
	26	+ `host_addr` varchar(45) default NULL,
	27	`host_dns` varchar(255) default NULL,
	28	`tls_cipher` varchar(128) default NULL,
	29	`router` varchar(128) default NULL,
	30	@@ -104,7 +104,7 @@
	31	`msgid` varchar(255) default NULL,
	32	`completed` bigint(20) default NULL,
	33	`mailfrom` varchar(255) default NULL,
	34	- `host_addr` varchar(15) default NULL,
	35	+ `host_addr` varchar(45) default NULL,
	36	`host_rdns` varchar(255) default NULL,
	37	`host_ident` varchar(255) default NULL,
	38	`host_helo` varchar(255) default NULL,
	39	@@ -164,7 +164,7 @@
	40	`server` varchar(32) NOT NULL default '',
	41	`message_id` varchar(16) binary default NULL,
	42	`timestamp` bigint(20) NOT NULL default '0',
	43	- `host_addr` varchar(15) NOT NULL default '',
	44	+ `host_addr` varchar(45) NOT NULL default '',
	45	`host_rdns` varchar(255) NOT NULL default '',
	46	`host_ident` varchar(255) default NULL,
	47	`host_helo` varchar(255) default NULL,
	48	--- exilog_cgi_messages.pm.orig 2012-02-06 14:39:16.000000000 +0200
	49	+++ exilog_cgi_messages.pm 2012-02-06 14:40:02.000000000 +0200
	50	@@ -145,8 +145,8 @@
	51	}
	52
	53	my @queries;
	54	- if ($param->{'qs'} =~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/) {
	55	- # IPv4 address
	56	+ if ($param->{'qs'} =~ /^[0-9A-Fa-f.:]+$/) {
	57	+ # IPv4 or IPv6 address
	58	push @queries, { 'table' => 'messages',
	59	'criteria' => { 'host_addr' => $param->{'qs'} } },
	60	{ 'table' => 'rejects',