cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gq 1.0beta1.

Browse Source 
help and ok claudio@
This commit is contained in:
mbalmer 2005-02-28 13:30:07 +00:00
parent c3b0c02e11
commit acce2e07f8
11 changed files with 216 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
databases/gq/Makefile
View File

@ -1,38 +1,38 @@
# $OpenBSD: Makefile,v 1.11 2004/11/22 16:59:29 espie Exp $
# $OpenBSD: Makefile,v 1.12 2005/02/28 13:30:07 mbalmer Exp $
COMMENT= "GTK-based LDAP client"
VERSION= 0.7.0beta2
DISTNAME= gq-${VERSION}
DISTNAME= gq-1.0beta1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
HOMEPAGE= http://biot.com/gq/
MAINTAINER= Marc Balmer <marc@msys.ch>
MAINTAINER= Marc Balmer <mbalmer@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi \
glib gmodule intl jpeg png tiff \
c crypto m ssl z
USE_X11= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
BUILD_DEPENDS= :cyrus-sasl-*:security/cyrus-sasl2 # sasl.h only
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
ldap,lber::databases/openldap \
gdk_pixbuf::graphics/gdk-pixbuf
WANTLIB= X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 \
c crypto fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
gobject-2.0.0.0 m pango-1.0.0.0 pangox-1.0.0.0 \
pangoxft-1.0.0.0 ssl z krb5
MODULES= converters/libiconv
MODULES= devel/gettext
BUILD_DEPENDS= :cyrus-sasl-*:security/cyrus-sasl2
LIB_DEPENDS= gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2 \
ldap.7,lber.7::databases/openldap \
xml2::textproc/libxml
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.13
AUTOCONF_VERSION= 2.57
CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} \
--with-sasl-prefix=${LOCALBASE}
--with-sasl-prefix=${LOCALBASE} \
--with-kerberos-prefix=/usr
.include <bsd.port.mk>

8
databases/gq/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gq-0.7.0beta2.tar.gz) = 2764f14a484504528e7855b01adaf116
RMD160 (gq-0.7.0beta2.tar.gz) = d47ca8211e168eb46409a1e30e3127cff525bebc
SHA1 (gq-0.7.0beta2.tar.gz) = 3ea016387fed5eee9f178882e9115f5e72a4a1f2
SIZE (gq-0.7.0beta2.tar.gz) = 342751
MD5 (gq-1.0beta1.tar.gz) = c904ff52f513a58516d9543f8dc3fe5b
RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c
SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff
SIZE (gq-1.0beta1.tar.gz) = 475081

37
databases/gq/patches/patch-configure_in
View File

@ -1,21 +1,20 @@
$OpenBSD: patch-configure_in,v 1.1 2003/05/27 23:49:13 naddy Exp $
--- configure.in.orig Fri Jul 5 08:49:19 2002
+++ configure.in Wed May 28 01:26:41 2003
@@ -123,7 +123,17 @@ AC_ARG_WITH(kerberos-prefix,
--- configure.in.orig Mon Nov 3 23:56:14 2003
+++ configure.in Tue Feb 15 03:58:15 2005
@@ -340,7 +340,7 @@ AC_CHECK_FUNCS(ldap_str2objectclass ldap
AC_ARG_WITH(kerberos-prefix,
[ --with-kerberos-prefix=PFX Prefix where Kerberos is installed],
[
- LIBS="-L$with_kerberos_prefix/lib -lkrb5 -ldes425 $LIBS"
+ LIBS="-L$with_kerberos_prefix/lib -lkrb5 $LIBS"
AC_DEFINE(HAVE_KERBEROS,1,[Define if you have Kerberos installed])
HAVE_KERBEROS=1
]
)
+AC_ARG_WITH(sasl-prefix,
+ [ --with-sasl-prefix=PFX Prefix where SASL libs and headers \
+are installed],
+ [
+ CPPFLAGS="$CPPFLAGS -I$with_sasl_prefix/include/sasl"
+ ]
+)
+
AC_CHECK_HEADERS([sasl.h], [AC_DEFINE(HAVE_SASL)])
+
+AC_CHECK_LIB(ldap, ldap_sasl_interactive_bind_s)
AC_CHECK_HEADERS(iconv.h, HAVE_ICONV_H=yes)
@@ -491,7 +491,7 @@ AC_ARG_ENABLE(browser-dnd,
dnl Only use -Wall if we have gcc
if test "x$GCC" = "xyes"; then
- for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
+ for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
do
# The following should work as well, but might (?) be less portable
# if ! echo "$CFLAGS" | grep -q -w -- "$A" ; then

23
databases/gq/patches/patch-intl_dcigettext_c Normal file
View File

@ -0,0 +1,23 @@
--- intl/dcigettext.c.orig Sat May 4 18:10:13 2002
+++ intl/dcigettext.c Tue Feb 15 03:50:16 2005
@@ -57,11 +57,6 @@ extern int errno;
#include <stdlib.h>
#include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
#if defined HAVE_UNISTD_H || defined _LIBC
# include <unistd.h>
@@ -868,7 +863,7 @@ _nl_find_msg (domain_file, domainbinding
outleft = freemem_size - sizeof (size_t);
if (iconv (domain->conv,
- (ICONV_CONST char **) &inptr, &inleft,
+ (const char **) &inptr, &inleft,
&outptr, &outleft)
!= (size_t) (-1))
{

12
databases/gq/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2003/05/27 23:49:13 naddy Exp $
--- src/Makefile.in.orig Fri Jul 5 08:52:07 2002
+++ src/Makefile.in Wed May 28 01:21:16 2003
@@ -114,7 +114,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -liconv
gq_OBJECTS = mainwin.o browse.o schema.o schemabrowse.o template.o gq.o \
search.o tinput.o configfile.o prefs.o util.o errorchain.o ldif.o \
formfill.o input.o encode.o filter.o debug.o syntax.o dt_entry.o \

20
databases/gq/patches/patch-src_dt_password_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_dt_password_c,v 1.1 2005/02/28 13:30:07 mbalmer Exp $
--- src/dt_password.c.orig Mon Nov 3 22:07:57 2003
+++ src/dt_password.c Tue Feb 15 03:54:03 2005
@@ -268,14 +268,14 @@ static GByteArray *dt_password_encode_pa
MD4_CTX MD4context;
#if defined(HAVE_ICONV)
- ICONV_CONST char *in;
+ const char *in;
char *out;
size_t inlen, outlen;
iconv_t conv;
conv = iconv_open("UNICODE", gq_codeset);
if (conv != (iconv_t) -1) {
- in = (ICONV_CONST char *) data;
+ in = (const char *) data;
inlen = len;
outlen = len * 2 + 4;
g_byte_array_set_size(unicode, outlen);

35
databases/gq/patches/patch-src_encode_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-src_encode_c,v 1.1 2005/02/28 13:30:07 mbalmer Exp $
--- src/encode.c.orig Wed Oct 8 23:21:16 2003
+++ src/encode.c Tue Feb 15 03:51:19 2005
@@ -53,14 +53,14 @@ const char *decode_string(char *native_s
size_t len)
{
#if defined(HAVE_ICONV)
- ICONV_CONST char *in;
+ const char *in;
char *out;
size_t outlen;
iconv_t conv;
conv = iconv_open(gq_codeset, LDAP_CODESET);
if (conv != (iconv_t) -1) {
- in = (ICONV_CONST char *) ldap_string;
+ in = (const char *) ldap_string;
out = native_string;
/* len = strlen(in); */
outlen = len;
@@ -94,12 +94,12 @@ const gchar *encode_string(gchar *ldap_s
size_t len)
{
#if defined(HAVE_ICONV)
- ICONV_CONST char *in;
+ const char *in;
char *out;
size_t outlen;
iconv_t conv;
- in = (ICONV_CONST char *) native_string;
+ in = (const char *) native_string;
out = ldap_string;
/* len = strlen(in); */
outlen = len * 2 + 1; /* Worst case */

11
databases/gq/patches/patch-src_state_c Normal file
View File

@ -0,0 +1,11 @@
--- src/state.c.orig Mon Nov 3 22:19:54 2003
+++ src/state.c Sat Feb 5 06:50:26 2005
@@ -754,7 +754,7 @@ static void state_valueE(struct parser_c
}
}
- if (n != NULL && v->type != 0) {
+ if (n != NULL && v != NULL && v->type != 0) {
char *ep;
assert(v);

62
databases/gq/patches/patch-src_util_c Normal file
View File

@ -0,0 +1,62 @@
$OpenBSD: patch-src_util_c,v 1.1 2005/02/28 13:30:07 mbalmer Exp $
--- src/util.c.orig Sat Oct 12 14:50:20 2002
+++ src/util.c Wed Jan 26 23:27:26 2005
@@ -1588,27 +1588,51 @@ GList *get_suffixes(struct ldapserver *s
char **gq_ldap_explode_dn(const char *dn, int dummy)
{
int i, rc;
- LDAPDN *parts;
- char **v = 0;
+ LDAPDN parts;
+ char **v = NULL;
rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
- if (rc != LDAP_SUCCESS || parts == NULL) return NULL;
+ if (rc != LDAP_SUCCESS)
+ return NULL;
+ if (parts == NULL) {
+ v = calloc(1, sizeof(char *));
+ if (v == NULL)
+ return NULL;
+ v[0] = NULL;
+ return v;
+ }
/* count DN elements */
for( i = 0 ; parts[i] ; i++ ) ;
- v = (char **) calloc((i + 2), sizeof(char*));
- for( i = 0 ; parts[i] ; i++ ) {
- ldap_rdn2str(parts[0][i], &v[i],
+ v = calloc(i + 1, sizeof(char *));
+ if (v == NULL) {
+ ldap_dnfree(parts);
+ return NULL;
+ }
+
+ for(i = 0; parts[i]; i++) {
+ ldap_rdn2str(parts[i], &v[i],
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
}
+
+ ldap_dnfree(parts);
+ v[i] = NULL;
+
return v;
}
void gq_exploded_free(char **exploded_dn)
{
- if (exploded_dn) free(exploded_dn);
+ int i;
+
+ if (exploded_dn == NULL)
+ return;
+ for (i = 0; exploded_dn[i]; i++)
+ free(exploded_dn[i]);
+
+ free(exploded_dn);
}
#endif

24
databases/gq/patches/patch-src_xmlparse_c Normal file
View File

@ -0,0 +1,24 @@
--- src/xmlparse.c.orig Mon Nov 3 22:05:18 2003
+++ src/xmlparse.c Sat Feb 5 06:50:26 2005
@@ -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 @@ static void startElementH(struct parser_
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 */

2
databases/gq/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/14 23:31:45 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2005/02/28 13:30:07 mbalmer Exp $
bin/gq
share/gnome/
share/gnome/apps/