• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/arptables/0003-src-Remove-support-for-libc5.patch
Brendan HeadingBrendan Heading committed 61fe902baca02 Aug 2015
Raw file
Source viewDiff to previous
 
1
From 5f1379ff68bfedb56309527bee266a591b27a19e Mon Sep 17 00:00:00 2001
2
From: Felix Janda <felix.janda@posteo.de>
3
Date: Sat, 16 May 2015 10:31:41 +0200
4
Subject: [PATCH 2/2] src: Remove support for libc5
5
​
6
Fixes compilation with musl libc
7
​
8
Backport of upstream commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f
9
Upstream status: backport
10
Signed-off-by: Felix Janda <felix.janda@posteo.de>
11
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
12
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
13
---
14
 include/libarptc/arpt_kernel_headers.h | 12 ------------
15
 libarptc/libarptc.c                    |  4 ----
16
 2 files changed, 16 deletions(-)
17
​
18
diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h
19
index 442cc54..140e999 100644
20
--- a/include/libarptc/arpt_kernel_headers.h
21
+++ b/include/libarptc/arpt_kernel_headers.h
22
@@ -5,7 +5,6 @@
23
 
24
 #include <limits.h>
25
 
26
-#if defined(__GLIBC__) && __GLIBC__ == 2
27
 #include <netinet/ip.h>
28
 #include <netinet/in.h>
29
 #include <netinet/ip_icmp.h>
30
@@ -14,16 +13,5 @@
31
 #include <netinet/ether.h>
32
 #include <net/if.h>
33
 #include <sys/types.h>
34
-#else
35
-#include <sys/socket.h>
36
-#include <linux/ip.h>
37
-#include <linux/in.h>
38
-#include <linux/if.h>
39
-#include <linux/icmp.h>
40
-#include <linux/tcp.h>
41
-#include <linux/udp.h>
42
-#include <linux/types.h>
43
-#include <linux/in6.h>
44
-#endif
45
 
46
 #endif
47
diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c
48
index 701bae0..9c5a5b0 100644
49
--- a/libarptc/libarptc.c
50
+++ b/libarptc/libarptc.c
51
@@ -23,10 +23,6 @@
52
 #define inline
53
 #endif
54
 
55
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
56
-typedef unsigned int socklen_t;
57
-#endif
58
-
59
 #include "libarptc/libarptc.h"
60
 
61
 #define IP_VERSION 4
62
-- 
63
2.4.3
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.