Fails to build on FreeBSD 12.0 (post-ino64)

[jbeich]

Regressed by freebsd/freebsd-src@e75ba1d5c4c7 (see sys/sys/user.h) and fixed downstream by freebsd/freebsd-ports@248a430dd138. Can you apply the fix?

CC'ing @kostikbel (patch author) and @sunpoet (package maintainer).

$ python2.7 setup.py build
[...]
psutil/arch/freebsd/proc_socks.c:139:27: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                    &kif->kf_sa_local))
                     ~~~  ^
psutil/arch/freebsd/proc_socks.c:143:27: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                    &kif->kf_sa_peer))
                     ~~~  ^
psutil/arch/freebsd/proc_socks.c:148:27: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                    &kif->kf_sa_local))
                     ~~~  ^
psutil/arch/freebsd/proc_socks.c:152:27: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                    &kif->kf_sa_peer))
                     ~~~  ^
psutil/arch/freebsd/proc_socks.c:246:48: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                                         &kif->kf_sa_local),
                                          ~~~  ^
psutil/arch/freebsd/proc_socks.c:252:48: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                                         &kif->kf_sa_peer),
                                          ~~~  ^
psutil/arch/freebsd/proc_socks.c:256:58: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                                                   &kif->kf_sa_local));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:74:37: note: expanded from macro '__bswap16'
        ((__uint16_t)(__builtin_constant_p(x) ? \
                                           ^
psutil/arch/freebsd/proc_socks.c:256:58: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                                                   &kif->kf_sa_local));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:33: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                       ^
/usr/include/x86/endian.h:66:40: note: expanded from macro '__bswap16_gen'
#define __bswap16_gen(x)        (__uint16_t)((x) << 8 | (x) >> 8)
                                              ^
psutil/arch/freebsd/proc_socks.c:256:58: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                                                   &kif->kf_sa_local));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:33: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                       ^
/usr/include/x86/endian.h:66:51: note: expanded from macro '__bswap16_gen'
#define __bswap16_gen(x)        (__uint16_t)((x) << 8 | (x) >> 8)
                                                         ^
psutil/arch/freebsd/proc_socks.c:256:58: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                                                   &kif->kf_sa_local));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:53: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                                           ^
psutil/arch/freebsd/proc_socks.c:258:58: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                                                   &kif->kf_sa_peer));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:74:37: note: expanded from macro '__bswap16'
        ((__uint16_t)(__builtin_constant_p(x) ? \
                                           ^
psutil/arch/freebsd/proc_socks.c:258:58: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                                                   &kif->kf_sa_peer));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:33: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                       ^
/usr/include/x86/endian.h:66:40: note: expanded from macro '__bswap16_gen'
#define __bswap16_gen(x)        (__uint16_t)((x) << 8 | (x) >> 8)
                                              ^
psutil/arch/freebsd/proc_socks.c:258:58: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                                                   &kif->kf_sa_peer));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:33: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                       ^
/usr/include/x86/endian.h:66:51: note: expanded from macro '__bswap16_gen'
#define __bswap16_gen(x)        (__uint16_t)((x) << 8 | (x) >> 8)
                                                         ^
psutil/arch/freebsd/proc_socks.c:258:58: error: no member named 'kf_sa_peer' in 'struct kinfo_file'
                                                   &kif->kf_sa_peer));
                                                    ~~~  ^
/usr/include/netinet/in.h:118:26: note: expanded from macro 'htons'
#define htons(x)        __htons(x)
                                ^
/usr/include/x86/endian.h:127:30: note: expanded from macro '__htons'
#define __htons(x)      __bswap16(x)
                                  ^
/usr/include/x86/endian.h:75:53: note: expanded from macro '__bswap16'
            __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
                                                           ^
psutil/arch/freebsd/proc_socks.c:290:51: error: no member named 'kf_sa_local' in 'struct kinfo_file'
                sun = (struct sockaddr_un *)&kif->kf_sa_local;
                                             ~~~  ^
15 errors generated.

[giampaolo]

I don't have that specific FreeBSD version to test against. Can you make a PR?

[giampaolo]

CC @kostikbel @sunpoet.