From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 25 22:00:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E94A16A409 for ; Mon, 25 Feb 2008 22:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 408FC13C45B for ; Mon, 25 Feb 2008 22:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m1PM03qo036006 for ; Mon, 25 Feb 2008 22:00:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m1PM03t1035997; Mon, 25 Feb 2008 22:00:03 GMT (envelope-from gnats) Resent-Date: Mon, 25 Feb 2008 22:00:03 GMT Resent-Message-Id: <200802252200.m1PM03t1035997@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "admin@su29.net" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE47F16A400 for ; Mon, 25 Feb 2008 21:54:14 +0000 (UTC) (envelope-from melifaro@bol.megaon.ru) Received: from bol.megaon.ru (bol.megaon.ru [77.73.233.130]) by mx1.freebsd.org (Postfix) with ESMTP id 72D9413C45A for ; Mon, 25 Feb 2008 21:54:13 +0000 (UTC) (envelope-from melifaro@bol.megaon.ru) Received: from bol.megaon.ru (localhost [127.0.0.1]) by bol.megaon.ru (8.14.2/8.14.2) with ESMTP id m1PLWCS8074073 for ; Tue, 26 Feb 2008 00:32:12 +0300 (MSK) (envelope-from melifaro@bol.megaon.ru) Received: (from melifaro@localhost) by bol.megaon.ru (8.14.2/8.14.2/Submit) id m1PLWCuX074072; Tue, 26 Feb 2008 00:32:12 +0300 (MSK) (envelope-from melifaro) Message-Id: <200802252132.m1PLWCuX074072@bol.megaon.ru> Date: Tue, 26 Feb 2008 00:32:12 +0300 (MSK) From: "admin@su29.net" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/121097: irc/psybnc does not work on amd64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "admin@su29.net" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 22:00:03 -0000 >Number: 121097 >Category: ports >Synopsis: irc/psybnc does not work on amd64 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Feb 25 22:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alexander Chernikov >Release: FreeBSD 7.0-BETA4 amd64 >Organization: >Environment: System: FreeBSD bol.megaon.ru 7.0-BETA4 FreeBSD 7.0-BETA4 #0: Sun Dec 2 16:34:41 UTC 2007 root@myers.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: >How-To-Repeat: >Fix: --- psy.diff begins here --- diff -urN psybnc/src/p_blowfish.c psybnc.new/src/p_blowfish.c --- psybnc/src/p_blowfish.c 2005-06-04 22:22:45.000000000 +0400 +++ psybnc.new/src/p_blowfish.c 2008-02-25 23:42:07.000000000 +0300 @@ -27,16 +27,21 @@ static char rcsid[] = "@(#)$Id: p_blowfish.c,v 1.3 2005/06/04 18:00:14 hisi Exp $"; #endif +#include +/* #include #include #include char *strmncpy(char *dest, char *source, size_t len); char *lngtxt(int msgnum); +*/ +/* #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) #define free(n) _pfree(n,__FILE__,__FUNCTION__,__LINE__) +*/ unsigned char *hashstring(unsigned char *str,int len); unsigned char *unhashstring(unsigned char *str); @@ -478,10 +483,11 @@ char *p, *s, *dest, *d, *pt; char rim[5],ep[5],rep[5]; int i; - dest = (char *) pmalloc((strlen(str) + 9) * 2); + dest = __pmalloc((strlen(str) + 9) * 2, "p_blowfish.c", "BLOWencrypt", 481); + dest = pmalloc((strlen(str) + 9) * 2); *dest=0; /* pad fake string with 8 bytes to make sure there's enough */ - s = (char *) pmalloc(strlen(str) + 9); + s = pmalloc(strlen(str) + 9); strcpy(s, str); p = s; while (*p) diff -urN psybnc/src/p_global.h psybnc.new/src/p_global.h --- psybnc/src/p_global.h 2005-06-04 22:22:45.000000000 +0400 +++ psybnc.new/src/p_global.h 2008-02-25 23:36:21.000000000 +0300 @@ -972,7 +972,7 @@ #endif #ifndef P_MEMORY -unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line); +char *__pmalloc(unsigned long size,char *module,char *function,int line); void _pfree(void * pointer,char *module, char *function, int line); struct usert *user(int usern); struct newpeert *newpeer(int usern); @@ -1267,8 +1267,8 @@ #endif -#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } -#define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) +#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,(char*)__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } +#define pmalloc(n) __pmalloc((n),__FILE__,(char*)__FUNCTION__,(int)__LINE__) #define SSLCERT "key/psybnc.cert.pem" #define SSLKEY "key/psybnc.key.pem" diff -urN psybnc/src/p_idea.c psybnc.new/src/p_idea.c --- psybnc/src/p_idea.c 2005-06-04 22:22:45.000000000 +0400 +++ psybnc.new/src/p_idea.c 2008-02-25 23:44:12.000000000 +0300 @@ -50,6 +50,9 @@ * string encryption by psychoid */ + +#include +/* #include #include #include @@ -62,7 +65,7 @@ #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) - +*/ #ifdef CRYPT #define IDEAROUNDS 8 diff -urN psybnc/src/p_memory.c psybnc.new/src/p_memory.c --- psybnc/src/p_memory.c 2005-06-04 22:22:45.000000000 +0400 +++ psybnc.new/src/p_memory.c 2008-02-25 23:31:29.000000000 +0300 @@ -32,10 +32,10 @@ /* malloc-wrapper. No memory will log an error entry and kill the bouncer */ -unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line) +char *__pmalloc(unsigned long size,char *module,char *function, int line) { - unsigned long *rc; - if (!(rc=(unsigned long *)malloc(size))) + char *rc; + if (!(rc=(char *)malloc(size))) { p_log(LOG_ERROR,-1,lngtxt(602),module,function,line); exit(0x0); @@ -53,7 +53,7 @@ return rc; } -void _pfree(unsigned long *pointer, char *module, char *function, int line) +void _pfree(char *pointer, char *module, char *function, int line) { #ifdef LOGALLOC if(logm==NULL) @@ -67,7 +67,7 @@ free(pointer); } -#define free(a) _pfree((void *)a,__FILE__,__FUNCTION__,__LINE__) +#define free(a) _pfree((void *)a,__FILE__,(char*)__FUNCTION__,__LINE__) /* struct wrappers. Those alloc, delete and return the needed structures */ --- psy.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: