From: Jan Rękorajski Date: Tue, 18 Oct 2016 17:28:55 +0000 (+0200) Subject: - remove broken inlines X-Git-Tag: auto/th/atftp-0.7.1-4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fatftp.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fatftp-0.7.1-4 - remove broken inlines - rel 4 --- diff --git a/atftp.spec b/atftp.spec index 0db7e2e..7fce561 100644 --- a/atftp.spec +++ b/atftp.spec @@ -5,7 +5,7 @@ Summary(pl.UTF-8): Klient TFTP (Trivial File Transfer Protocol) Summary(tr.UTF-8): Ä°lkel dosya aktarım protokolu (TFTP) için sunucu ve istemci Name: atftp Version: 0.7.1 -Release: 3 +Release: 4 License: GPL Group: Applications/Networking Source0: http://downloads.sourceforge.net/project/atftp/%{name}-%{version}.tar.gz @@ -15,6 +15,7 @@ Source2: %{name}d.init Source3: %{name}d.sysconfig Patch0: %{name}-tinfo.patch Patch1: %{name}-clk.patch +Patch2: no-inline.patch URL: http://sourceforge.net/projects/atftp/ BuildRequires: autoconf BuildRequires: automake @@ -130,6 +131,7 @@ standalone. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i -e 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#g' configure.ac sed -i -e 's#CFLAGS="-g -Wall -D_REENTRANT"##g' configure.ac diff --git a/no-inline.patch b/no-inline.patch new file mode 100644 index 0000000..da2be2a --- /dev/null +++ b/no-inline.patch @@ -0,0 +1,33 @@ +--- atftp-0.7.1/argz.h~ 2011-03-11 07:51:24.000000000 +0100 ++++ atftp-0.7.1/argz.h 2016-10-18 19:25:56.408888344 +0200 +@@ -177,7 +177,7 @@ + extern char *argz_next (__const char *__restrict __argz, size_t __argz_len, + __const char *__restrict __entry) __THROW; + +-#ifdef __USE_EXTERN_INLINES ++#if 0 + extern inline char * + __argz_next (__const char *__argz, size_t __argz_len, + __const char *__entry) +--- atftp-0.7.1/tftpd.h~ 2011-03-11 07:51:24.000000000 +0100 ++++ atftp-0.7.1/tftpd.h 2016-10-18 19:27:33.845636877 +0200 +@@ -93,7 +93,7 @@ + /* + * Defined in tftpd_list.c, operation on client structure list. + */ +-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); +--- atftp-0.7.1/tftp_def.h~ 2011-03-24 09:24:18.000000000 +0100 ++++ atftp-0.7.1/tftp_def.h 2016-10-18 19:26:51.552296429 +0200 +@@ -50,7 +50,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); ++char *Strncpy(char *to, const char *from, size_t size); + int Gethostbyname(char *addr, struct hostent *host); + + char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t);