Fixed bug 62368.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 105 insertions, 13 deletions

diff --git a/net-nds/gq/ChangeLog b/net-nds/gq/ChangeLog
index decc7b7c9d28..fce7fa5610f7 100644
--- a/net-nds/gq/ChangeLog
+++ b/net-nds/gq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/gq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.14 2005/01/25 21:55:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.15 2005/09/18 11:45:50 hansmi Exp $
+
+*gq-1.0_beta1-r1 (18 Sep 2005)
+
+  18 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> +files/util.c.diff,
+  +gq-1.0_beta1-r1.ebuild:
+  Fixed bug 62368.
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org> -gq-0.7.0_beta2.ebuild:
   Betas will be betas - removed gq-0.7.0_beta2.ebuild as per bug #76057. Known
diff --git a/net-nds/gq/Manifest b/net-nds/gq/Manifest
index 0eed89f3bef5..18eb3cc2cc42 100644
--- a/net-nds/gq/Manifest
+++ b/net-nds/gq/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dc1f3fd56f02bb245049adbcf091bc3f gq-0.6.0.ebuild 1056
-MD5 06f4ff7e265f68b0a3c5b8da14704f0e gq-1.0_beta1.ebuild 1539
-MD5 575c7f037719f6816d83f4edb526d5f6 ChangeLog 2260
+MD5 f4ed12a3f074e3d011be5731dac8e624 gq-1.0_beta1-r1.ebuild 1731
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 2d084546cd8d169c25f52798a899f7d1 ChangeLog 2408
+MD5 06f4ff7e265f68b0a3c5b8da14704f0e gq-1.0_beta1.ebuild 1539
 MD5 828702cac79a6948709d36296923765d files/digest-gq-0.6.0 60
+MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1-r1 63
+MD5 81dbbd824fa9092d9854f7f54b0c7050 files/util.c.diff 569
 MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9sB0mdTrptrqvGERAkbUAJ429+FLCKuu6t46aGMpRxdJ/7kdFACfTB6z
-G/OkpyIH27hyPYA8yC0xSI8=
-=vGGi
------END PGP SIGNATURE-----
diff --git a/net-nds/gq/files/digest-gq-1.0_beta1-r1 b/net-nds/gq/files/digest-gq-1.0_beta1-r1
new file mode 100644
index 000000000000..5cf2cf680f19
--- /dev/null
+++ b/net-nds/gq/files/digest-gq-1.0_beta1-r1
@@ -0,0 +1 @@
+MD5 c904ff52f513a58516d9543f8dc3fe5b gq-1.0beta1.tar.gz 475081
diff --git a/net-nds/gq/files/util.c.diff b/net-nds/gq/files/util.c.diff
new file mode 100644
index 000000000000..1433d804a45e
--- /dev/null
+++ b/net-nds/gq/files/util.c.diff
@@ -0,0 +1,20 @@
+--- src/util.c	Mon Feb 14 14:00:31 2005
++++ src/util.c.new	Mon Feb 14 14:01:32 2005
+@@ -1918,7 +1918,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);
+@@ -1930,7 +1930,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;
\ No newline at end of file
diff --git a/net-nds/gq/gq-1.0_beta1-r1.ebuild b/net-nds/gq/gq-1.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..a826dc1dc741
--- /dev/null
+++ b/net-nds/gq/gq-1.0_beta1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-1.0_beta1-r1.ebuild,v 1.1 2005/09/18 11:45:50 hansmi Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${PN}-${PV/_/}
+DESCRIPTION="GTK-based LDAP client"
+
+SRC_URI="mirror://sourceforge/gqclient/${PN}-${PV/_/}.tar.gz"
+HOMEPAGE="http://www.biot.com/gq/"
+IUSE="kerberos jpeg nls ssl"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=net-nds/openldap-2
+	kerberos? ( app-crypt/mit-krb5 )
+	jpeg? ( media-libs/gdk-pixbuf )
+	ssl? ( dev-libs/openssl )
+	dev-libs/libxml2
+	dev-libs/glib
+	sys-devel/gettext
+	=dev-libs/atk-1*
+	x11-libs/pango
+	dev-libs/cyrus-sasl
+	virtual/libc"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-apps/gawk
+	sys-devel/bison
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	# This patch, written by Luca Scamoni, is from
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1122365&group_id=3805&atid=103805
+	epatch "${FILESDIR}/utils.c.diff"
+
+	# Fix timestamp skews
+	touch aclocal.m4 configure `find . -name Makefile.in`
+
+	if use amd64 ; then
+		rm config.sub config.guess
+		automake --add-missing --copy
+	fi
+}
+
+src_compile() {
+	local myconf="--enable-browser-dnd --enable-cache"
+
+	use nls \
+		&& myconf="${myconf} --with-included-gettext" \
+		|| myconf="${myconf} --disable-nls"
+
+	use kerberos && myconf="${myconf} --with-kerberos-prefix=/usr"
+
+	econf $myconf || die "./configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "Installation failed"
+	rm -f ${D}/usr/share/locale/locale.alias
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
+}