Date: Wed, 31 Oct 2007 03:44:11 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117705: [PATCH] net-im/jit: fix on 7.x Message-ID: <20071031004411.0697B427A@hades.panopticon> Resent-Message-ID: <200710310050.l9V0o0jT055142@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117705 >Category: ports >Synopsis: [PATCH] net-im/jit: fix on 7.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 31 00:50:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE-p20 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: * gcc42 fix >How-To-Repeat: >Fix: --- jit.patch begins here --- diff -ruN jit.orig/Makefile jit/Makefile --- jit.orig/Makefile 2007-10-31 03:41:06.000000000 +0000 +++ jit/Makefile 2007-10-31 03:28:29.000000000 +0000 @@ -22,12 +22,6 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/jit/jabber-icq.example @@ -42,4 +36,4 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN jit.orig/files/patch-jit-jit-wp_client.cpp jit/files/patch-jit-jit-wp_client.cpp --- jit.orig/files/patch-jit-jit-wp_client.cpp 1970-01-01 00:00:00.000000000 +0000 +++ jit/files/patch-jit-jit-wp_client.cpp 2007-10-31 03:40:01.000000000 +0000 @@ -0,0 +1,63 @@ +--- jit/jit/wp_client.cpp.orig 2004-11-10 18:23:27.000000000 +0000 ++++ jit/jit/wp_client.cpp 2007-10-31 03:39:39.000000000 +0000 +@@ -152,22 +152,31 @@ + + switch(ev->getReason()){ + case DisconnectedEvent::FAILED_BADUSERNAME: ++ { + e = (terror){400,"Bad username"}; ++ } + break; + + case DisconnectedEvent::FAILED_TURBOING: ++ { + e = (terror){503,"Turboing, connect later"}; ++ } + break; + + case DisconnectedEvent::FAILED_BADPASSWORD: ++ { + e = (terror){400,"Bad (non mismatched) registration password"}; ++ } + break; + + case DisconnectedEvent::FAILED_MISMATCH_PASSWD: ++ { + e = (terror){401,"Password does not match"}; ++ } + break; + + case DisconnectedEvent::FAILED_DUALLOGIN: { ++ { + /* maybe we should explicitly notify due importance */ + char *body=LNG_DUAL_LOGIN; + +@@ -180,21 +189,28 @@ + it_deliver(sesja->ti,msg); + + e = (terror){409,"Dual login"}; ++ } + break; + } + + case DisconnectedEvent::FAILED_LOWLEVEL: ++ { + e = (terror){502,"Low level network error"}; ++ } + break; + + case DisconnectedEvent::REQUESTED: ++ { + log_debug(ZONE,"Disconnected on request"); + e = (terror){0,""}; ++ } + break; + + case DisconnectedEvent::FAILED_UNKNOWN: + default: ++ { + e = (terror){502,"Disconnected by unknown reason"}; ++ } + break; + } + --- jit.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071031004411.0697B427A>