[pkgsrc/pkgsrc-2005Q2]: pkgsrc/chat/ekg Pullup ticket 656 - requested by Lubo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e31363d5c5dd
branches:  pkgsrc-2005Q2
changeset: 495952:e31363d5c5dd
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Aug 05 16:28:58 2005 +0000

description:
Pullup ticket 656 - requested by Lubomir Sedlacik
security update for ekg

Revisions pulled up:
- pkgsrc/chat/ekg/Makefile              1.33, 1.34
- pkgsrc/chat/ekg/buildlink3.mk         1.7, 1.8
- pkgsrc/chat/ekg/distinfo              1.17, 1.18
- pkgsrc/chat/ekg/patches/patch-ac      1.4
- pkgsrc/chat/ekg/patches/patch-ad      1.5

    Module Name:    pkgsrc
    Committed By:   adam
    Date:           Wed Jul 13 15:05:55 UTC 2005

    Modified Files:
            pkgsrc/chat/ekg: Makefile buildlink3.mk distinfo
            pkgsrc/chat/ekg/patches: patch-ac patch-ad

    Log Message:
    Changes:
    * Important security-related bug-fixes
----
    Module Name:    pkgsrc
    Committed By:   adam
    Date:           Wed Jul 20 14:27:06 UTC 2005

    Modified Files:
            pkgsrc/chat/ekg: Makefile buildlink3.mk distinfo

    Log Message:
    Changes:
    * Security bug fix

diffstat:

 chat/ekg/Makefile         |   8 ++++----
 chat/ekg/buildlink3.mk    |   4 ++--
 chat/ekg/distinfo         |  12 ++++++------
 chat/ekg/patches/patch-ac |   6 +++---
 chat/ekg/patches/patch-ad |  24 ++++++++++++------------
 5 files changed, 27 insertions(+), 27 deletions(-)

diffs (114 lines):

diff -r 6fa0b475b68d -r e31363d5c5dd chat/ekg/Makefile
--- a/chat/ekg/Makefile Fri Aug 05 16:22:38 2005 +0000
+++ b/chat/ekg/Makefile Fri Aug 05 16:28:58 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2005/08/05 16:28:58 snj Exp $
 
-DISTNAME=      ekg-1.6rc1
+DISTNAME=      ekg-1.6rc3
 PKGNAME=       ekg-1.6
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://dev.null.pl/ekg/ \
                http://dev.null.pl/ekg/stare/
@@ -11,12 +12,11 @@
 COMMENT=       Experimental Gadu-Gadu Client (Polish instant messaging system)
 
 USE_GNU_READLINE=      yes
-USE_TOOLS+=            gmake
 USE_LIBTOOL=           yes
 USE_NCURSES=           yes
+USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 PKGCONFIG_OVERRIDE=    lib/libgadu.pc.in
-
 CONFIGURE_ARGS+=       --enable-ui-ncurses
 CONFIGURE_ARGS+=       --enable-ui-readline
 CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
diff -r 6fa0b475b68d -r e31363d5c5dd chat/ekg/buildlink3.mk
--- a/chat/ekg/buildlink3.mk    Fri Aug 05 16:22:38 2005 +0000
+++ b/chat/ekg/buildlink3.mk    Fri Aug 05 16:28:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/04/21 08:53:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6.2.1 2005/08/05 16:28:58 snj Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 EKG_BUILDLINK3_MK:=    ${EKG_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(EKG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ekg+=                ekg>=1.6
-BUILDLINK_RECOMMENDED.ekg?=    ekg>=1.6
+BUILDLINK_RECOMMENDED.ekg?=    ekg>=1.6nb2
 BUILDLINK_PKGSRCDIR.ekg?=      ../../chat/ekg
 .endif # EKG_BUILDLINK3_MK
 
diff -r 6fa0b475b68d -r e31363d5c5dd chat/ekg/distinfo
--- a/chat/ekg/distinfo Fri Aug 05 16:22:38 2005 +0000
+++ b/chat/ekg/distinfo Fri Aug 05 16:28:58 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2005/04/21 08:53:11 adam Exp $
+$NetBSD: distinfo,v 1.16.2.1 2005/08/05 16:28:58 snj Exp $
 
-SHA1 (ekg-1.6rc1.tar.gz) = 9a9bd2dcfbe8c0a9a4afbe51985d80461ec3d225
-RMD160 (ekg-1.6rc1.tar.gz) = edb997603c4b9652431adabe8ac1d712b31f61cc
-Size (ekg-1.6rc1.tar.gz) = 495016 bytes
+SHA1 (ekg-1.6rc3.tar.gz) = 0c67ec1e0331ca8213f43577562626997176abe5
+RMD160 (ekg-1.6rc3.tar.gz) = a9e249ca2c84fa2fe218dd965da0c8964ac14795
+Size (ekg-1.6rc3.tar.gz) = 501596 bytes
 SHA1 (patch-aa) = e51f5182b08243d563f6522459c1d10d51350294
 SHA1 (patch-ab) = 626765db378e40f08f459df3fb6c4649a5fdc53b
-SHA1 (patch-ac) = 8874f356c7c5ab06fe44dcb0f41bcc969fd3e218
-SHA1 (patch-ad) = e1b138187c7d9121607963ff3b4c6e1bdb2b0e73
+SHA1 (patch-ac) = 411c5be6f85dc28a1aafa24dea7a5e29b3c51a26
+SHA1 (patch-ad) = 7fd701b208ec6096b853e826d18afd084548fb68
diff -r 6fa0b475b68d -r e31363d5c5dd chat/ekg/patches/patch-ac
--- a/chat/ekg/patches/patch-ac Fri Aug 05 16:22:38 2005 +0000
+++ b/chat/ekg/patches/patch-ac Fri Aug 05 16:28:58 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.3 2005/04/21 08:53:11 adam Exp $
+$NetBSD: patch-ac,v 1.3.2.1 2005/08/05 16:28:58 snj Exp $
 
---- lib/Makefile.in.orig       2005-02-22 15:22:25.000000000 +0000
+--- lib/Makefile.in.orig       2005-07-12 21:26:10.000000000 +0000
 +++ lib/Makefile.in
 @@ -11,7 +11,7 @@ VERSION_MAJOR=3
- VERSION_MINOR=2
+ VERSION_MINOR=3
  
  CC = @CC@ 
 -CFLAGS = @CFLAGS_LIBGADU@ -I. -I.. -Wall
diff -r 6fa0b475b68d -r e31363d5c5dd chat/ekg/patches/patch-ad
--- a/chat/ekg/patches/patch-ad Fri Aug 05 16:22:38 2005 +0000
+++ b/chat/ekg/patches/patch-ad Fri Aug 05 16:28:58 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.4 2005/04/21 08:53:11 adam Exp $
+$NetBSD: patch-ad,v 1.4.2.1 2005/08/05 16:28:59 snj Exp $
 
---- configure.orig     2005-03-20 12:46:53.000000000 +0000
+--- configure.orig     2005-07-12 21:33:02.000000000 +0000
 +++ configure
-@@ -4224,7 +4224,7 @@ echo "$as_me: WARNING: we do not know ho
- echo $ECHO_N "checking if -pthread is sufficient with -shared... $ECHO_C" >&6
-       save_CFLAGS="$CFLAGS"
-       save_LIBS="$LIBS"
--      CFLAGS="-shared -Wl,-z,defs $CFLAGS"
-+      CFLAGS="-shared $CFLAGS"
-       ok="no"
-         cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4657,7 +4657,6 @@ if test "x$have_openssl" = "xyes"; then
+@@ -4312,7 +4312,7 @@ echo "${ECHO_T}yes" >&6
+               # FIXME: -fPIC is required for -shared on many architectures,
+               # so we specify it here, but the right way would probably be to
+               # properly detect whether it is actually required.
+-              CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
++              CFLAGS="-shared -fPIC $CFLAGS $PTHREAD_CFLAGS"
+               LIBS="$PTHREAD_LIBS $LIBS"
+               CC="$PTHREAD_CC"
+ 
+@@ -4770,7 +4770,6 @@ if test "x$have_openssl" = "xyes"; then
        LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS"
        CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
        CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES"