Date: Wed, 30 Oct 2013 05:45:42 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332071 - in head/ftp/atftp: . files Message-ID: <201310300545.r9U5jgOc029037@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Wed Oct 30 05:45:42 2013 New Revision: 332071 URL: http://svnweb.freebsd.org/changeset/ports/332071 Log: - Support stage - Silent warnings Modified: head/ftp/atftp/Makefile head/ftp/atftp/files/patch-tftp_def.c head/ftp/atftp/files/patch-tftp_def.h head/ftp/atftp/files/patch-tftpd.h head/ftp/atftp/files/patch-tftpd_list.c Modified: head/ftp/atftp/Makefile ============================================================================== --- head/ftp/atftp/Makefile Wed Oct 30 05:43:05 2013 (r332070) +++ head/ftp/atftp/Makefile Wed Oct 30 05:45:42 2013 (r332071) @@ -16,11 +16,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USE_RC_SUBR= atftpd GNU_CONFIGURE= yes -PLIST_FILES= bin/atftp \ - sbin/atftpd +PLIST_FILES= bin/atftp sbin/atftpd man/man1/atftp.1.gz man/man8/atftpd.8.gz -MAN1= atftp.1 -MAN8= atftpd.8 - -NO_STAGE= yes .include <bsd.port.mk> Modified: head/ftp/atftp/files/patch-tftp_def.c ============================================================================== --- head/ftp/atftp/files/patch-tftp_def.c Wed Oct 30 05:43:05 2013 (r332070) +++ head/ftp/atftp/files/patch-tftp_def.c Wed Oct 30 05:45:42 2013 (r332071) @@ -1,8 +1,20 @@ ---- tftp_def.c.orig 2010-10-11 11:20:48.000000000 +0800 -+++ tftp_def.c 2010-10-11 11:20:40.000000000 +0800 -@@ -140,11 +140,14 @@ +--- tftp_def.c.orig 2004-02-13 11:16:09.000000000 +0800 ++++ tftp_def.c 2013-10-30 13:34:05.000000000 +0800 +@@ -88,7 +88,7 @@ + res->tv_usec -= 1000000; + return -1; + } +- else if (res->tv_usec <= 0); ++ else + { + return -1; + } +@@ -138,13 +138,16 @@ + /* + * This is a strncpy function that take care of string NULL termination */ - inline char *Strncpy(char *to, const char *from, size_t size) +-inline char *Strncpy(char *to, const char *from, size_t size) ++char *Strncpy(char *to, const char *from, size_t size) { - to[size-1] = '\000'; - return strncpy(to, from, size - 1); Modified: head/ftp/atftp/files/patch-tftp_def.h ============================================================================== --- head/ftp/atftp/files/patch-tftp_def.h Wed Oct 30 05:43:05 2013 (r332070) +++ head/ftp/atftp/files/patch-tftp_def.h Wed Oct 30 05:45:42 2013 (r332071) @@ -1,5 +1,5 @@ --- tftp_def.h.orig 2004-02-13 11:16:09.000000000 +0800 -+++ tftp_def.h 2012-11-21 13:21:56.000000000 +0800 ++++ tftp_def.h 2013-10-30 13:23:22.000000000 +0800 @@ -19,6 +19,7 @@ #include <sys/time.h> @@ -13,7 +13,7 @@ int timeval_diff(struct timeval *res, struct timeval *t1, struct timeval *t0); int print_eng(double value, char *string, int size, char *format); -inline char *Strncpy(char *to, const char *from, size_t size); -+extern inline char *Strncpy(char *to, const char *from, size_t size); ++char *Strncpy(char *to, const char *from, size_t size); int Gethostbyname(char *addr, struct hostent *host); #endif Modified: head/ftp/atftp/files/patch-tftpd.h ============================================================================== --- head/ftp/atftp/files/patch-tftpd.h Wed Oct 30 05:43:05 2013 (r332070) +++ head/ftp/atftp/files/patch-tftpd.h Wed Oct 30 05:45:42 2013 (r332071) @@ -1,5 +1,5 @@ --- tftpd.h.orig 2004-02-27 10:05:26.000000000 +0800 -+++ tftpd.h 2012-11-21 13:07:15.000000000 +0800 ++++ tftpd.h 2013-10-30 13:25:35.000000000 +0800 @@ -71,6 +71,11 @@ struct client_info { struct sockaddr_in client; @@ -17,7 +17,7 @@ * Defined in tftpd_list.c, operation on client structure list. */ -inline void tftpd_clientlist_ready(struct thread_data *thread); -+extern inline void tftpd_clientlist_ready(struct thread_data *thread); ++void tftpd_clientlist_ready(struct thread_data *thread); void tftpd_clientlist_remove(struct thread_data *thread, struct client_info *client); void tftpd_clientlist_free(struct thread_data *thread); Modified: head/ftp/atftp/files/patch-tftpd_list.c ============================================================================== --- head/ftp/atftp/files/patch-tftpd_list.c Wed Oct 30 05:43:05 2013 (r332070) +++ head/ftp/atftp/files/patch-tftpd_list.c Wed Oct 30 05:45:42 2013 (r332071) @@ -1,5 +1,5 @@ ---- tftpd_list.c.orig 2010-10-11 12:44:39.000000000 +0800 -+++ tftpd_list.c 2010-10-11 12:44:34.000000000 +0800 +--- tftpd_list.c.orig 2004-02-27 10:05:26.000000000 +0800 ++++ tftpd_list.c 2013-10-30 13:25:57.000000000 +0800 @@ -137,23 +137,17 @@ struct thread_data *data, struct client_info *client) @@ -40,3 +40,12 @@ { *thread = current; /* insert the new client at the end. If the client is already +@@ -202,7 +196,7 @@ + return 0; + } + +-inline void tftpd_clientlist_ready(struct thread_data *thread) ++void tftpd_clientlist_ready(struct thread_data *thread) + { + pthread_mutex_lock(&thread->client_mutex); + thread->client_ready = 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310300545.r9U5jgOc029037>