fix musl compile, update

3 files changed, 26 insertions, 46 deletions

diff --git a/package/knock/Makefile b/package/knock/Makefile
index 91bd34739..04129c01b 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		knock
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
+PKG_MD5SUM:=		e6e486be75b0d6433bac22a7de0e11f5
 PKG_DESCR:=		A port-knocking client
 PKG_SECTION:=		firewall
 PKG_BUILDDEP:=		libpcap
@@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 CONFIGURE_ENV+=		ac_cv_lib_pcap_pcap_open_live=yes
 
 knock-install:
diff --git a/package/knock/patches/patch-Makefile_in b/package/knock/patches/patch-Makefile_in
deleted file mode 100644
index ec90372ec..000000000
--- a/package/knock/patches/patch-Makefile_in
+++ /dev/null
@@ -1,24 +0,0 @@
---- knock-0.5.orig/Makefile.in	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/Makefile.in	2009-06-13 09:49:14.000000000 +0200
-@@ -68,11 +68,16 @@ dist: distclean
- 	(cd ..; tar czvf knock-$(VERSION).tar.gz knock-$(VERSION))
- 
- install: all
--	$(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
--	$(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock
--	$(INSTALL) -D -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
--	$(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
--	$(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -d -m0755 $(DESTDIR)/etc
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
-+	$(INSTALL) -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
-+	$(INSTALL) -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
- 
- clean:
- 	rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1
diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c
index 7d8512c96..e3a2d2955 100644
--- a/package/knock/patches/patch-src_knockd_c
+++ b/package/knock/patches/patch-src_knockd_c
@@ -1,20 +1,23 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- knock-0.5.orig/src/knockd.c	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/src/knockd.c	2009-06-01 21:43:53.000000000 +0200
-@@ -46,6 +46,7 @@
- #include <syslog.h>
- #include <pcap.h>
- #include <errno.h>
-+#include <linux/limits.h>
- #include "list.h"
- 
- static char version[] = "0.5";
-@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu
- 		return(NULL);
- 	}
- 
--	bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name));
-+	memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name));
- 	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
- 	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
- 	if(ioctl(s, SIOCGIFADDR, &ifr)) {
+--- knock-0.6.orig/src/knockd.c	2013-04-08 20:11:56.000000000 +0200
++++ knock-0.6/src/knockd.c	2014-01-16 16:59:04.000000000 +0100
+@@ -28,8 +28,8 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <limits.h>
++#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <sys/socket.h>
+ #include <netinet/in_systm.h>
+ #endif
+@@ -40,10 +40,6 @@
+ #include <netinet/udp.h>
+ #include <netinet/ip_icmp.h>
+ #include <net/if.h>
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+-#include <bits/time.h>
+-#include <linux/limits.h>
+-#endif
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>