Subject: pkg/30096: patch for upgrading chat/bitlbee to 0.92
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <reilles@loria.fr>
List: pkgsrc-bugs
Date: 04/29/2005 20:07:00
>Number:         30096
>Category:       pkg
>Synopsis:       patch for upgrading chat/bitlbee to 0.92
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 29 20:07:00 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 3.99.3
>Organization:
	
>Environment:
	
	
System: NetBSD arcelot.loria.fr 3.99.3 NetBSD 3.99.3 (XEN0) #0: Tue Apr 12 14:45:09 CEST 2005 tonio@arcelot.loria.fr:/usr/obj/sys/arch/i386/compile/XEN0 i386
Architecture: i386
Machine: i386
>Description:
This is a simple patch for upgrading chat/bitlbee to 0.92.
I rewrote the patch-aa to apply to the new configure script (monkey see, monkey do).
It compiles fine, and run without problems for me.
The changelog says:
Version 0.92 (released 2005-02-23) hilights:
 - A number of security- and stability-related bugfixes, including some (not
   very severe) bugs found after a security audit done by infamous41md.
 - In fact, not much else. Just getting closer to a great 1.0 release.
>How-To-Repeat:
Use the patch at http://www.loria.fr/~reilles/divers/bitlbee-0.92.diff
make and make install. Have fun.
>Fix:
I include the patch here, for memory.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/bitlbee/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	11 Apr 2005 21:45:03 -0000	1.18
+++ Makefile	29 Apr 2005 20:00:13 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.18 2005/04/11 21:45:03 tv Exp $
 #
 
-DISTNAME=		bitlbee-0.91
-PKGREVISION=		1
+DISTNAME=		bitlbee-0.92
 CATEGORIES=		chat
 MASTER_SITES=		http://get.bitlbee.org/src/
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/bitlbee/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	23 Feb 2005 15:59:10 -0000	1.9
+++ distinfo	29 Apr 2005 20:00:13 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.9 2005/02/23 15:59:10 agc Exp $
 
-SHA1 (bitlbee-0.91.tar.gz) = f2f202ff86380e193044625ee3a258943d3b3aed
-RMD160 (bitlbee-0.91.tar.gz) = e86c0d404c942d90813bd959e92c5ce7158f5e3d
-Size (bitlbee-0.91.tar.gz) = 462675 bytes
-SHA1 (patch-aa) = 7df85fd53227dcddb57f7b71d374fbe2068ebd95
+SHA1 (bitlbee-0.92.tar.gz) = 08c6244c1c4d222180c6f28bd666e5c8dc056a66
+RMD160 (bitlbee-0.92.tar.gz) = a0b9d6bb92915f6cb1674ccc3b5c78f7ce627a01
+Size (bitlbee-0.92.tar.gz) = 464110 bytes
+SHA1 (patch-aa) = 5f089e20db5df6bfbcdb346413155db52e9c64cc
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/chat/bitlbee/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	27 Dec 2004 23:35:41 -0000	1.3
+++ patches/patch-aa	29 Apr 2005 20:00:13 -0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.3 2004/12/27 23:35:41 xtraeme Exp $
-
---- configure.orig	2004-12-28 00:04:47.000000000 +0100
-+++ configure	2004-12-28 00:08:13.000000000 +0100
+--- configure.orig	2005-04-29 21:47:15.000000000 +0200
++++ configure	2005-04-29 21:49:41.000000000 +0200
 @@ -14,6 +14,8 @@
  datadir='$prefix/share/bitlbee/'
  config='/var/lib/bitlbee/'
@@ -20,7 +18,7 @@
  --jabber=0/1	Disable/enable Jabber part		$jabber
  --oscar=0/1	Disable/enable Oscar part (ICQ, AIM)	$oscar
 @@ -100,9 +103,13 @@
- #define DATADIR "$datadir"
+ #define VARDIR "$datadir"
  #define ARCH "$arch"
  #define CPU "$cpu"
 -#define IPV6
@@ -34,7 +32,7 @@
  if [ "$debug" = "1" ]; then
  	echo 'CFLAGS=-g' >> Makefile.settings
  	echo 'DEBUG=1' >> Makefile.settings
-@@ -383,3 +390,9 @@
+@@ -389,3 +396,9 @@
  else
  	echo '  Building without IM-protocol support. We wish you a lot of fun...';
  fi

>Unformatted: