Attachment #64635 for bug #96035

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




#

PORTNAME=	gq
PORTVERSION=	1.0r1
PORTREVISION=	6
CATEGORIES=	net
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://dryice.name/computer/FreeBSD/distfiles/
MASTER_SITE_SUBDIR=	gqclient
DISTNAME=	gq-${PORTVERSION:S/r/rc/}

MAINTAINER=	dryice@dryice.name
COMMENT=	GTK-based LDAP client

USE_GMAKE=		yes

Lines 1-3 Link Here

(-)gq/distinfo (-3 / +3 lines)
1	MD5 (gq-1.0beta1.tar.gz) = c904ff52f513a58516d9543f8dc3fe5b	1	MD5 (gq-1.0rc1.tar.gz) = c7944d681382d32440d4bf0241142697
2	SHA256 (gq-1.0beta1.tar.gz) = 93fed2f77dedf4ececa475a11fab25d126720165c36c4179c8cd13b50e636552	2	SHA256 (gq-1.0rc1.tar.gz) = 8f5a2c1aeb26a75c1de3232df2595a43e87cd252f2911354add4cd9c59514112
3	SIZE (gq-1.0beta1.tar.gz) = 475081	3	SIZE (gq-1.0rc1.tar.gz) = 562766

Lines 1-11 Link Here

(-)gq/files/patch-configure (-11 lines)
1	--- configure.orig Tue Feb 17 00:38:43 2004
2	+++ configure Tue Feb 17 00:39:12 2004
3	@@ -6702,7 +6702,7 @@
4	fi;
5
6	if test "x$GCC" = "xyes"; then
7	- for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
8	+ for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
9	do
10	# The following should work as well, but might (?) be less portable
11	# if ! echo "$CFLAGS" \| grep -q -w -- "$A" ; then

Line 0 Link Here

(-)gq/files/patch-icons-Makefile.in (+11 lines)
	1	--- icons/Makefile.in.orig Mon Apr 10 19:22:45 2006
	2	+++ icons/Makefile.in Wed Apr 19 10:26:21 2006
	3	@@ -193,7 +193,7 @@
	4	warning.xpm
	5
	6	EXTRA_DIST = $(PIXMAPS)
	7	-pixmapdir = $(datadir)/pixmaps/gq
	8	+pixmapdir = $(datadir)/gq
	9	pixmap_DATA = $(PIXMAPS)
	10	all: all-am
	11

Lines 1-11 Link Here

(-)gq/files/patch-icons::Makefile.in (-11 lines)
1	--- icons/Makefile.in.orig Thu Jun 8 14:42:26 2000
2	+++ icons/Makefile.in Thu Jun 8 14:42:40 2000
3	@@ -70,7 +70,7 @@
4
5	EXTRA_DIST = $(PIXMAPS)
6
7	-pixmapdir = $(datadir)/pixmaps/gq
8	+pixmapdir = $(datadir)/gq
9	pixmap_DATA = $(PIXMAPS)
10	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11	CONFIG_HEADER = ../config.h

Line 0 Link Here

(-)gq/files/patch-src-state.c (+11 lines)
	1	--- src/state.c.orig Thu Jul 29 09:44:27 2004
	2	+++ src/state.c Thu Jul 29 09:44:51 2004
	3	@@ -754,7 +754,7 @@
	4	}
	5	}
	6
	7	- if (n != NULL && v->type != 0) {
	8	+ if (n != NULL && v!=NULL && v->type != 0) {
	9	char *ep;
	10
	11	assert(v);




--- src/xmlparse.c.orig	Wed Apr  5 08:53:55 2006
+++ src/xmlparse.c	Wed Apr 19 10:35:15 2006
@@ -51,7 +51,7 @@
 #include "xmlparse.h"
 
 #define malloc g_malloc
-#define calloc(n,s) g_malloc0(n * s)
+#define calloc(n,s) g_malloc0((n) * (s))
 
 #define TAGSTACK_INCR 20
 
@@ -162,10 +162,11 @@
     e->attrs = NULL;
     if (attrs) {
 	for (i = 0 ; attrs[i] ; i++) ;
-	e->attrs = calloc(i, sizeof(xmlChar *));
+	e->attrs = calloc(i+1, sizeof(xmlChar *));
 	for (i = 0 ; attrs[i] ; i++) {
 	    e->attrs[i] = (guchar*)strdup((gchar*)attrs[i]);
 	}
+	e->attrs[i] = NULL;
     }
     
     /* lookup handler */

Lines 1-11 Link Here

(-)gq/files/patch-src::state.c (-11 lines)
1	--- src/state.c.orig Thu Jul 29 09:44:27 2004
2	+++ src/state.c Thu Jul 29 09:44:51 2004
3	@@ -754,7 +754,7 @@
4	}
5	}
6
7	- if (n != NULL && v->type != 0) {
8	+ if (n != NULL && v!=NULL && v->type != 0) {
9	char *ep;
10
11	assert(v);




--- src/util.c.orig	Mon Nov  3 23:28:24 2003
+++ src/util.c	Thu Oct 14 12:46:42 2004
@@ -1909,7 +1909,7 @@
 char **gq_ldap_explode_dn(const char *dn, int dummy)
 {
      int i, rc;
-     LDAPDN *parts;
+     LDAPDN parts;
      char **v = 0; 
      
      rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
@@ -1921,7 +1921,7 @@
      v = (char **) calloc((i + 2), sizeof(char*));
 
      for( i = 0 ; parts[i] ; i++ ) {
-	  ldap_rdn2str(parts[0][i], &v[i],
+	  ldap_rdn2str(parts[i], &v[i],
 		       LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
      } 
      return v;




--- src/xmlparse.c.orig	Thu Jul 29 09:46:26 2004
+++ src/xmlparse.c	Thu Jul 29 09:47:09 2004
@@ -51,7 +51,7 @@
 #include "xmlparse.h"
 
 #define malloc g_malloc
-#define calloc(n,s) g_malloc0(n * s)
+#define calloc(n,s) g_malloc0((n) * (s))
 
 #define TAGSTACK_INCR 20
 
@@ -162,10 +162,11 @@
     e->attrs = NULL;
     if (attrs) {
 	for (i = 0 ; attrs[i] ; i++) ;
-	e->attrs = calloc(i, sizeof(xmlChar *));
+	e->attrs = calloc(i+1, sizeof(xmlChar *));
 	for (i = 0 ; attrs[i] ; i++) {
 	    e->attrs[i] = strdup(attrs[i]);
 	}
+	e->attrs[i] = NULL;
     }
     
     /* lookup handler */

Lines 1-10 Link Here

(-)gq/pkg-plist (-9 / +8 lines)
1	bin/gq	1	bin/gq
2	share/gnome/apps/Internet/gq.desktop	2	%%DATADIR%%/bomb.xpm
3	share/gq/bomb.xpm	3	%%DATADIR%%/hide.xpm
4	share/gq/hide.xpm	4	%%DATADIR%%/line.xpm
5	share/gq/line.xpm	5	%%DATADIR%%/logo.xpm
6	share/gq/logo.xpm	6	%%DATADIR%%/new.xpm
7	share/gq/new.xpm	7	%%DATADIR%%/textarea.xpm
8	share/gq/textarea.xpm	8	%%DATADIR%%/warning.xpm
9	share/gq/warning.xpm	9	@dirrm %%DATADIR%%
10	@dirrm share/gq

Return to bug 96035

Lines 6-19 Link Here

(-)gq/Makefile (-5 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= gq	8	PORTNAME= gq
9	PORTVERSION= 1.0b1	9	PORTVERSION= 1.0r1
10	PORTREVISION= 6
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
		12	http://dryice.name/computer/FreeBSD/distfiles/
13	MASTER_SITE_SUBDIR= gqclient	13	MASTER_SITE_SUBDIR= gqclient
14	DISTNAME= gq-${PORTVERSION:S/b/beta/}	14	DISTNAME= gq-${PORTVERSION:S/r/rc/}
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= dryice@dryice.name
17	COMMENT= GTK-based LDAP client	17	COMMENT= GTK-based LDAP client
18		18
19	USE_GMAKE= yes	19	USE_GMAKE= yes

Line 0 Link Here

(-)gq/files/patch-src-xmlparse.c (+24 lines)
	1	--- src/xmlparse.c.orig Wed Apr 5 08:53:55 2006
	2	+++ src/xmlparse.c Wed Apr 19 10:35:15 2006
	3	@@ -51,7 +51,7 @@
	4	#include "xmlparse.h"
	5
	6	#define malloc g_malloc
	7	-#define calloc(n,s) g_malloc0(n * s)
	8	+#define calloc(n,s) g_malloc0((n) * (s))
	9
	10	#define TAGSTACK_INCR 20
	11
	12	@@ -162,10 +162,11 @@
	13	e->attrs = NULL;
	14	if (attrs) {
	15	for (i = 0 ; attrs[i] ; i++) ;
	16	- e->attrs = calloc(i, sizeof(xmlChar *));
	17	+ e->attrs = calloc(i+1, sizeof(xmlChar *));
	18	for (i = 0 ; attrs[i] ; i++) {
	19	e->attrs[i] = (guchar)strdup((gchar)attrs[i]);
	20	}
	21	+ e->attrs[i] = NULL;
	22	}
	23
	24	/* lookup handler */

Lines 1-20 Link Here

(-)gq/files/patch-src::util.c (-20 lines)
1	--- src/util.c.orig Mon Nov 3 23:28:24 2003
2	+++ src/util.c Thu Oct 14 12:46:42 2004
3	@@ -1909,7 +1909,7 @@
4	char *gq_ldap_explode_dn(const char dn, int dummy)
5	{
6	int i, rc;
7	- LDAPDN *parts;
8	+ LDAPDN parts;
9	char **v = 0;
10
11	rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
12	@@ -1921,7 +1921,7 @@
13	v = (char *) calloc((i + 2), sizeof(char));
14
15	for( i = 0 ; parts[i] ; i++ ) {
16	- ldap_rdn2str(parts[0][i], &v[i],
17	+ ldap_rdn2str(parts[i], &v[i],
18	LDAP_DN_FORMAT_LDAPV3 \| LDAP_DN_PRETTY );
19	}
20	return v;

Lines 1-24 Link Here

(-)gq/files/patch-src::xmlparse.c (-24 lines)
1	--- src/xmlparse.c.orig Thu Jul 29 09:46:26 2004
2	+++ src/xmlparse.c Thu Jul 29 09:47:09 2004
3	@@ -51,7 +51,7 @@
4	#include "xmlparse.h"
5
6	#define malloc g_malloc
7	-#define calloc(n,s) g_malloc0(n * s)
8	+#define calloc(n,s) g_malloc0((n) * (s))
9
10	#define TAGSTACK_INCR 20
11
12	@@ -162,10 +162,11 @@
13	e->attrs = NULL;
14	if (attrs) {
15	for (i = 0 ; attrs[i] ; i++) ;
16	- e->attrs = calloc(i, sizeof(xmlChar *));
17	+ e->attrs = calloc(i+1, sizeof(xmlChar *));
18	for (i = 0 ; attrs[i] ; i++) {
19	e->attrs[i] = strdup(attrs[i]);
20	}
21	+ e->attrs[i] = NULL;
22	}
23
24	/* lookup handler */