Browse Source

fix musl compile

Waldemar Brodkorb 10 years ago
parent
commit
c2d670541e
2 changed files with 14 additions and 4 deletions
  1. 1 1
      package/cutter/Makefile
  2. 13 3
      package/cutter/patches/patch-cutter_c

+ 1 - 1
package/cutter/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
 PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
 PKG_SECTION:=		firewall

+ 13 - 3
package/cutter/patches/patch-cutter_c

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
++++ cutter-1.03/cutter.c	2013-12-24 12:14:44.000000000 +0100
 @@ -35,6 +35,10 @@
   * 		improvment.
   */
@@ -12,7 +12,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #include <string.h>
  #include <stdio.h>
  #include <unistd.h>
-@@ -297,7 +301,7 @@ int send_rst(
+@@ -50,7 +54,9 @@
+ #include <linux/if_ether.h>
+ #include <fcntl.h>
+ #include <netpacket/packet.h>
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>     /* the L2 protocols */
++#endif
+ #include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+@@ -297,7 +303,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -21,7 +31,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +423,7 @@ int send_rst(
+@@ -419,7 +425,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);