Attachment 179261 Details for Bug 216412 – isoqlog-2.2.1_1.patch

[patch] isoqlog-2.2.1_1.patch

isoqlog-2.2.1_1.patch (text/plain), 9.94 KB, created by Danilo G. Baio on 2017-01-23 18:19:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2017-01-23 18:19:21 UTC

Size: 9.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 432217)
>+++ Makefile	(working copy)
>@@ -5,14 +5,13 @@
> PORTVERSION=	2.2.1
> PORTREVISION=	1
> CATEGORIES=	mail
>-MASTER_SITES=	http://www.enderunix.org/isoqlog/ \
>-		http://www.trunix.org/projeler/isoqlog/ \
>-		http://www.acikkod.org/softwares/
>+MASTER_SITES=	http://www.enderunix.org/isoqlog/
> 
> MAINTAINER=	dbaio@bsd.com.br
> COMMENT=	Qmail, postfix, sendmail, exim MTA log analysis program
> 
> LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> GNU_CONFIGURE=	yes
> USES=	gmake
>@@ -21,4 +20,6 @@
> 
> SUB_FILES=	pkg-message
> 
>+PORTDOCS=	*
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 432217)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1485186885
> SHA256 (isoqlog-2.2.1.tar.gz) = 4d0bfb35c3820cdf114a0fb2ed75aa56d11b30f60e527dfe88a918eae0c6b810
> SIZE (isoqlog-2.2.1.tar.gz) = 159555
>Index: files/patch-Data.c
>===================================================================
>--- files/patch-Data.c	(revision 432217)
>+++ files/patch-Data.c	(nonexistent)
>@@ -1,119 +0,0 @@
>---- isoqlog/Data.c.orig	2010-08-09 16:54:25.000000000 +0200
>-+++ isoqlog/Data.c	2010-08-09 17:00:37.000000000 +0200
>-@@ -173,34 +173,35 @@
>- 
>- int addUserToSortTab(user *usr)
>- {
>--	int *u;
>-+	user* *u;
>- 
>- 	if (SortDomain.allusers == NULL) { /* first time */
>--		SortDomain.allusers = (int *)malloc(NVINIT * sizeof(int *));
>-+		SortDomain.allusers = malloc(NVINIT * sizeof(user**));
>- 		if (SortDomain.allusers == NULL)
>- 			return -1;
>- 		SortDomain.max = NVINIT;
>- 		SortDomain.nval = 0;
>- 	} else
>- 	if (SortDomain.nval >= SortDomain.max) { /* growing....*/
>--		u = (int *)realloc(SortDomain.allusers,
>--				(NVGROW * SortDomain.max) * sizeof(int *));
>-+		u = realloc(SortDomain.allusers,
>-+				(NVGROW * SortDomain.max) * sizeof(user**));
>- 		if (u == NULL)
>- 			return -1;
>- 		SortDomain.max *= NVGROW;
>- 		SortDomain.allusers = u;
>- 	}
>--	SortDomain.allusers[SortDomain.nval] = (int)usr;
>-+	SortDomain.allusers[SortDomain.nval] = usr;
>- 	return SortDomain.nval++;
>- }
>- 
>- 
>- void sortDomainUsersFrom(char *domain) 
>- {
>--	int tmpnval, i, j, max, tmp;
>-+	int tmpnval, i, j, max;
>- 	struct domain *domainptr;
>- 	struct user *sym;
>- 	struct user *tmp1, *tmp2;
>-+	user* tmp;
>- 
>- 	tmpnval = -1;
>- 	for (i = 0; i < DomainsTab.nval; i++) 
>-@@ -233,10 +234,11 @@
>- 
>- void sortDomainUsersTo(char *domain) 
>- {
>--	int tmpnval, i, j, max, tmp;
>-+	int tmpnval, i, j, max;
>- 	struct domain *domainptr;
>- 	struct user *sym;
>- 	struct user *tmp1, *tmp2;
>-+	user* tmp;
>- 
>- 	tmpnval = -1;
>- 	for (i = 0; i < DomainsTab.nval; i++) 
>-@@ -268,10 +270,11 @@
>- 
>- void sortDomainUsersTotal(char *domain) 
>- {
>--	int tmpnval, i, j, max, tmp;
>-+	int tmpnval, i, j, max;
>- 	struct domain *domainptr;
>- 	struct user *sym;
>- 	struct user *tmp1, *tmp2;
>-+	user * tmp;
>- 
>- 	tmpnval = -1;
>- 	for (i = 0; i < DomainsTab.nval; i++) 
>-@@ -307,10 +310,11 @@
>- 
>- void sortDomainUsersByte(char *domain) 
>- {
>--	int tmpnval, i, j, max, tmp;
>-+	int tmpnval, i, j, max;
>- 	struct domain *domainptr;
>- 	struct user *sym;
>- 	struct user *tmp1, *tmp2;
>-+	user *tmp;
>- 
>- 	tmpnval = -1;
>- 	for (i = 0; i < DomainsTab.nval; i++) 
>-@@ -345,7 +349,7 @@
>- {
>- 	int i, j, max;
>- 	globuser *sym;
>--	int tmp;
>-+	user *tmp;
>- 	user *tmp1;
>- 	user *tmp2;
>- 
>-@@ -373,7 +377,7 @@
>- {
>- 	int i, j, max;
>- 	globuser *sym;
>--	int tmp;
>-+	user *tmp;
>- 	user *tmp1;
>- 	user *tmp2;
>- 
>-@@ -402,7 +406,7 @@
>- {
>- 	int i, j, max;
>- 	globuser *sym;
>--	int tmp;
>-+	user *tmp;
>- 	user *tmp1;
>- 	user *tmp2;
>- 
>-@@ -430,7 +434,7 @@
>- {
>- 	int i, j, max;
>- 	globuser *sym;
>--	int tmp;
>-+	user *tmp;
>- 	user *tmp1;
>- 	user *tmp2;
>- 
>
>Property changes on: files/patch-Data.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-Data.h
>===================================================================
>--- files/patch-Data.h	(revision 432217)
>+++ files/patch-Data.h	(nonexistent)
>@@ -1,20 +0,0 @@
>---- isoqlog/Data.h.orig	2010-08-09 16:53:36.000000000 +0200
>-+++ isoqlog/Data.h	2010-08-09 16:53:40.000000000 +0200
>-@@ -99,7 +99,7 @@
>- struct UsersTab {
>- 	int nval;
>- 	int max;
>--	int *allusers;
>-+	user**allusers;
>- } UsersTab;
>- 
>- 
>-@@ -107,7 +107,7 @@
>- struct SortDomain {
>- 	int nval;
>- 	int max;
>--	int *allusers;
>-+	user**allusers;
>- } SortDomain;
>- 	
>- #endif
>
>Property changes on: files/patch-Data.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-isoqlog_Data.c
>===================================================================
>--- files/patch-isoqlog_Data.c	(nonexistent)
>+++ files/patch-isoqlog_Data.c	(working copy)
>@@ -0,0 +1,119 @@
>+--- isoqlog/Data.c.orig	2004-04-10 09:00:30 UTC
>++++ isoqlog/Data.c
>+@@ -173,34 +173,35 @@ void freeSortDomainTab() 
>+ 
>+ int addUserToSortTab(user *usr)
>+ {
>+-	int *u;
>++	user* *u;
>+ 
>+ 	if (SortDomain.allusers == NULL) { /* first time */
>+-		SortDomain.allusers = (int *)malloc(NVINIT * sizeof(int *));
>++		SortDomain.allusers = malloc(NVINIT * sizeof(user**));
>+ 		if (SortDomain.allusers == NULL)
>+ 			return -1;
>+ 		SortDomain.max = NVINIT;
>+ 		SortDomain.nval = 0;
>+ 	} else
>+ 	if (SortDomain.nval >= SortDomain.max) { /* growing....*/
>+-		u = (int *)realloc(SortDomain.allusers,
>+-				(NVGROW * SortDomain.max) * sizeof(int *));
>++		u = realloc(SortDomain.allusers,
>++				(NVGROW * SortDomain.max) * sizeof(user**));
>+ 		if (u == NULL)
>+ 			return -1;
>+ 		SortDomain.max *= NVGROW;
>+ 		SortDomain.allusers = u;
>+ 	}
>+-	SortDomain.allusers[SortDomain.nval] = (int)usr;
>++	SortDomain.allusers[SortDomain.nval] = usr;
>+ 	return SortDomain.nval++;
>+ }
>+ 
>+ 
>+ void sortDomainUsersFrom(char *domain) 
>+ {
>+-	int tmpnval, i, j, max, tmp;
>++	int tmpnval, i, j, max;
>+ 	struct domain *domainptr;
>+ 	struct user *sym;
>+ 	struct user *tmp1, *tmp2;
>++	user* tmp;
>+ 
>+ 	tmpnval = -1;
>+ 	for (i = 0; i < DomainsTab.nval; i++) 
>+@@ -233,10 +234,11 @@ void sortDomainUsersFrom(char *domain) 
>+ 
>+ void sortDomainUsersTo(char *domain) 
>+ {
>+-	int tmpnval, i, j, max, tmp;
>++	int tmpnval, i, j, max;
>+ 	struct domain *domainptr;
>+ 	struct user *sym;
>+ 	struct user *tmp1, *tmp2;
>++	user* tmp;
>+ 
>+ 	tmpnval = -1;
>+ 	for (i = 0; i < DomainsTab.nval; i++) 
>+@@ -268,10 +270,11 @@ void sortDomainUsersTo(char *domain) 
>+ 
>+ void sortDomainUsersTotal(char *domain) 
>+ {
>+-	int tmpnval, i, j, max, tmp;
>++	int tmpnval, i, j, max;
>+ 	struct domain *domainptr;
>+ 	struct user *sym;
>+ 	struct user *tmp1, *tmp2;
>++	user * tmp;
>+ 
>+ 	tmpnval = -1;
>+ 	for (i = 0; i < DomainsTab.nval; i++) 
>+@@ -307,10 +310,11 @@ void sortDomainUsersTotal(char *domain) 
>+ 
>+ void sortDomainUsersByte(char *domain) 
>+ {
>+-	int tmpnval, i, j, max, tmp;
>++	int tmpnval, i, j, max;
>+ 	struct domain *domainptr;
>+ 	struct user *sym;
>+ 	struct user *tmp1, *tmp2;
>++	user *tmp;
>+ 
>+ 	tmpnval = -1;
>+ 	for (i = 0; i < DomainsTab.nval; i++) 
>+@@ -345,7 +349,7 @@ void sortUsersFrom()
>+ {
>+ 	int i, j, max;
>+ 	globuser *sym;
>+-	int tmp;
>++	user *tmp;
>+ 	user *tmp1;
>+ 	user *tmp2;
>+ 
>+@@ -373,7 +377,7 @@ void sortUsersTo()
>+ {
>+ 	int i, j, max;
>+ 	globuser *sym;
>+-	int tmp;
>++	user *tmp;
>+ 	user *tmp1;
>+ 	user *tmp2;
>+ 
>+@@ -402,7 +406,7 @@ void sortUsersTotal()
>+ {
>+ 	int i, j, max;
>+ 	globuser *sym;
>+-	int tmp;
>++	user *tmp;
>+ 	user *tmp1;
>+ 	user *tmp2;
>+ 
>+@@ -430,7 +434,7 @@ void sortUsersByte()
>+ {
>+ 	int i, j, max;
>+ 	globuser *sym;
>+-	int tmp;
>++	user *tmp;
>+ 	user *tmp1;
>+ 	user *tmp2;
>+ 
>
>Property changes on: files/patch-isoqlog_Data.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-isoqlog_Data.h
>===================================================================
>--- files/patch-isoqlog_Data.h	(nonexistent)
>+++ files/patch-isoqlog_Data.h	(working copy)
>@@ -0,0 +1,20 @@
>+--- isoqlog/Data.h.orig	2003-02-04 08:35:42 UTC
>++++ isoqlog/Data.h
>+@@ -99,7 +99,7 @@ struct DomainsTab {
>+ struct UsersTab {
>+ 	int nval;
>+ 	int max;
>+-	int *allusers;
>++	user**allusers;
>+ } UsersTab;
>+ 
>+ 
>+@@ -107,7 +107,7 @@ struct UsersTab {
>+ struct SortDomain {
>+ 	int nval;
>+ 	int max;
>+-	int *allusers;
>++	user**allusers;
>+ } SortDomain;
>+ 	
>+ #endif
>
>Property changes on: files/patch-isoqlog_Data.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 432217)
>+++ pkg-plist	(working copy)
>@@ -1,22 +1,6 @@
> bin/isoqlog
> @sample etc/isoqlog.conf-dist etc/isoqlog.conf
> @sample etc/isoqlog.domains-dist  etc/isoqlog.domains
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/EnderUNIX
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/README.Turkish
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/tr/BENIOKU
>-%%PORTDOCS%%%%DOCSDIR%%/tr/DEGISIKLIKLER
>-%%PORTDOCS%%%%DOCSDIR%%/tr/HABERLER
>-%%PORTDOCS%%%%DOCSDIR%%/tr/KOPYALAMA
>-%%PORTDOCS%%%%DOCSDIR%%/tr/KURULUM
>-%%PORTDOCS%%%%DOCSDIR%%/tr/YAZARLAR
> %%DATADIR%%/htmltemp/daily.html
> %%DATADIR%%/htmltemp/domain.html
> %%DATADIR%%/htmltemp/index.html

Flags:

dbaio: maintainer-approval+

Actions: View | Diff

Attachments on bug 216412: 179261