[pkgsrc/pkgsrc-2005Q2]: pkgsrc/chat/kadu Pullup ticket 658 - requested by Lub...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31eec5afdd49
branches:  pkgsrc-2005Q2
changeset: 495955:31eec5afdd49
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Aug 06 05:57:04 2005 +0000

description:
Pullup ticket 658 - requested by Lubomir Sedlacik
security update for kadu

Revisions pulled up:
- pkgsrc/chat/kadu/Makefile             1.9
- pkgsrc/chat/kadu/distinfo             1.5-1.7
- pkgsrc/chat/kadu/patches/patch-ab     1.4-1.6

    Module Name:    pkgsrc
    Committed By:   adam
    Date:           Wed Jul 20 14:49:05 UTC 2005

    Modified Files:
            pkgsrc/chat/kadu: Makefile distinfo
            pkgsrc/chat/kadu/patches: patch-ab

    Log Message:
    Changes 0.4.1:
    * Fixed: memory leak
    * Fixed compatibility with Qt3
    * Fixed library detection with threads in libgadu and Mac OS X
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Fri Aug  5 21:02:04 UTC 2005

    Modified Files:
            pkgsrc/chat/kadu: distinfo
            pkgsrc/chat/kadu/patches: patch-ab

    Log Message:
    Linking with libssl requires libcrypto on systems where libssl doesn't
    implicitly add it (e.g., netbsd-2).
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Fri Aug  5 21:42:54 UTC 2005

    Modified Files:
            pkgsrc/chat/kadu: distinfo
            pkgsrc/chat/kadu/patches: patch-ab

    Log Message:
    One more hack to make it actually work.. (the configure tests are overly
    complex and stupid..).

diffstat:

 chat/kadu/Makefile         |   6 +++---
 chat/kadu/distinfo         |  10 +++++-----
 chat/kadu/patches/patch-ab |  24 ++++++++++++++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diffs (81 lines):

diff -r d8d5e72351d5 -r 31eec5afdd49 chat/kadu/Makefile
--- a/chat/kadu/Makefile        Fri Aug 05 16:37:33 2005 +0000
+++ b/chat/kadu/Makefile        Sat Aug 06 05:57:04 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2005/08/06 05:57:04 snj Exp $
 
-DISTNAME=      kadu-0.4.0
+DISTNAME=      kadu-0.4.1
 CATEGORIES=    chat
 MASTER_SITES=  http://www.kadu.net/download/stable/
 EXTRACT_SUFX=  .tar.bz2
@@ -9,8 +9,8 @@
 HOMEPAGE=      http://www.kadu.net/
 COMMENT=       Chat client for Gadu-Gadu network (Poland)
 
+USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake
-USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-existing-libgadu=${BUILDLINK_PREFIX.ekg}
 CONFIGURE_ENV+=                X11BASE="${X11BASE}"
diff -r d8d5e72351d5 -r 31eec5afdd49 chat/kadu/distinfo
--- a/chat/kadu/distinfo        Fri Aug 05 16:37:33 2005 +0000
+++ b/chat/kadu/distinfo        Sat Aug 06 05:57:04 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/04/21 08:56:21 adam Exp $
+$NetBSD: distinfo,v 1.4.2.1 2005/08/06 05:57:04 snj Exp $
 
-SHA1 (kadu-0.4.0.tar.bz2) = d480e77632e191eb8f85cc18dd376701de22034e
-RMD160 (kadu-0.4.0.tar.bz2) = c5d6ce78d431b776c19c4c7181cf8a5e2b13da94
-Size (kadu-0.4.0.tar.bz2) = 1198118 bytes
+SHA1 (kadu-0.4.1.tar.bz2) = e2eb3af9b156e0adfa8d6aa4577e2a8b67807514
+RMD160 (kadu-0.4.1.tar.bz2) = aab9004b0b830a14a7a13168217040d7bf68a656
+Size (kadu-0.4.1.tar.bz2) = 1218351 bytes
 SHA1 (patch-aa) = 326e786f46223121de946294a647289f1c190b87
-SHA1 (patch-ab) = b0583604ca1a0ca381d63e50c4cc37a02edc4a72
+SHA1 (patch-ab) = 02684bdadb7c5fb46d4d79cfcfd1f5671d55f1a3
diff -r d8d5e72351d5 -r 31eec5afdd49 chat/kadu/patches/patch-ab
--- a/chat/kadu/patches/patch-ab        Fri Aug 05 16:37:33 2005 +0000
+++ b/chat/kadu/patches/patch-ab        Sat Aug 06 05:57:04 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2005/04/21 08:56:21 adam Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2005/08/06 05:57:04 snj Exp $
 
---- configure.orig     2005-04-15 15:48:25.000000000 +0000
-+++ configure
-@@ -6621,12 +6621,12 @@ echo "$as_me: error: libgadu.h not found
+--- configure.orig     2005-07-19 19:52:02.000000000 +0000
++++ configure  2005-08-05 21:18:36.000000000 +0000
+@@ -9494,12 +9494,12 @@
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -      GADU_LIBS=-lgadu
-+      GADU_LIBS="-lgadu -lssl -lpthread"
++      GADU_LIBS="-lgadu -lssl -lcrypto -lpthread"
  
        echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5
  echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6
@@ -17,7 +17,19 @@
        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7085,7 +7085,7 @@ fi
+@@ -9858,7 +9858,11 @@
+       echo "$as_me:$LINENO: checking if lib$lib is in system directories" >&5
+ echo $ECHO_N "checking if lib$lib is in system directories... $ECHO_C" >&6
+       save_CFLAGS="$CFLAGS"
++      if [ x$lib = xssl ]; then
++              CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lcrypto"
++      else
+       CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib"
++      fi
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9992,7 +9996,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
   \