Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jul 2006 02:00:20 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/100032: Update port: ftp/yafc to 1.1.1
Message-ID:  <20060711020020.bf6953f3.tkato432@yahoo.com>
Resent-Message-ID: <200607101710.k6AHAGcl082182@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         100032
>Category:       ports
>Synopsis:       Update port: ftp/yafc to 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 10 17:10:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p19 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.1

New file:
files/patch-src__input.c

Remove file:
files/patch-src::ftp::rfile.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/ftp/yafc/Makefile ftp/yafc/Makefile
--- /usr/ports/ftp/yafc/Makefile	Thu Nov 10 16:27:42 2005
+++ ftp/yafc/Makefile	Sun Jul  9 12:42:54 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yafc
-PORTVERSION=	1.1
+PORTVERSION=	1.1.1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,13 +21,21 @@
 CONFIGURE_ARGS=	--with-socks4=no --with-socks5=no --with-krb4=no \
 		--with-krb5=no --with-gssapi=no
 
-PLIST_FILES=	bin/yafc %%EXAMPLESDIR%%/inputrc.sample %%EXAMPLESDIR%%/yafcrc.sample
-PLIST_DIRS=	%%EXAMPLESDIR%%
 MAN1=		yafc.1
 INFO=		yafc
+PLIST_FILES=	bin/yafc \
+		%%EXAMPLESDIR%%/inputrc.sample \
+		%%EXAMPLESDIR%%/yafcrc.sample
+PLIST_DIRS=	%%EXAMPLESDIR%%
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
+.endif
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.sample ${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/ftp/yafc/distinfo ftp/yafc/distinfo
--- /usr/ports/ftp/yafc/distinfo	Fri Nov 25 13:34:43 2005
+++ ftp/yafc/distinfo	Sun Jul  9 03:29:44 2006
@@ -1,3 +1,3 @@
-MD5 (yafc-1.1.tar.bz2) = 877c21d9b70d89474d1a6478a21c1e51
-SHA256 (yafc-1.1.tar.bz2) = 5eb28b04f2e3166bddc2b3555d7e316278b0405c36284bec07a0c008ca7e94f5
-SIZE (yafc-1.1.tar.bz2) = 463528
+MD5 (yafc-1.1.1.tar.bz2) = 832d074183a36ee15b47553ed5962fce
+SHA256 (yafc-1.1.1.tar.bz2) = ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6
+SIZE (yafc-1.1.1.tar.bz2) = 858991
diff -urN /usr/ports/ftp/yafc/files/patch-src::ftp::rfile.c ftp/yafc/files/patch-src::ftp::rfile.c
--- /usr/ports/ftp/yafc/files/patch-src::ftp::rfile.c	Sat May 29 03:34:03 2004
+++ ftp/yafc/files/patch-src::ftp::rfile.c	Thu Jan  1 09:00:00 1970
@@ -1,74 +0,0 @@
---- src/ftp/rfile.c.orig	Thu May 20 20:10:52 2004
-+++ src/ftp/rfile.c	Sun May 23 21:49:54 2004
-@@ -439,7 +439,11 @@
-         free(saved_field[0]);
-         f->owner = saved_field[1];
-         f->group = saved_field[2];
-+#if 0
-         f->size = atoll(saved_field[3]);
-+#else
-+        f->size = strtoll(saved_field[3], NULL, 10);
-+#endif
-         free(saved_field[3]);
-         m = saved_field[4];
-         NEXT_FIELD2;
-@@ -453,7 +457,11 @@
-         free(saved_field[0]);
-         f->owner = saved_field[1];
-         f->group = xstrdup("group");
-+#if 0
-         f->size = atoll(saved_field[2]);
-+#else
-+        f->size = strtoll(saved_field[2], NULL, 10);
-+#endif
-         free(saved_field[2]);
-         m = saved_field[3];
-         d = saved_field[4];
-@@ -465,7 +473,11 @@
-         f->nhl = 0;
-         f->owner = xstrdup("owner");;
-         f->group = xstrdup("group");
-+#if 0
-         f->size = atoll(saved_field[1]);
-+#else
-+        f->size = strtoll(saved_field[1], NULL, 10);
-+#endif
-         free(saved_field[1]);
-         m = saved_field[2];
-         d = saved_field[3];
-@@ -480,7 +492,11 @@
-             free(saved_field[0]);
-             f->owner = saved_field[1];
-             f->group = saved_field[2];
-+#if 0
-             f->size = atoll(saved_field[3]);
-+#else
-+            f->size = strtoll(saved_field[3], NULL, 10);
-+#endif
-             free(saved_field[3]);
-             free(saved_field[4]);
- 
-@@ -624,7 +640,11 @@
-         f->perm[0] = 'd';
-         f->size = 0L;
-     } else {
-+#if 0
-         f->size = (unsigned long long)atoll(e);
-+#else
-+        f->size = (unsigned long long)strtoll(e, NULL, 10);
-+#endif
-     }
- 
-     f->nhl = 1;
-@@ -686,7 +706,11 @@
-              * FTP" Internet draft, but PureFTPd uses it for some
-              * reason for size of directories
-              */
-+#if 0
-             f->size = atoll(value);
-+#else
-+            f->size = strtoll(value, NULL, 10);
-+#endif
-         else if(strcasecmp(factname, "type") == 0) {
-             if(strcasecmp(value, "file") == 0)
-                 isdir = false;
diff -urN /usr/ports/ftp/yafc/files/patch-src__input.c ftp/yafc/files/patch-src__input.c
--- /usr/ports/ftp/yafc/files/patch-src__input.c	Thu Jan  1 09:00:00 1970
+++ ftp/yafc/files/patch-src__input.c	Sun Jul  9 12:42:39 2006
@@ -0,0 +1,66 @@
+--- src/input.c.bak	Thu Oct  6 04:31:25 2005
++++ src/input.c	Sun Jul  9 12:42:12 2006
+@@ -76,7 +76,11 @@
+ 
+ # include <fcntl.h> 
+ # include <sys/ioctl.h> 
++#if 0
+ # include <termio.h> 
++#else
++# include <termios.h> 
++#endif
+ 
+ char *getpass_hook(const char *prompt)
+ {
+@@ -89,23 +93,39 @@
+ #else
+ 	int c, n = 0;
+ 	char tmp[1024];
++#if 0
+ 	struct termio tbuf, tbufsave;
++#else
++	struct termios tbuf, tbufsave;
++#endif
+ 	FILE *fd;
+ 
+ 	if((fd = fopen("/dev/tty", "rb")) == NULL) {
+ 		perror("fopen /dev/tty");
+ 		return NULL;
+ 	}
++#if 0
+ 	if (ioctl(fileno(fd), TCGETA, &tbuf) < 0) {
++#else
++	if (ioctl(fileno(fd), TIOCGETA, &tbuf) < 0) {
++#endif
+ 		perror("ioctl get");
+ 		fclose(fd);
+ 		return NULL;
+ 	}
+ 	tbufsave = tbuf;
++#if 0
+ 	tbuf.c_iflag &= ~(IUCLC | ISTRIP | IXON | IXOFF);
++#else
++	tbuf.c_iflag &= ~(ISTRIP | IXON | IXOFF);
++#endif
+ 	tbuf.c_lflag &= ~(ICANON | ISIG | ECHO);
+ 	tbuf.c_cc[4] = 1; /* MIN */
++#if 0
+ 	if (ioctl(fileno(fd), TCSETA, &tbuf) < 0) {
++#else
++	if (ioctl(fileno(fd), TIOCSETA, &tbuf) < 0) {
++#endif
+ 		perror("ioctl set");
+ 		fclose(fd);
+ 		return NULL;
+@@ -132,7 +152,11 @@
+ 		fflush(stderr);
+ 	}
+ 	tmp[n] = '\0';
++#if 0
+ 	if (ioctl(fileno(fd), TCSETA, &tbufsave) < 0) {
++#else
++	if (ioctl(fileno(fd), TIOCSETA, &tbufsave) < 0) {
++#endif
+ 		perror("ioctl restore");
+ 		fclose(fd);
+ 		return NULL;
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060711020020.bf6953f3.tkato432>