From 724060e2e5f0bb6a87c534ba72175cbd0eff28c1 Mon Sep 17 00:00:00 2001 From: marino Date: Wed, 14 Dec 2011 18:31:48 +0000 Subject: inputmethod/unicom-im: bad patch, bad mastersite The mastersite resolves to a parking domain, causing the html page to be interpreted as a tarball download which doesn't pass the checksum of course. Luckily this tarball is backed up at NetBSD, so remove the mastersite so it can fall back to NetBSD. Secondly, a patch from 2007 was mispelled and was never included into the distinfo. Obviously it built anyway, but the patch was renamed and the distinfo file regenerated. --- inputmethod/unicon-im/Makefile | 7 ++++--- inputmethod/unicon-im/distinfo | 3 ++- inputmethod/unicon-im/patches/patch-al | 22 ++++++++++++++++++++++ inputmethod/unicon-im/patches/patck-al | 22 ---------------------- 4 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 inputmethod/unicon-im/patches/patch-al delete mode 100644 inputmethod/unicon-im/patches/patck-al diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile index 7ad65ca3008..6dbe56b1c2d 100644 --- a/inputmethod/unicon-im/Makefile +++ b/inputmethod/unicon-im/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.18 2009/06/30 00:07:17 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2011/12/14 18:31:48 marino Exp $ DISTNAME= unicon-1.2 PKGNAME= unicon-im-1.2 PKGREVISION= 5 CATEGORIES= inputmethod -MASTER_SITES= http://www.opencjk.org/~yumj/download/ +# The site points at a parking domain. Let it fall back to NetBSD +#MASTER_SITES= http://www.opencjk.org/~yumj/download/ MAINTAINER= rxg@NetBSD.org -HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html +#HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html COMMENT= Libraries and modules of Unicon PKG_DESTDIR_SUPPORT= user-destdir diff --git a/inputmethod/unicon-im/distinfo b/inputmethod/unicon-im/distinfo index fb4f08fc42c..e6bb9c18f52 100644 --- a/inputmethod/unicon-im/distinfo +++ b/inputmethod/unicon-im/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2011/11/26 17:13:30 joerg Exp $ +$NetBSD: distinfo,v 1.9 2011/12/14 18:31:48 marino Exp $ SHA1 (unicon-1.2.tar.gz) = 61854d160547f645f8033f0b4fd15ebb15ab92a8 RMD160 (unicon-1.2.tar.gz) = c862f03ba561fe4c3641cf8b364a9bae40a78c03 @@ -15,6 +15,7 @@ SHA1 (patch-ah) = 1e9413af0b2904cb17a028d5cedfd1ded6eca22b SHA1 (patch-ai) = de5452fea6a9183cc008fd0b8f37b00e7f4a066c SHA1 (patch-aj) = 13592873c58a68837fd9a62052640121452dd343 SHA1 (patch-ak) = e73ed21080cf92db41038acec7ea3f574b3bad59 +SHA1 (patch-al) = af704d8e0b5712f0bc1286f7c1dfbf2f761e735b SHA1 (patch-am) = 36bed0bf2167a3ab5919d02d191e405e68687108 SHA1 (patch-server_TLS__ImmOp.cpp) = 89992124de68fd00ba5a7f4c73c9638a23a559d0 SHA1 (patch-server_TLS__MemFile.cpp) = f5231f5af38e9d833035bc6dccf7758beb02764c diff --git a/inputmethod/unicon-im/patches/patch-al b/inputmethod/unicon-im/patches/patch-al new file mode 100644 index 00000000000..5821aa47ce4 --- /dev/null +++ b/inputmethod/unicon-im/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1 2011/12/14 18:31:48 marino Exp $ + +--- server/TLS_TcpipMain.cpp.orig 2000-06-14 04:00:01.000000000 +0000 ++++ server/TLS_TcpipMain.cpp +@@ -91,7 +91,7 @@ static void *handler(void *_arg) + printf ("========== Begin New Client Socket =========== \n"); + /* read request */ + while (bExit == 0) { +- n = MyTLS_CPthSocket.read (caLine, MAXREQLINE); ++ n = MyTLS_CPthSocket.socket_read (caLine, MAXREQLINE); + if (n < 0) { + fprintf(stderr, "read error: errno=%d\n", errno); + close(fd); +@@ -237,7 +237,7 @@ static void *handler(void *_arg) + } + /* simulate a little bit of processing ;) */ + pth_yield (NULL); +- n = MyTLS_CPthSocket.write (MemOut->pGetBuf (), MemOut->GetBufLen()); ++ n = MyTLS_CPthSocket.socket_write (MemOut->pGetBuf (), MemOut->GetBufLen()); + //pth_write(fd, MemOut->pGetBuf (), MemOut->GetBufLen()); + } + /* close connection and let thread die */ diff --git a/inputmethod/unicon-im/patches/patck-al b/inputmethod/unicon-im/patches/patck-al deleted file mode 100644 index ccc03d2af5f..00000000000 --- a/inputmethod/unicon-im/patches/patck-al +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patck-al,v 1.1 2007/03/24 16:04:56 joerg Exp $ - ---- server/TLS_TcpipMain.cpp.orig 2000-06-14 04:00:01.000000000 +0000 -+++ server/TLS_TcpipMain.cpp -@@ -91,7 +91,7 @@ static void *handler(void *_arg) - printf ("========== Begin New Client Socket =========== \n"); - /* read request */ - while (bExit == 0) { -- n = MyTLS_CPthSocket.read (caLine, MAXREQLINE); -+ n = MyTLS_CPthSocket.socket_read (caLine, MAXREQLINE); - if (n < 0) { - fprintf(stderr, "read error: errno=%d\n", errno); - close(fd); -@@ -237,7 +237,7 @@ static void *handler(void *_arg) - } - /* simulate a little bit of processing ;) */ - pth_yield (NULL); -- n = MyTLS_CPthSocket.write (MemOut->pGetBuf (), MemOut->GetBufLen()); -+ n = MyTLS_CPthSocket.socket_write (MemOut->pGetBuf (), MemOut->GetBufLen()); - //pth_write(fd, MemOut->pGetBuf (), MemOut->GetBufLen()); - } - /* close connection and let thread die */ -- cgit v1.2.3