5 files changed, 52 insertions, 11 deletions
diff --git a/app-i18n/skkserv/ChangeLog b/app-i18n/skkserv/ChangeLog
index 51f0b2c6259f..e11075fbc3f5 100644
--- a/app-i18n/skkserv/ChangeLog
+++ b/app-i18n/skkserv/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for app-i18n/skkserv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/ChangeLog,v 1.9 2003/06/29 22:12:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/ChangeLog,v 1.10 2003/08/01 16:32:40 usata Exp $
 
 *skkserv-9.6-r2 (17 May 2003)
 
+  02 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> skkserv-9.6-r2.ebuild,
+  files/skkserv-9.6-segfault-gentoo.patch, files/skkserv.initd:
+  Applied a patch that fixes segfault problem with inappropriate /etc/hosts
+  file, cf. http://www.jp.FreeBSD.ORG/QandA/HTML/1285.html
+
   17 May 2003; Masatomo Nakano <nakano@gentoo.org> skkserv-9.6-r2.ebuild:
   Fixed bug.
 
diff --git a/app-i18n/skkserv/Manifest b/app-i18n/skkserv/Manifest
index 6619a12c7b0e..b869f643e04e 100644
--- a/app-i18n/skkserv/Manifest
+++ b/app-i18n/skkserv/Manifest
@@ -1,9 +1,11 @@
-MD5 82e5ec917764f53b30b3e94a2da63b6d ChangeLog 943
-MD5 6aede81c7ac09368832a62e814c30eb3 skkserv-9.6.ebuild 908
+MD5 fbe4887a82d22ef447ee64b19e7f1b38 ChangeLog 1217
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 7d7e5f9bc13172100b580a73ae733a8f skkserv-9.6-r1.ebuild 937
-MD5 c55b3076c770268652ead3a620fd31bc skkserv-9.6-r2.ebuild 937
+MD5 a8ca18b2d755178fae1c5d1c0f4521d3 skkserv-9.6-r2.ebuild 936
+MD5 6aede81c7ac09368832a62e814c30eb3 skkserv-9.6.ebuild 908
 MD5 e024045d7d565a14129a2eaf6dc17b75 files/digest-skkserv-9.6 60
 MD5 e024045d7d565a14129a2eaf6dc17b75 files/digest-skkserv-9.6-r1 60
 MD5 e024045d7d565a14129a2eaf6dc17b75 files/digest-skkserv-9.6-r2 60
+MD5 06e2b5d59f2c16fd420199c7e4cfb888 files/skkserv.initd 460
+MD5 70c1dee7241cbbc22e632050f07e8f4e files/skkserv-9.6-segfault-gentoo.patch 479
 MD5 84c01638b93574c557637a227ba3fbe1 files/skkserv-9.6/skkserv.initd 473
diff --git a/app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch b/app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch
new file mode 100644
index 000000000000..e40bfa942c1f
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv-9.6-segfault-gentoo.patch
@@ -0,0 +1,15 @@
+--- skkserv.c.orig   Tue Jan 21 04:16:36 1997
++++ skkserv.c        Thu Mar 25 19:45:50 1999
+@@ -723,7 +723,11 @@
+     fprintf(errout, "%s:cannot get hostname, or too long hostname\n", pgmnm);
+     exit(1);
+   }
+-  hentry = gethostbyname(hname);
++  if ((hentry = gethostbyname(hname)) == NULL
++       && (hentry = gethostbyname("localhost")) == NULL) {
++    perror("gethostbyname");
++    exit(1);
++  }
+ #ifdef NO_ADDR_LIST
+   strcat(hname, ":");
+   strcat(hname, hentry->h_addr);
diff --git a/app-i18n/skkserv/files/skkserv.initd b/app-i18n/skkserv/files/skkserv.initd
new file mode 100644
index 000000000000..1f22109db4e6
--- /dev/null
+++ b/app-i18n/skkserv/files/skkserv.initd
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/files/skkserv.initd,v 1.1 2003/08/01 16:32:40 usata Exp $
+
+start() {
+	ebegin "Starting skkserv"
+	start-stop-daemon --start --quiet --exec /usr/sbin/skkserv
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping skkserv"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/skkserv
+	eend $?
+}
diff --git a/app-i18n/skkserv/skkserv-9.6-r2.ebuild b/app-i18n/skkserv/skkserv-9.6-r2.ebuild
index e0bd27920dbf..8f1540720beb 100644
--- a/app-i18n/skkserv/skkserv-9.6-r2.ebuild
+++ b/app-i18n/skkserv/skkserv-9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/skkserv-9.6-r2.ebuild,v 1.1 2003/05/17 11:04:02 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/skkserv-9.6-r2.ebuild,v 1.2 2003/08/01 16:32:40 usata Exp $
 
 S="${WORKDIR}/skk-${PV}mu"
 MY_P="skk${PV}mu"
@@ -16,11 +16,14 @@ DEPEND="virtual/glibc
 
 PROVIDE="virtual/skkserv"
 
+src_unpack(){
+	unpack ${A}
+	cd ${S}/skkserv
+	epatch ${FILESDIR}/${P}-segfault-gentoo.patch
+}
+
 src_compile() {
-	./configure \
-	       --host=${CHOST} \
-	       --prefix=/usr \
-		   --libexecdir=/usr/sbin || die "./configure failed"
+	econf --libexecdir=/usr/sbin || die "econf failed"
 	cd skkserv
 
 	emake || die
@@ -31,6 +34,6 @@ src_install () {
 	cd skkserv
 	dosbin skkserv
 
-	# install rc script and its config file
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${P}/skkserv.initd skkserv
+	# install rc script
+	exeinto /etc/init.d ; newexe ${FILESDIR}/skkserv.initd skkserv
 }