From b5e2c7255a87f3d981968e21ea7f88401fe8f8ad Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 23 Sep 2010 02:30:23 +0200 Subject: [PATCH] build: add workaround for broken linux-glibc-devel 2.6.34 userspace headers --- doc/changelog.txt | 2 ++ extensions/compat_user.h | 12 ++++++++++++ extensions/libxt_CHAOS.c | 1 + extensions/libxt_CHECKSUM.c | 1 + extensions/libxt_DELUDE.c | 1 + extensions/libxt_DHCPMAC.c | 1 + extensions/libxt_ECHO.c | 1 + extensions/libxt_IPMARK.c | 1 + extensions/libxt_LOGMARK.c | 1 + extensions/libxt_RAWDNAT.c | 1 + extensions/libxt_RAWSNAT.c | 1 + extensions/libxt_STEAL.c | 1 + extensions/libxt_SYSRQ.c | 1 + extensions/libxt_TARPIT.c | 1 + extensions/libxt_TEE.c | 1 + extensions/libxt_condition.c | 1 + extensions/libxt_dhcpmac.c | 1 + extensions/libxt_fuzzy.c | 1 + extensions/libxt_geoip.c | 1 + extensions/libxt_iface.c | 1 + extensions/libxt_ipp2p.c | 1 + extensions/libxt_ipv4options.c | 1 + extensions/libxt_length2.c | 1 + extensions/libxt_lscan.c | 1 + extensions/libxt_psd.c | 1 + extensions/libxt_quota2.c | 1 + 26 files changed, 38 insertions(+) create mode 100644 extensions/compat_user.h diff --git a/doc/changelog.txt b/doc/changelog.txt index 36e69f3..8444227 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -6,6 +6,8 @@ HEAD - support for Linux 2.6.36 - SYSRQ: resolve compile error with Linux 2.6.36 - TEE: resolve compile error with Linux 2.6.36 +- add workaround for broken linux-glibc-devel 2.6.34 userspace headers + ("implicit declaration of function 'ALIGN'") Xtables-addons 1.28 (July 24 2010) diff --git a/extensions/compat_user.h b/extensions/compat_user.h new file mode 100644 index 0000000..3ad168c --- /dev/null +++ b/extensions/compat_user.h @@ -0,0 +1,12 @@ +/* + * Userspace-level compat hacks + */ +#ifndef _XTABLES_COMPAT_USER_H +#define _XTABLES_COMPAT_USER_H 1 + +/* linux-glibc-devel 2.6.34 header screwup */ +#ifndef ALIGN +# define ALIGN(s, n) (((s) + ((n) - 1)) & ~((n) - 1)) +#endif + +#endif /* _XTABLES_COMPAT_USER_H */ diff --git a/extensions/libxt_CHAOS.c b/extensions/libxt_CHAOS.c index c9236b7..d9dc949 100644 --- a/extensions/libxt_CHAOS.c +++ b/extensions/libxt_CHAOS.c @@ -16,6 +16,7 @@ #include #include #include "xt_CHAOS.h" +#include "compat_user.h" enum { F_DELUDE = 1 << 0, diff --git a/extensions/libxt_CHECKSUM.c b/extensions/libxt_CHECKSUM.c index f0f67b2..9ed5a00 100644 --- a/extensions/libxt_CHECKSUM.c +++ b/extensions/libxt_CHECKSUM.c @@ -12,6 +12,7 @@ #include #include "xt_CHECKSUM.h" +#include "compat_user.h" static void CHECKSUM_help(void) { diff --git a/extensions/libxt_DELUDE.c b/extensions/libxt_DELUDE.c index 8bad829..641d652 100644 --- a/extensions/libxt_DELUDE.c +++ b/extensions/libxt_DELUDE.c @@ -13,6 +13,7 @@ #include #include +#include "compat_user.h" static void delude_tg_help(void) { diff --git a/extensions/libxt_DHCPMAC.c b/extensions/libxt_DHCPMAC.c index cfb5b3a..25e5cb5 100644 --- a/extensions/libxt_DHCPMAC.c +++ b/extensions/libxt_DHCPMAC.c @@ -17,6 +17,7 @@ #include #include "xt_DHCPMAC.h" #include "mac.c" +#include "compat_user.h" enum { F_MAC = 1 << 0, diff --git a/extensions/libxt_ECHO.c b/extensions/libxt_ECHO.c index a71cd14..ddfdf15 100644 --- a/extensions/libxt_ECHO.c +++ b/extensions/libxt_ECHO.c @@ -10,6 +10,7 @@ #include #include #include +#include "compat_user.h" static void echo_tg_help(void) { diff --git a/extensions/libxt_IPMARK.c b/extensions/libxt_IPMARK.c index ecf4fd7..863564d 100644 --- a/extensions/libxt_IPMARK.c +++ b/extensions/libxt_IPMARK.c @@ -14,6 +14,7 @@ #include #include #include "xt_IPMARK.h" +#include "compat_user.h" enum { FL_ADDR_USED = 1 << 0, diff --git a/extensions/libxt_LOGMARK.c b/extensions/libxt_LOGMARK.c index 2cc7745..21f649e 100644 --- a/extensions/libxt_LOGMARK.c +++ b/extensions/libxt_LOGMARK.c @@ -13,6 +13,7 @@ #include #include #include "xt_LOGMARK.h" +#include "compat_user.h" enum { F_LEVEL = 1 << 0, diff --git a/extensions/libxt_RAWDNAT.c b/extensions/libxt_RAWDNAT.c index 407b6bf..2dbea16 100644 --- a/extensions/libxt_RAWDNAT.c +++ b/extensions/libxt_RAWDNAT.c @@ -15,6 +15,7 @@ #include #include #include "xt_RAWNAT.h" +#include "compat_user.h" enum { FLAGS_TO = 1 << 0, diff --git a/extensions/libxt_RAWSNAT.c b/extensions/libxt_RAWSNAT.c index b7f09a5..6d3d121 100644 --- a/extensions/libxt_RAWSNAT.c +++ b/extensions/libxt_RAWSNAT.c @@ -15,6 +15,7 @@ #include #include #include "xt_RAWNAT.h" +#include "compat_user.h" enum { FLAGS_TO = 1 << 0, diff --git a/extensions/libxt_STEAL.c b/extensions/libxt_STEAL.c index d69ce2f..aeae2d5 100644 --- a/extensions/libxt_STEAL.c +++ b/extensions/libxt_STEAL.c @@ -1,5 +1,6 @@ #include #include +#include "compat_user.h" static void steal_tg_help(void) { diff --git a/extensions/libxt_SYSRQ.c b/extensions/libxt_SYSRQ.c index d5b2f31..b02cfa7 100644 --- a/extensions/libxt_SYSRQ.c +++ b/extensions/libxt_SYSRQ.c @@ -5,6 +5,7 @@ #include #include #include +#include "compat_user.h" static void sysrq_tg_help(void) { diff --git a/extensions/libxt_TARPIT.c b/extensions/libxt_TARPIT.c index 2e34849..da6307e 100644 --- a/extensions/libxt_TARPIT.c +++ b/extensions/libxt_TARPIT.c @@ -5,6 +5,7 @@ #include #include #include +#include "compat_user.h" static void tarpit_tg_help(void) { diff --git a/extensions/libxt_TEE.c b/extensions/libxt_TEE.c index b4b36c9..a615d6f 100644 --- a/extensions/libxt_TEE.c +++ b/extensions/libxt_TEE.c @@ -23,6 +23,7 @@ #include #include #include "xt_TEE.h" +#include "compat_user.h" enum { FLAG_GATEWAY = 1 << 0, diff --git a/extensions/libxt_condition.c b/extensions/libxt_condition.c index 538a5bb..e305fa7 100644 --- a/extensions/libxt_condition.c +++ b/extensions/libxt_condition.c @@ -16,6 +16,7 @@ #include #include #include "xt_condition.h" +#include "compat_user.h" static void condition_help(void) { diff --git a/extensions/libxt_dhcpmac.c b/extensions/libxt_dhcpmac.c index 997ccac..d2eeb91 100644 --- a/extensions/libxt_dhcpmac.c +++ b/extensions/libxt_dhcpmac.c @@ -16,6 +16,7 @@ #include #include "xt_DHCPMAC.h" #include "mac.c" +#include "compat_user.h" enum { F_MAC = 1 << 0, diff --git a/extensions/libxt_fuzzy.c b/extensions/libxt_fuzzy.c index 2d39d0a..c24e413 100644 --- a/extensions/libxt_fuzzy.c +++ b/extensions/libxt_fuzzy.c @@ -15,6 +15,7 @@ #include #include #include "xt_fuzzy.h" +#include "compat_user.h" static void fuzzy_mt_help(void) { diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c index 133bcfa..c99d7ea 100644 --- a/extensions/libxt_geoip.c +++ b/extensions/libxt_geoip.c @@ -24,6 +24,7 @@ #include #include #include "xt_geoip.h" +#include "compat_user.h" #define GEOIP_DB_DIR "/usr/share/xt_geoip" static void geoip_help(void) diff --git a/extensions/libxt_iface.c b/extensions/libxt_iface.c index dea1ec6..6d1c79a 100644 --- a/extensions/libxt_iface.c +++ b/extensions/libxt_iface.c @@ -15,6 +15,7 @@ #include #include "xt_iface.h" +#include "compat_user.h" static const struct option iface_mt_opts[] = { {.name = "iface", .has_arg = true, .val = 'i'}, diff --git a/extensions/libxt_ipp2p.c b/extensions/libxt_ipp2p.c index 2c7e657..32ebc82 100644 --- a/extensions/libxt_ipp2p.c +++ b/extensions/libxt_ipp2p.c @@ -17,6 +17,7 @@ #include #include #include "xt_ipp2p.h" +#include "compat_user.h" #define param_act(t, s, f) xtables_param_act((t), "ipp2p", (s), (f)) static void ipp2p_mt_help(void) diff --git a/extensions/libxt_ipv4options.c b/extensions/libxt_ipv4options.c index 32d86e2..1198242 100644 --- a/extensions/libxt_ipv4options.c +++ b/extensions/libxt_ipv4options.c @@ -14,6 +14,7 @@ #include #include #include "xt_ipv4options.h" +#include "compat_user.h" /* * Overview from http://www.networksorcery.com/enp/protocol/ip.htm diff --git a/extensions/libxt_length2.c b/extensions/libxt_length2.c index 7609ab1..6de9e83 100644 --- a/extensions/libxt_length2.c +++ b/extensions/libxt_length2.c @@ -5,6 +5,7 @@ #include #include #include "xt_length2.h" +#include "compat_user.h" enum { F_LAYER = 1 << 0, diff --git a/extensions/libxt_lscan.c b/extensions/libxt_lscan.c index 59bc990..5cd208d 100644 --- a/extensions/libxt_lscan.c +++ b/extensions/libxt_lscan.c @@ -17,6 +17,7 @@ #include #include #include "xt_lscan.h" +#include "compat_user.h" static const struct option lscan_mt_opts[] = { {.name = "stealth", .has_arg = false, .val = 'x'}, diff --git a/extensions/libxt_psd.c b/extensions/libxt_psd.c index c3baff6..3c9d221 100644 --- a/extensions/libxt_psd.c +++ b/extensions/libxt_psd.c @@ -28,6 +28,7 @@ #include #include #include "xt_psd.h" +#include "compat_user.h" /* Function which prints out usage message. */ static void psd_mt_help(void) { diff --git a/extensions/libxt_quota2.c b/extensions/libxt_quota2.c index ea64153..788dea2 100644 --- a/extensions/libxt_quota2.c +++ b/extensions/libxt_quota2.c @@ -15,6 +15,7 @@ #include #include #include "xt_quota2.h" +#include "compat_user.h" enum { FL_QUOTA = 1 << 0,