From f214c2cbfbfe50d79a4d463c186de1107ab3eb90 Mon Sep 17 00:00:00 2001 From: cube Date: Wed, 21 Jan 2004 16:26:37 +0000 Subject: Update to version 1.0beta1. This packages now use GTK2. Most noticable changes (refer to ChangeLog for the complete set, since it is very long): * Support for extensibleObject objects * Allow LDAP URIs * NT passwords, LMHASH passwords * GTK2 environment * UTF-8 support --- databases/gq/Makefile | 17 ++++++----------- databases/gq/PLIST | 5 +++-- databases/gq/distinfo | 12 +++++++----- databases/gq/patches/patch-aa | 12 ++++++------ databases/gq/patches/patch-ab | 36 +++++++++++++++++++++++++++--------- databases/gq/patches/patch-ad | 20 ++++++++++++++++++++ databases/gq/patches/patch-ae | 26 ++++++++++++++++++++++++++ 7 files changed, 95 insertions(+), 33 deletions(-) create mode 100644 databases/gq/patches/patch-ad create mode 100644 databases/gq/patches/patch-ae (limited to 'databases/gq') diff --git a/databases/gq/Makefile b/databases/gq/Makefile index 2837ddb497c..3a5bef3326e 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,32 +1,27 @@ -# $NetBSD: Makefile,v 1.13 2003/11/12 03:39:39 jschauma Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/21 16:26:37 cube Exp $ # -DISTNAME= gq-0.6.0 -PKGREVISION= 1 +DISTNAME= gq-1.0beta1 CATEGORIES= databases net -MASTER_SITES= http://biot.com/gq/download/ \ - ${MASTER_SITE_SOURCEFORGE:=gqclient/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/} MAINTAINER= rh@NetBSD.org HOMEPAGE= http://biot.com/gq/ COMMENT= GTK-based LDAP client -BUILD_USES_MSGFMT= yes -DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs +DEPENDS+= gnome2-dirs>=1.0:../../misc/gnome2-dirs USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -LIBS+= -ldes CONFIGURE_ARGS+= --enable-browser-dnd CONFIGURE_ARGS+= --with-ssl-prefix=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --enable-cache -.include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" .include "../../databases/openldap/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../converters/libiconv/buildlink2.mk" +.include "../../x11/gtk2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gq/PLIST b/databases/gq/PLIST index 6b4721969fb..4e207232c34 100644 --- a/databases/gq/PLIST +++ b/databases/gq/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2003/09/04 12:57:24 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/01/21 16:26:37 cube Exp $ bin/gq share/gnome/apps/Internet/gq.desktop -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gq.mo share/pixmaps/gq/bomb.xpm +share/pixmaps/gq/hide.xpm share/pixmaps/gq/line.xpm share/pixmaps/gq/logo.xpm +share/pixmaps/gq/new.xpm share/pixmaps/gq/textarea.xpm share/pixmaps/gq/warning.xpm @dirrm share/pixmaps/gq diff --git a/databases/gq/distinfo b/databases/gq/distinfo index 714d94b2e2b..c60390f3450 100644 --- a/databases/gq/distinfo +++ b/databases/gq/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/09/09 18:51:41 jmmv Exp $ +$NetBSD: distinfo,v 1.5 2004/01/21 16:26:37 cube Exp $ -SHA1 (gq-0.6.0.tar.gz) = 23c0d839f83f69931b30c33f500ca8d697d651ed -Size (gq-0.6.0.tar.gz) = 296812 bytes -SHA1 (patch-aa) = 4cb231c738ad41aedb60a4dd22f6fb87b91deb27 -SHA1 (patch-ab) = d33da9a07f2fcf080de5bda02408c844a71f136e +SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff +Size (gq-1.0beta1.tar.gz) = 475081 bytes +SHA1 (patch-aa) = 65c7e14f38e20862cace92b36fbd2ca091f60e10 +SHA1 (patch-ab) = f1ade063dad913f334cb47c9cfb0b1d49c3ac22f SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f +SHA1 (patch-ad) = 5a9da1912fea5f7fcbe1cd807caf6b77e498ea05 +SHA1 (patch-ae) = 295196adb9b78af2feab13206dd6e38ef1618d91 diff --git a/databases/gq/patches/patch-aa b/databases/gq/patches/patch-aa index 39c95a4348f..930e04399e7 100644 --- a/databases/gq/patches/patch-aa +++ b/databases/gq/patches/patch-aa @@ -1,14 +1,14 @@ -$NetBSD: patch-aa,v 1.1 2003/09/09 18:51:42 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2004/01/21 16:26:37 cube Exp $ ---- config.h.in.orig 2002-06-19 00:21:52.000000000 +0200 +--- config.h.in.orig 2003-11-04 00:07:06.000000000 +0100 +++ config.h.in -@@ -107,6 +107,9 @@ - /* Define if you have the iswspace function. */ +@@ -130,6 +130,9 @@ + /* Define to 1 if you have the `iswspace' function. */ #undef HAVE_ISWSPACE +/* Define if you have the btowc function. */ +#undef HAVE_BTOWC + - /* Define if you have the ldap_memfree function. */ - #undef HAVE_LDAP_MEMFREE + /* Define if you have Kerberos installed */ + #undef HAVE_KERBEROS diff --git a/databases/gq/patches/patch-ab b/databases/gq/patches/patch-ab index 56d3e2e0852..fbbcb89292e 100644 --- a/databases/gq/patches/patch-ab +++ b/databases/gq/patches/patch-ab @@ -1,13 +1,31 @@ -$NetBSD: patch-ab,v 1.1 2003/09/09 18:51:42 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2004/01/21 16:26:37 cube Exp $ ---- configure.orig 2002-07-05 08:51:55.000000000 +0200 +--- configure.orig 2003-11-04 00:04:50.000000000 +0100 +++ configure -@@ -1965,7 +1965,7 @@ fi - fi - +@@ -5330,7 +5330,7 @@ fi for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \ -- iswspace snprintf -+ iswspace snprintf btowc + ldap_initialize \ + iswspace snprintf \ +- g_snprintf ++ g_snprintf btowc do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:1972: checking for $ac_func" >&5 + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -6702,7 +6702,7 @@ _ACEOF + fi; + + 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 +@@ -10451,7 +10451,7 @@ echo "${ECHO_T}`eval echo '${'gq_cv_${PR + + if test "$gq_cv_snprintf_reordering" = no ; then + +- if test "gq_cv_g_snprintf_reordering" == "yes" ; then ++ if test "gq_cv_g_snprintf_reordering" = "yes" ; then + gq_cv_snprintf_reordering=yes + + cat >>confdefs.h <<\_ACEOF diff --git a/databases/gq/patches/patch-ad b/databases/gq/patches/patch-ad new file mode 100644 index 00000000000..15850abce39 --- /dev/null +++ b/databases/gq/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 2004/01/21 16:26:37 cube Exp $ + +--- src/dt_password.c.orig 2003-11-03 22:07:57.000000000 +0100 ++++ src/dt_password.c +@@ -45,6 +45,15 @@ + #include + #include + #include ++#include ++#if OPENSSL_VERSION_NUMBER >= 0x00907000L ++# define des_fcrypt DES_fcrypt ++# define des_cblock DES_cblock ++# define des_set_odd_parity DES_set_odd_parity ++# define des_set_key_unchecked(key,schedule) DES_set_key_unchecked(key, &(schedule)) ++# define des_ecb_encrypt(input, output, ks, enc) DES_ecb_encrypt(input, output, &(schedule), enc) ++# define des_key_schedule DES_key_schedule ++#endif + #endif /* defined(HAVE_LIBCRYPTO) */ + + #include "common.h" diff --git a/databases/gq/patches/patch-ae b/databases/gq/patches/patch-ae new file mode 100644 index 00000000000..c90b089854c --- /dev/null +++ b/databases/gq/patches/patch-ae @@ -0,0 +1,26 @@ +$NetBSD: patch-ae,v 1.1 2004/01/21 16:26:37 cube Exp $ + +--- src/xmlparse.c.orig 2003-11-03 22:05:18.000000000 +0100 ++++ src/xmlparse.c +@@ -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 */ -- cgit v1.2.3