Bug 14719 - Update: japanese/ndtpd, japanese/eb
Summary: Update: japanese/ndtpd, japanese/eb
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Munechika Sumikawa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 1999-11-05 11:10 UTC by takamune
Modified: 1999-11-27 06:25 UTC (History)
0 users

See Also:


Attachments
file.diff (1.29 KB, patch)
1999-11-05 11:10 UTC, takamune
no flags Details | Diff
file.diff (1.46 KB, patch)
1999-11-05 11:10 UTC, takamune
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description takamune 1999-11-05 11:10:01 UTC
Please apply this patch to upgrade ports (of which I'm the maintainer).

Changes:
  - Updates japanese/ndtpd for the latest version ja-ndtpd-2.3.4(patched).
  - Updates japanese/eb for the latest version ja-eb-2.3.4.
  - These ports should be simultaneously upgraded.
  - japanese/eb/Makefile
	o Fix breakage of extraction appendix files.
	  <http://bento.freebsd.org/errorlogs/3-full/ja-eb-2.3.3.log>
  - No files have been added or removed.
Comment 1 takamune 1999-11-23 07:27:50 UTC
I'm the originator and the maintainer.
This is a reviced patch to upgrade ports.

  - Updates japanese/ndtpd for the latest version ja-ndtpd-2.3.5.
  - Updates japanese/eb for the latest version ja-eb-2.3.5.
	o Fix breakage of unfetchable distfiles.
  - These ports should be simultaneously upgraded.

Added:
  - japanese/ndtpd/patches/patch-aa
	o Use LOG_INFO priority for normal messages.
	  (I have submitted this patch to author, again).

Changes:
  - japanese/ndtpd/Makefile
	o Modify the dependency to make it easy to test these ports.
  - japanese/eb/Makefile
	o Fix breakage of unextractable appendix files.
  - japanese/eb/pkg/PLIST
	o Sort lines.

No files have been removed.

Fix:

diff -x CVS -Nur /usr/ports/japanese/ndtpd/Makefile japanese/ndtpd/Makefile
--- /usr/ports/japanese/ndtpd/Makefile	Wed Oct 27 20:04:09 1999
+++ japanese/ndtpd/Makefile	Tue Nov 23 12:00:00 1999
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.3.3
+# Version required:		2.3.5
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD: /home/ncvs/ports/japanese/ndtpd/Makefile,v 1.12 1999/10/27 08:46:46 mharo Exp $
 #
 
-DISTNAME=	ndtpd-2.3.3
-PKGNAME=	ja-ndtpd-2.3.3
+DISTNAME=	ndtpd-2.3.5
+PKGNAME=	ja-ndtpd-2.3.5
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-LIB_DEPENDS=	eb.3:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.3:${.CURDIR}/../eb
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${VARDIR} --with-eb --with-zlib \
diff -x CVS -Nur /usr/ports/japanese/ndtpd/files/md5 japanese/ndtpd/files/md5
--- /usr/ports/japanese/ndtpd/files/md5	Tue Sep 21 10:38:11 1999
+++ japanese/ndtpd/files/md5	Tue Nov 23 12:00:00 1999
@@ -1 +1 @@
-MD5 (ndtpd-2.3.3.tar.gz) = 6ff399fa4d8f685b8315fa1fd358f939
+MD5 (ndtpd-2.3.5.tar.gz) = dee1cde3d114a0cf5d5d6917382d953e
diff -x CVS -Nur /usr/ports/japanese/ndtpd/patches/patch-aa japanese/ndtpd/patches/patch-aa
--- /usr/ports/japanese/ndtpd/patches/patch-aa	Thu Jan  1 09:00:00 1970
+++ japanese/ndtpd/patches/patch-aa	Tue Nov 23 12:00:00 1999
@@ -0,0 +1,45 @@
+--- ndtpd/ndtpd.c.orig	Sat Sep  4 12:03:40 1999
++++ ndtpd/ndtpd.c	Tue Nov 23 12:00:00 1999
+@@ -497,9 +497,9 @@
+      * Set `once_started' flag.
+      */
+     if (once_started)
+-	syslog(LOG_NOTICE, "server restarted");
++	syslog(LOG_INFO, "server restarted");
+     else
+-	syslog(LOG_NOTICE, "server started");
++	syslog(LOG_INFO, "server started");
+     once_started = 1;
+ 
+     /*
+@@ -660,7 +660,7 @@
+     clear_line_buffer(&line_buffer);
+     clear_ticket_stock(&connection_ticket_stock);
+ 
+-    syslog(LOG_ERR, "the child server process exits");
++    syslog(LOG_INFO, "the child server process exits");
+     exit(0);
+ 
+     /*
+@@ -1102,10 +1102,10 @@
+     if (sig == SIGALRM) {
+ 	syslog(LOG_INFO, "the server process exits, timeout");
+     } else if (server_mode == SERVER_MODE_STANDALONE) {
+-	syslog(LOG_CRIT, "the server process exits, receives SIG%s",
++	syslog(LOG_INFO, "the server process exits, receives SIG%s",
+ 	    signal_name(sig));
+     } else {
+-	syslog(LOG_ERR, "the server process exits, receives SIG%s",
++	syslog(LOG_INFO, "the server process exits, receives SIG%s",
+ 	    signal_name(sig));
+     }
+ 
+@@ -1157,7 +1157,7 @@
+     int sig;
+ {
+     alarm(0);
+-    syslog(LOG_ERR, "the child server process exits, receives SIG%s",
++    syslog(LOG_INFO, "the child server process exits, receives SIG%s",
+ 	signal_name(sig));
+     shutdown(accepted_file, 2);
+ 

diff -x CVS -Nur /usr/ports/japanese/eb/Makefile japanese/eb/Makefile
--- /usr/ports/japanese/eb/Makefile	Wed Oct 27 20:04:08 1999
+++ japanese/eb/Makefile	Tue Nov 23 12:00:00 1999
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	eb
-# Version required:		2.3.3
+# Version required:		2.3.5
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD: /home/ncvs/ports/japanese/eb/Makefile,v 1.8 1999/10/27 08:45:29 mharo Exp $
 #
 
-DISTNAME=	eb-2.3.3
-PKGNAME=	ja-eb-2.3.3
+DISTNAME=	eb-2.3.5
+PKGNAME=	ja-eb-2.3.5
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
-DISTFILES=	${EBFILES} ${APPENDIXFILES:S,^,appendix/,}
+DISTFILES=	${EBFILES} ${APPENDIXFILES}
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
@@ -39,6 +39,7 @@
 		plus-2.0.tar.gz \
 		readers-2.2.tar.gz \
 		readers2-2.0.tar.gz
+APPENDIXFILES:=	${APPENDIXFILES:S,^,appendix/,}
 LISTFILES=	LIST LIST-ja
 
 EXTRACT_ONLY=	${EBFILES}
diff -x CVS -Nur /usr/ports/japanese/eb/files/md5 japanese/eb/files/md5
--- /usr/ports/japanese/eb/files/md5	Wed Oct 27 20:04:09 1999
+++ japanese/eb/files/md5	Tue Nov 23 12:00:00 1999
@@ -1,4 +1,4 @@
-MD5 (eb/eb-2.3.3.tar.gz) = f4d988441fe9eb8d82c8015c3a5cd462
+MD5 (eb/eb-2.3.5.tar.gz) = f84cca7164703dea5862f622f76eb515
 MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
 MD5 (eb/appendix/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
 MD5 (eb/appendix/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
diff -x CVS -Nur /usr/ports/japanese/eb/pkg/PLIST japanese/eb/pkg/PLIST
--- /usr/ports/japanese/eb/pkg/PLIST	Tue Sep  7 10:32:07 1999
+++ japanese/eb/pkg/PLIST	Tue Nov 23 12:00:00 1999
@@ -79,10 +79,10 @@
 share/eb/appendix/crownfj-2.0/crown_fj/data/furoku
 share/eb/appendix/crownfj-2.0/daily_ei.app
 share/eb/appendix/crownfj-2.0/daily_ei/data/furoku
-share/eb/appendix/daihyakka-1.0/catalog.app
-share/eb/appendix/daihyakka-1.0/dhk01/appendix
 share/eb/appendix/daihyakka-1.0/catalog
+share/eb/appendix/daihyakka-1.0/catalog.app
 share/eb/appendix/daihyakka-1.0/dhk01.app
+share/eb/appendix/daihyakka-1.0/dhk01/appendix
 share/eb/appendix/daijirin-2.0/catalogs
 share/eb/appendix/daijirin-2.0/catalogs.app
 share/eb/appendix/daijirin-2.0/dgx01.app
Comment 2 takamune 1999-11-24 08:28:06 UTC
I have contacted the author and we have a conclusion.
Only one patch is adopted.

Please change `japanese/ndtpd/patches/patch-aa'.

diff -x CVS -Nur /usr/ports/japanese/ndtpd/patches/patch-aa japanese/ndtpd/patches/patch-aa
--- /usr/ports/japanese/ndtpd/patches/patch-aa	Thu Jan  1 09:00:00 1970
+++ japanese/ndtpd/patches/patch-aa	Tue Nov 23 12:00:00 1999
@@ -0,0 +1,45 @@
+--- ndtpd/ndtpd.c.orig	Sat Sep  4 12:03:40 1999
++++ ndtpd/ndtpd.c	Tue Nov 23 12:00:00 1999
+@@ -660,7 +660,7 @@
+     clear_line_buffer(&line_buffer);
+     clear_ticket_stock(&connection_ticket_stock);
+ 
+-    syslog(LOG_ERR, "the child server process exits");
++    syslog(LOG_INFO, "the child server process exits");
+     exit(0);
+ 
+     /*
Comment 3 Munechika Sumikawa freebsd_committer freebsd_triage 1999-11-25 15:01:47 UTC
Responsible Changed
From-To: freebsd-ports->sumikawa

I'll handle this. 
Comment 4 Munechika Sumikawa freebsd_committer freebsd_triage 1999-11-27 06:25:22 UTC
State Changed
From-To: open->closed

commited, thanks!