From dff91c4417d64c5c0dae75ec8cc51a8a5c5b709e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 16:46:27 +0100 Subject: fix musl compile --- package/ebtables/Makefile | 2 +- package/ebtables/patches/patch-Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 59f2ea6ba..e39f58070 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIG_STYLE:= manual -post-install: +ebtables-install: ${INSTALL_DIR} ${IDIR_EBTABLES}/etc ${INSTALL_DIR} ${IDIR_EBTABLES}/usr/sbin ${IDIR_EBTABLES}/usr/lib ${INSTALL_DATA} ${WRKINST}/etc/ethertypes ${IDIR_EBTABLES}/etc diff --git a/package/ebtables/patches/patch-Makefile b/package/ebtables/patches/patch-Makefile index ff5934a70..f4e293eaf 100644 --- a/package/ebtables/patches/patch-Makefile +++ b/package/ebtables/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- ebtables-v2.0.10-3.orig/Makefile 2011-12-04 10:46:26.000000000 +0100 -+++ ebtables-v2.0.10-3/Makefile 2011-12-11 16:35:34.619464748 +0100 -@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed +--- ebtables-v2.0.10-4.orig/Makefile 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/Makefile 2014-03-23 15:46:20.000000000 +0100 +@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed # default paths LIBDIR:=/usr/lib -- cgit v1.2.3 From a80b51369fb718a1a811fb9c0c9a81e4e9e3b4e3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 16:46:47 +0100 Subject: fix musl compile --- package/gkrellm/Makefile | 6 ++--- package/gkrellm/patches/patch-server_Makefile | 30 ---------------------- package/gkrellm/patches/patch-server_main_c | 24 +++++++++++++++++ .../gkrellm/patches/patch-server_sysdeps-unix_c | 10 ++++++++ 4 files changed, 37 insertions(+), 33 deletions(-) delete mode 100644 package/gkrellm/patches/patch-server_Makefile create mode 100644 package/gkrellm/patches/patch-server_main_c create mode 100644 package/gkrellm/patches/patch-server_sysdeps-unix_c diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile index 1b4a6b118..e8efdabd4 100644 --- a/package/gkrellm/Makefile +++ b/package/gkrellm/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gkrellm -PKG_VERSION:= 2.3.4 +PKG_VERSION:= 2.3.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff -PKG_DESCR:= The GNU Krell Monitors Server +PKG_MD5SUM:= 05d00fa8d6376038b0c7e967583c0b8d +PKG_DESCR:= GNU krell monitors server PKG_SECTION:= net/misc PKG_DEPENDS:= glib libpthread PKG_BUILDDEP:= glib diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile deleted file mode 100644 index a1a8747e7..000000000 --- a/package/gkrellm/patches/patch-server_Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- gkrellm-2.3.4.orig/server/Makefile 2008-10-03 23:52:48.000000000 +0200 -+++ gkrellm-2.3.4/server/Makefile 2011-05-17 11:34:14.926610183 +0200 -@@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1 - MANMODE ?= 644 - MANDIRMODE ?= 755 - INSTALL ?= install --LINK_FLAGS ?= -Wl,-E -+LINK_FLAGS ?= -Wl,-E $(LDFLAGS) - EXTRAOBJS = - - SHARED_PATH = ../shared -@@ -109,15 +109,15 @@ endif - - override CC += -Wall $(FLAGS) - --OS_NAME=$(shell uname -s) --OS_RELEASE=$(shell uname -r) -+OS_NAME=Linux -+OS_RELEASE=2.6 - - OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o - - all: gkrellmd - - gkrellmd: $(OBJS) $(EXTRAOBJS) -- $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) -+ $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS) - - static: $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ diff --git a/package/gkrellm/patches/patch-server_main_c b/package/gkrellm/patches/patch-server_main_c new file mode 100644 index 000000000..c02fb8930 --- /dev/null +++ b/package/gkrellm/patches/patch-server_main_c @@ -0,0 +1,24 @@ +--- gkrellm-2.3.5.orig/server/main.c 2010-10-02 18:13:29.000000000 +0200 ++++ gkrellm-2.3.5/server/main.c 2014-03-23 16:06:59.000000000 +0100 +@@ -39,21 +39,6 @@ + #include + #endif // !WIN32 + +-// win32 defines addrinfo but only supports getaddrinfo call on winxp or newer +-#if !defined(HAVE_GETADDRINFO) && !defined(WIN32) +-struct addrinfo +- { +- int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ +- int ai_family; /* PF_xxx */ +- int ai_socktype; /* SOCK_xxx */ +- int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ +- size_t ai_addrlen; /* length of ai_addr */ +- char *ai_canonname; /* canonical name for hostname */ +- struct sockaddr *ai_addr; /* binary address */ +- struct addrinfo *ai_next; /* next structure in linked list */ +- }; +-#endif // !HAVE_GETADDRINFO +- + #if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY) + #define IPV6_V6ONLY IPV6_BINDV6ONLY + #endif diff --git a/package/gkrellm/patches/patch-server_sysdeps-unix_c b/package/gkrellm/patches/patch-server_sysdeps-unix_c new file mode 100644 index 000000000..e69631735 --- /dev/null +++ b/package/gkrellm/patches/patch-server_sysdeps-unix_c @@ -0,0 +1,10 @@ +--- gkrellm-2.3.5.orig/server/sysdeps-unix.c 2010-09-14 18:34:34.000000000 +0200 ++++ gkrellm-2.3.5/server/sysdeps-unix.c 2014-03-23 16:13:57.000000000 +0100 +@@ -145,6 +145,7 @@ gkrellm_sensors_linux_name_fix(gchar *id + #endif + } + ++#define HAVE_GETADDRINFO 1 + #ifdef SENSORS_COMMON + gint + gkrellm_connect_to(gchar *server, gint server_port) -- cgit v1.2.3 From e3e23911a37596937e472a2c91141e79b295cb4f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 16:47:47 +0100 Subject: fix musl compile, partially from alpinelinxu --- package/findutils/Makefile | 2 +- .../patches/patch-gnulib_lib_freadahead_c | 15 ++++++++++++ .../patches/patch-gnulib_lib_freadahead_h | 24 +++++++++++++++++++ .../findutils/patches/patch-gnulib_lib_fseeko_c | 18 +++++++++++++++ .../findutils/patches/patch-gnulib_m4_fflush_m4 | 27 ++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 package/findutils/patches/patch-gnulib_lib_freadahead_c create mode 100644 package/findutils/patches/patch-gnulib_lib_freadahead_h create mode 100644 package/findutils/patches/patch-gnulib_lib_fseeko_c create mode 100644 package/findutils/patches/patch-gnulib_m4_fflush_m4 diff --git a/package/findutils/Makefile b/package/findutils/Makefile index 46c3e6681..b3b413932 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= findutils PKG_VERSION:= 4.4.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f PKG_DESCR:= GNU utilities for finding files PKG_SECTION:= utils diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_c b/package/findutils/patches/patch-gnulib_lib_freadahead_c new file mode 100644 index 000000000..d998fbf6c --- /dev/null +++ b/package/findutils/patches/patch-gnulib_lib_freadahead_c @@ -0,0 +1,15 @@ +--- findutils-4.4.2.orig/gnulib/lib/freadahead.c 2009-05-10 23:23:57.000000000 +0200 ++++ findutils-4.4.2/gnulib/lib/freadahead.c 2014-03-23 16:27:43.000000000 +0100 +@@ -19,6 +19,7 @@ + /* Specification. */ + #include "freadahead.h" + ++#ifndef HAVE___FREADAHEAD + size_t + freadahead (FILE *fp) + { +@@ -64,3 +65,4 @@ freadahead (FILE *fp) + #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib." + #endif + } ++#endif diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_h b/package/findutils/patches/patch-gnulib_lib_freadahead_h new file mode 100644 index 000000000..194232201 --- /dev/null +++ b/package/findutils/patches/patch-gnulib_lib_freadahead_h @@ -0,0 +1,24 @@ +--- findutils-4.4.2.orig/gnulib/lib/freadahead.h 2009-05-10 23:23:57.000000000 +0200 ++++ findutils-4.4.2/gnulib/lib/freadahead.h 2014-03-23 16:27:43.000000000 +0100 +@@ -29,8 +29,21 @@ extern "C" { + + STREAM must not be wide-character oriented. */ + ++#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */ ++ ++#ifndef HAVE___FREADAHEAD ++#define HAVE___FREADAHEAD 1 ++#endif ++ ++# include ++# define freadahead(stream) __freadahead (stream) ++ ++#else ++ + extern size_t freadahead (FILE *stream); + ++#endif ++ + #ifdef __cplusplus + } + #endif diff --git a/package/findutils/patches/patch-gnulib_lib_fseeko_c b/package/findutils/patches/patch-gnulib_lib_fseeko_c new file mode 100644 index 000000000..aba9a1133 --- /dev/null +++ b/package/findutils/patches/patch-gnulib_lib_fseeko_c @@ -0,0 +1,18 @@ +--- findutils-4.4.2.orig/gnulib/lib/fseeko.c 2009-05-10 23:25:10.000000000 +0200 ++++ findutils-4.4.2/gnulib/lib/fseeko.c 2014-03-23 16:35:34.000000000 +0100 +@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int + if ((fp->_Mode & _MWRITE ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend) + && fp->_Rback == fp->_Back + sizeof (fp->_Back) + && fp->_Rsave == NULL) ++#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION ++ /* Cross-compiling to some other system advertising conformance to ++ POSIX.1-2008 or later. Assume fseeko and fflush work as advertised. ++ If this assumption is incorrect, please report the bug to ++ bug-gnulib. */ ++ if (0) + #else +- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." ++ #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." + #endif + { + off_t pos = lseek (fileno (fp), offset, whence); diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4 new file mode 100644 index 000000000..5cee53cc0 --- /dev/null +++ b/package/findutils/patches/patch-gnulib_m4_fflush_m4 @@ -0,0 +1,27 @@ +--- findutils-4.4.2.orig/gnulib/m4/fflush.m4 2009-05-10 23:23:57.000000000 +0200 ++++ findutils-4.4.2/gnulib/m4/fflush.m4 2014-03-23 16:40:29.000000000 +0100 +@@ -32,14 +32,20 @@ AC_DEFUN([gl_FUNC_FFLUSH], + return 4; + return !(lseek (fd, 0, SEEK_CUR) == 5); + ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no], +- [dnl Pessimistically assume fflush is broken. This is wrong for +- dnl at least glibc and cygwin; but lib/fflush.c takes this into account. +- gl_cv_func_fflush_stdin=no]) ++ [gl_cv_func_fflush_stdin=cross]) + rm conftest.txt + ]) +- if test $gl_cv_func_fflush_stdin = no; then ++ if test $gl_cv_func_fflush_stdin != yes; then + gl_REPLACE_FFLUSH + fi ++ case $gl_cv_func_fflush_stdin in ++ yes) gl_func_fflush_stdin=1 ;; ++ no) gl_func_fflush_stdin=0 ;; ++ *) gl_func_fflush_stdin='(-1)' ;; ++ esac ++ AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin], ++ [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, ++ 0 if fflush is known to not work, -1 if unknown.]) + ]) + + AC_DEFUN([gl_REPLACE_FFLUSH], -- cgit v1.2.3 From 2103c803f6f379ba74b931830003d527e59c4c15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 16:48:09 +0100 Subject: add missed patches --- .../ebtables/patches/patch-extensions_ebt_among_c | 10 ++++++++ .../patches/patch-extensions_ebt_arpreply_c | 10 ++++++++ .../ebtables/patches/patch-extensions_ebt_ip6_c | 10 ++++++++ .../ebtables/patches/patch-extensions_ebt_limit_c | 10 ++++++++ .../ebtables/patches/patch-extensions_ebt_nat_c | 10 ++++++++ .../ebtables/patches/patch-include_ethernetdb_h | 29 ++++++++++++++++++++++ package/ebtables/patches/patch-useful_functions_c | 10 ++++++++ 7 files changed, 89 insertions(+) create mode 100644 package/ebtables/patches/patch-extensions_ebt_among_c create mode 100644 package/ebtables/patches/patch-extensions_ebt_arpreply_c create mode 100644 package/ebtables/patches/patch-extensions_ebt_ip6_c create mode 100644 package/ebtables/patches/patch-extensions_ebt_limit_c create mode 100644 package/ebtables/patches/patch-extensions_ebt_nat_c create mode 100644 package/ebtables/patches/patch-include_ethernetdb_h create mode 100644 package/ebtables/patches/patch-useful_functions_c diff --git a/package/ebtables/patches/patch-extensions_ebt_among_c b/package/ebtables/patches/patch-extensions_ebt_among_c new file mode 100644 index 000000000..08f3fb7f1 --- /dev/null +++ b/package/ebtables/patches/patch-extensions_ebt_among_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/extensions/ebt_among.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/extensions/ebt_among.c 2014-03-23 15:51:29.000000000 +0100 +@@ -13,7 +13,6 @@ + #include + #include + #include "../include/ebtables_u.h" +-#include + #include "../include/ethernetdb.h" + #include + #include diff --git a/package/ebtables/patches/patch-extensions_ebt_arpreply_c b/package/ebtables/patches/patch-extensions_ebt_arpreply_c new file mode 100644 index 000000000..32432efb4 --- /dev/null +++ b/package/ebtables/patches/patch-extensions_ebt_arpreply_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/extensions/ebt_arpreply.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/extensions/ebt_arpreply.c 2014-03-23 15:50:38.000000000 +0100 +@@ -12,7 +12,6 @@ + #include + #include + #include "../include/ebtables_u.h" +-#include + #include + + static int mac_supplied; diff --git a/package/ebtables/patches/patch-extensions_ebt_ip6_c b/package/ebtables/patches/patch-extensions_ebt_ip6_c new file mode 100644 index 000000000..e57677d44 --- /dev/null +++ b/package/ebtables/patches/patch-extensions_ebt_ip6_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/extensions/ebt_ip6.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/extensions/ebt_ip6.c 2014-03-23 15:51:09.000000000 +0100 +@@ -11,6 +11,7 @@ + * + */ + ++#include + #include + #include + #include diff --git a/package/ebtables/patches/patch-extensions_ebt_limit_c b/package/ebtables/patches/patch-extensions_ebt_limit_c new file mode 100644 index 000000000..5464611c1 --- /dev/null +++ b/package/ebtables/patches/patch-extensions_ebt_limit_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/extensions/ebt_limit.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/extensions/ebt_limit.c 2014-03-23 15:52:04.000000000 +0100 +@@ -8,6 +8,7 @@ + * September, 2003 + */ + ++#include + #include + #include + #include diff --git a/package/ebtables/patches/patch-extensions_ebt_nat_c b/package/ebtables/patches/patch-extensions_ebt_nat_c new file mode 100644 index 000000000..1a215e9e7 --- /dev/null +++ b/package/ebtables/patches/patch-extensions_ebt_nat_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/extensions/ebt_nat.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/extensions/ebt_nat.c 2014-03-23 15:50:13.000000000 +0100 +@@ -11,7 +11,6 @@ + #include + #include + #include "../include/ebtables_u.h" +-#include + #include + + static int to_source_supplied, to_dest_supplied; diff --git a/package/ebtables/patches/patch-include_ethernetdb_h b/package/ebtables/patches/patch-include_ethernetdb_h new file mode 100644 index 000000000..1bc877d57 --- /dev/null +++ b/package/ebtables/patches/patch-include_ethernetdb_h @@ -0,0 +1,29 @@ +--- ebtables-v2.0.10-4.orig/include/ethernetdb.h 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/include/ethernetdb.h 2014-03-23 15:47:35.000000000 +0100 +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ diff --git a/package/ebtables/patches/patch-useful_functions_c b/package/ebtables/patches/patch-useful_functions_c new file mode 100644 index 000000000..6e851ecd2 --- /dev/null +++ b/package/ebtables/patches/patch-useful_functions_c @@ -0,0 +1,10 @@ +--- ebtables-v2.0.10-4.orig/useful_functions.c 2011-12-15 21:02:47.000000000 +0100 ++++ ebtables-v2.0.10-4/useful_functions.c 2014-03-23 15:49:15.000000000 +0100 +@@ -25,7 +25,6 @@ + #include "include/ebtables_u.h" + #include "include/ethernetdb.h" + #include +-#include + #include + #include + #include -- cgit v1.2.3 From 2d47641ce6dcfefe89c0f7c9b820b0f250ce1b0c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 20:37:57 +0100 Subject: remove rsh code --- package/ipcad/Makefile | 2 +- package/ipcad/patches/patch-Makefile_in | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 5ee22cba2..57b4d7111 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipcad PKG_VERSION:= 3.7.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 125605249958894148ec26d3c88189f5 PKG_DESCR:= IP Cisco Accounting Daemon PKG_SECTION:= net diff --git a/package/ipcad/patches/patch-Makefile_in b/package/ipcad/patches/patch-Makefile_in index 40bcdf546..2fb2eaece 100644 --- a/package/ipcad/patches/patch-Makefile_in +++ b/package/ipcad/patches/patch-Makefile_in @@ -1,5 +1,5 @@ --- ipcad-3.7.3.orig/Makefile.in 2007-04-22 10:08:45.000000000 +0200 -+++ ipcad-3.7.3/Makefile.in 2011-01-11 17:16:15.000000000 +0100 ++++ ipcad-3.7.3/Makefile.in 2014-03-23 17:58:49.000000000 +0100 @@ -6,10 +6,10 @@ sysconfdir= @sysconfdir@ datadir= @datadir@ @@ -15,3 +15,12 @@ CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\" CPPFLAGS+=@DEFS@ -D_REENTRANT -D_THREAD_SAFE CPPFLAGS+=-DPSRC_@PSRC@ -DIFST_@IFST@ +@@ -28,7 +28,7 @@ PACKAGE=ipcad + TARGETS=ipcad + VERSION=@IPCAD_VERSION@ + +-IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o rsh.o rshp.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o ++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o + IPCAD_OBJS+= ifst_@IFST@.o # Interface statistics + IPCAD_OBJS+= ifs_list.o # Interface statistics + IPCAD_OBJS+= loop-@PSRC@.o # Method of capturing -- cgit v1.2.3 From af9597a2b212b6ed9faf8bf62efd024fba4e39d8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 20:38:17 +0100 Subject: remove rsh code --- package/ipcad/patches/patch-Makefile | 169 +++++++++++++++++++++++++++++++++++ package/ipcad/patches/patch-cfg_y | 60 +++++++++++++ 2 files changed, 229 insertions(+) create mode 100644 package/ipcad/patches/patch-Makefile create mode 100644 package/ipcad/patches/patch-cfg_y diff --git a/package/ipcad/patches/patch-Makefile b/package/ipcad/patches/patch-Makefile new file mode 100644 index 000000000..8ced9f13a --- /dev/null +++ b/package/ipcad/patches/patch-Makefile @@ -0,0 +1,169 @@ +--- ipcad-3.7.3.orig/Makefile 2007-04-22 10:08:45.000000000 +0200 ++++ ipcad-3.7.3/Makefile 2014-03-23 17:59:56.000000000 +0100 +@@ -1,4 +1,163 @@ +-all: bootstrap + +-bootstrap: +- ./configure && make ++prefix= /usr ++exec_prefix= ${prefix} ++bindir= /usr/bin ++sysconfdir= /etc ++datadir= /usr/share ++ ++CC= /home/wbx/hudson/toolchain_x86_64-linux-gnu/usr/bin/arm-openadk-linux-muslgnueabihf-gcc ++LDFLAGS= -L/home/wbx/hudson/target_arm_musl_eabihf/lib -L/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-O1 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-z,relro,-z,now ++LIBS= -lpcap ++CFLAGS= -march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -DHAVE_CONFIG_H -W -Wall ++CPPFLAGS=-DIPCAD_VERSION=\"3.7.3\" ++CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\" ++CPPFLAGS+=-DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE ++CPPFLAGS+=-DPSRC_pcap -DIFST_linux ++ ++YACC=bison -y ++LEX=flex ++INSTALL=/usr/bin/install -c ++ ++MANROOT=/usr/share/man/man ++MAN8=${MANROOT}8 ++MAN5=${MANROOT}5 ++ ++NROFF= groff -Tascii -mandoc ++ ++PACKAGE=ipcad ++TARGETS=ipcad ++VERSION=3.7.3 ++ ++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o ++IPCAD_OBJS+= ifst_linux.o # Interface statistics ++IPCAD_OBJS+= ifs_list.o # Interface statistics ++IPCAD_OBJS+= loop-pcap.o # Method of capturing ++IPCAD_OBJS+= loop-file.o # Method of capturing ++IPCAD_OBJS+= loop-divert.o # Method of capturing ++IPCAD_OBJS+= loop-dynamic.o # Method of capturing ++IPCAD_OBJS+= loop-ulog.o loop-ipq.o # Methods of capturing ++IPCAD_OBJS+= psrc.o psrc-pcap.o # Initialize capturers ++IPCAD_OBJS+= psrc-ipq.o psrc-ulog.o # Initialize capturers ++IPCAD_OBJS+= psrc-file.o # Initialize capturers ++IPCAD_OBJS+= psrc-dynamic.o # Initialize capturers ++IPCAD_OBJS+= psrc-divert.o # Initialize capturers ++IPCAD_OBJS+= wrap_oclose.o # Special file descriptors cache ++IPCAD_OBJS+= genhash.o # General hashing ++ ++all: ${TARGETS} man ++ ++ipcad: ${IPCAD_OBJS} ++ ${CC} ${CFLAGS} -o $@ ${IPCAD_OBJS} ${LDFLAGS} ${LIBS} ++ ++.SUFFIXES: ++.SUFFIXES: .o .c .0 .8 .5 ++ ++.c.o: ++ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ -c $< ++ ++.8.0: ++ ${NROFF} $< > $@ ++ ++.5.0: ++ ${NROFF} $< > $@ ++ ++cfgy.h cfgy.c: cfg.y ++ ${YACC} -p ipcacfg -d cfg.y ++ @mv y.tab.c cfgy.c ++ @mv y.tab.h cfgy.h ++ ++cshelly.h cshelly.c: cshell.y ++ ${YACC} -p CS -d cshell.y ++ @mv y.tab.c cshelly.c ++ @mv y.tab.h cshelly.h ++ ++cslex.c: cslex.l ++ ${LEX} -s -p -Cem -ocslex.c -PCS cslex.l ++ ++cfglex.c: cfglex.l ++ ${LEX} -s -p -Cem -ocfglex.c -Pipcacfg cfglex.l ++ ++ ++man: ipcad.8 ipcad.conf.5 ++ ++distdir = $(PACKAGE)-$(VERSION) ++distdir: ++ rm -rf $(distdir) ++ mkdir $(distdir) ++ cp *.c *.h $(distdir) ++ cp ipcad.8 ipcad.conf.5 $(distdir) ++ cp *.y *.l $(distdir) ++ cp *.in configure install-sh $(distdir) ++ cp ipcad.conf.default $(distdir) ++ cp ipcad.conf.simple $(distdir) ++ cp ipcad.spec.in $(distdir) ++ cp Makefile.in Makefile $(distdir) ++ cp ChangeLog INSTALL README TODO BUGS AUTHORS COPYING FAQ $(distdir) ++ cd $(distdir) && make distclean ++ ++dist: distdir ++ tar chof - $(distdir) | GZIP="--best" gzip -c > $(distdir).tar.gz ++ rm -rf $(distdir) ++ ++clean: ++ rm -f *.o ${TARGETS} *.core 1 ++ rm -f *.0 ++ ++distclean: clean ++ rm -f config.h ++ rm -f config.cache config.log config.status ++ rm -f Makefile ++ rm -f $(distdir).tar.gz ++ rm -f ipcad.spec ++ (echo "all: bootstrap"; echo; echo "bootstrap:"; \ ++ echo " ./configure && make") > Makefile ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use; it" ++ @echo "deletes files that may need special tools to rebuild." ++ rm -f Makefile ++ rm -f *.tab.* cfgy.? *lex.c ++ rm -f config.h.in configure ++ ++install: all install-bin install-conf ++ ++install-bin: ++ @${INSTALL} -d $(DESTDIR)${bindir} ++ ${INSTALL} ipcad $(DESTDIR)${bindir} ++ ++install-man: man ++ ${INSTALL} -m 444 ipcad.8 $(DESTDIR)${MAN8}/ipcad.8 ++ ${INSTALL} -m 444 ipcad.conf.5 $(DESTDIR)${MAN5}/ipcad.conf.5 ++ ++install-conf: ++ @${INSTALL} -d $(DESTDIR)${sysconfdir} ++ ${INSTALL} -m 644 ipcad.conf.simple $(DESTDIR)${sysconfdir}/ipcad.conf.simple ++ -@diff ${sysconfdir}/ipcad.conf \ ++ ${sysconfdir}/ipcad.conf.default >/dev/null 2>&1; \ ++ if [ "$$?" -eq 0 ] || [ ! -f ${sysconfdir}/ipcad.conf ]; then \ ++ echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \ ++ ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \ ++ echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf; \ ++ ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf; \ ++ echo "**********************************************"; \ ++ echo "* Please customize ${sysconfdir}/ipcad.conf *"; \ ++ echo "**********************************************"; \ ++ else \ ++ echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \ ++ ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \ ++ echo "*********************************************"; \ ++ echo "* Updated ${sysconfdir}/ipcad.conf.default *"; \ ++ echo "*********************************************"; \ ++ fi ++ @echo "" ++ @echo "Now you might want to 'make install-man'" ++ @echo "" ++ ++ ++uninstall: ++ rm -f ${bindir}/ipcad ++ rm -f ${sysconfdir}/ipcad.conf.default ++ rm -f ${sysconfdir}/ipcad.conf.simple ++ rm -f ${MAN8}/ipcad.8 ++ rm -f ${MAN5}/ipcad.conf.5 ++ diff --git a/package/ipcad/patches/patch-cfg_y b/package/ipcad/patches/patch-cfg_y new file mode 100644 index 000000000..11fbc7564 --- /dev/null +++ b/package/ipcad/patches/patch-cfg_y @@ -0,0 +1,60 @@ +--- ipcad-3.7.3.orig/cfg.y 2007-04-22 10:08:45.000000000 +0200 ++++ ipcad-3.7.3/cfg.y 2014-03-23 18:03:07.000000000 +0100 +@@ -3,7 +3,6 @@ + #include "headers.h" + #include "cfgvar.h" + #include "servers.h" +-#include "rsh.h" + #include "opt.h" + #include "storage.h" + +@@ -214,49 +213,6 @@ block: + | CAPTURE_PORTS DENY { + conf->capture_ports = 0; + } +- | RSH ALLOW at_ip { +- if(add_server(rsh_server, "RSH Server", &($3), 514)) +- return yyerror("Failed to install RSH server"); +- fprintf(stderr, "Configured RSH Server listening at %s\n", +- inet_ntoa($3)); +- } +- | RSH DENY at_ip { +- fprintf(stderr, "Warning: Option at line %d has no effect\n", +- ipcacfglineno); +- } +- | RSH TIMEOUT EQ TOK_STRING { +- int to_ms; +- to_ms = atoi($4); +- free($4); +- if(to_ms < 0) +- to_ms = -1; /* INFTIM */ +- else +- to_ms = to_ms * 1000; +- rsh_rw_timeout = to_ms; +- } +- | RSH TOK_STRING privlevel { +- cfg_add_rsh_host("", $2, $3); +- free($2); +- } +- | RSH AT TOK_STRING privlevel { +- cfg_add_rsh_host("", $3, $4); +- free($3); +- } +- | RSH TOK_STRING AT TOK_STRING privlevel { +- cfg_add_rsh_host($2, $4, $5); +- free($2); free($4); +- } +- | RSH TTL EQ TOK_STRING { +- conf->rsh_ttl = atoi($4); +- free($4); +- } +- | TTL EQ TOK_STRING { +- fprintf(stderr, "WARNING: \"ttl = %s;\" at line %d: " +- "Obsolete syntax. Please use \"rsh ttl = %s;\"\n", +- $3, ipcacfglineno, $3); +- conf->rsh_ttl = atoi($3); +- free($3); +- } + | NetFlow + | CHROOT EQ TOK_STRING { + if(conf->chroot_to) -- cgit v1.2.3 From c2a34ea858a331a0960f1b4854697de448f55381 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 20:39:13 +0100 Subject: hudson says: you broke uclibc build --- package/findutils/Makefile | 25 +++++++++++++++------- package/findutils/patches/patch-configure_ac | 11 ++++++++++ .../findutils/patches/patch-gnulib_m4_fflush_m4 | 12 +++++------ 3 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 package/findutils/patches/patch-configure_ac diff --git a/package/findutils/Makefile b/package/findutils/Makefile index b3b413932..d89ca77ea 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -5,29 +5,38 @@ include $(TOPDIR)/rules.mk PKG_NAME:= findutils PKG_VERSION:= 4.4.2 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f PKG_DESCR:= GNU utilities for finding files PKG_SECTION:= utils PKG_DEPENDS:= libpthread +PKG_BUILDDEP:= autotool PKG_URL:= http://www.gnu.org/software/findutils/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ -PKG_SUBPKGS:= FINDUTILS LOCATE -PKGSD_LOCATE:= Locate utility +PKG_SUBPKGS:= FIND XARGS LOCATE +PKGSD_LOCATE:= locate utility +PKGSD_XARGS:= xargs utility include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION})) $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes \ ac_cv_func_working_mktime=yes -findutils-install: - $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \ - $(IDIR_FINDUTILS)/usr/bin +find-install: + $(INSTALL_DIR) $(IDIR_FIND)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/find \ + $(IDIR_FIND)/usr/bin + +xargs-install: + $(INSTALL_DIR) $(IDIR_XARGS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/xargs \ + $(IDIR_XARGS)/usr/bin locate-install: ${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec} diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac new file mode 100644 index 000000000..34c03d76f --- /dev/null +++ b/package/findutils/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- findutils-4.4.2.orig/configure.ac 2009-05-16 17:27:39.000000000 +0200 ++++ findutils-4.4.2/configure.ac 2014-03-23 19:39:22.000000000 +0100 +@@ -77,8 +77,6 @@ AC_PROG_CPP + dnl for gnulib + gl_EARLY + +-AM_C_PROTOTYPES +- + AC_PROG_INSTALL + AC_PROG_RANLIB + dnl AC_PROG_LIBTOOL diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4 index 5cee53cc0..b3dd6a082 100644 --- a/package/findutils/patches/patch-gnulib_m4_fflush_m4 +++ b/package/findutils/patches/patch-gnulib_m4_fflush_m4 @@ -1,6 +1,6 @@ --- findutils-4.4.2.orig/gnulib/m4/fflush.m4 2009-05-10 23:23:57.000000000 +0200 -+++ findutils-4.4.2/gnulib/m4/fflush.m4 2014-03-23 16:40:29.000000000 +0100 -@@ -32,14 +32,20 @@ AC_DEFUN([gl_FUNC_FFLUSH], ++++ findutils-4.4.2/gnulib/m4/fflush.m4 2014-03-23 18:40:09.000000000 +0100 +@@ -32,12 +32,18 @@ AC_DEFUN([gl_FUNC_FFLUSH], return 4; return !(lseek (fd, 0, SEEK_CUR) == 5); ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no], @@ -11,9 +11,6 @@ rm conftest.txt ]) - if test $gl_cv_func_fflush_stdin = no; then -+ if test $gl_cv_func_fflush_stdin != yes; then - gl_REPLACE_FFLUSH - fi + case $gl_cv_func_fflush_stdin in + yes) gl_func_fflush_stdin=1 ;; + no) gl_func_fflush_stdin=0 ;; @@ -22,6 +19,7 @@ + AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin], + [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, + 0 if fflush is known to not work, -1 if unknown.]) ++ if test $gl_cv_func_fflush_stdin != yes; then + gl_REPLACE_FFLUSH + fi ]) - - AC_DEFUN([gl_REPLACE_FFLUSH], -- cgit v1.2.3