Message ID | YEaQ2wXhLxG69EQg@arya.arvanta.net |
---|---|
State | Awaiting Upstream |
Delegated to: | Pablo Neira |
Headers | show |
Series | xtables-addons-3.17 fail build on armv7 with musl libc | expand |
On Monday 2021-03-08 22:02, Milan P. Stanić wrote: >I'm trying to fix build of xtables-addons-3.17 on Alpine Linux which is >based on musl libc. Build pass on our x86, x86_64, aarch64, ppc64le and >s390x arches but fails on armv7. Here is excerpt from build log. > > 33 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base) > | ~~~~~~~~~~^ I have addresses the issue in v3.18 now. No new warnings have shown to me with regards to time_after.
Hi, On Thu, 2021-03-11 at 17:18, Jan Engelhardt wrote: > On Monday 2021-03-08 22:02, Milan P. Stanić wrote: > > >I'm trying to fix build of xtables-addons-3.17 on Alpine Linux which is > >based on musl libc. Build pass on our x86, x86_64, aarch64, ppc64le and > >s390x arches but fails on armv7. Here is excerpt from build log. > > > > 33 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base) > > | ~~~~~~~~~~^ > > I have addresses the issue in v3.18 now. No new warnings have shown to me with > regards to time_after. Yes, it works now without any warning or error. Thanks
--- a/extensions/pknock/xt_pknock.c 2021-02-28 16:54:20.000000000 +0000 +++ b/extensions/pknock/xt_pknock.c 2021-03-07 10:10:54.375466285 +0000 @@ -247,7 +247,7 @@ seq_printf(s, "expir_time=%lu [secs] ", time); } if (peer->status == ST_ALLOWED && rule->autoclose_time != 0) { - unsigned long x = ktime_get_seconds(); + unsigned long long x = ktime_get_seconds(); unsigned long y = peer->login_sec + rule->autoclose_time * 60; time = 0; if (time_before(x, y)) @@ -311,7 +311,7 @@ static inline bool autoclose_time_passed(const struct peer *peer, unsigned int autoclose_time) { - unsigned long x, y; + unsigned long long x, y; if (peer == NULL || autoclose_time == 0) return false; x = ktime_get_seconds(); @@ -338,7 +338,7 @@ static inline bool has_logged_during_this_minute(const struct peer *peer) { - unsigned long x, y; + unsigned long long x, y; if (peer == NULL) return 0; x = ktime_get_seconds(); @@ -717,7 +717,7 @@ unsigned int hexa_size; int ret; bool fret = false; - unsigned long x; + unsigned long long x; unsigned int epoch_min; if (payload_len == 0)