#1 Remove _LINUX_NETDEVICE_H define hacks to fix FTBFS (#1675323)
Merged 4 months ago by kevin. Opened 5 months ago by swt2c.
rpms/ swt2c/linux-atm f30_ftbfs  into  master

file modified
+6 -1

@@ -1,7 +1,7 @@ 

  Summary: Tools to support ATM networking under Linux

  Name: linux-atm

  Version: 2.5.1

- Release: 22%{?dist}

+ Release: 23%{?dist}

  # The licensing here is a mess. This is as close to accurate as possible.

  License: BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT

  URL: http://linux-atm.sourceforge.net/

@@ -16,6 +16,7 @@ 

  Patch4: linux-atm-gcc43.patch

  Patch5: man-pages.patch

  Patch6: add-string-formatting-to-build-with-gcc7.patch

+ Patch7: remove-define-hacks.patch

  

  %description

  Tools to support ATM networking under Linux.

@@ -43,6 +44,7 @@ 

  %patch4 -p1

  %patch5 -p1

  %patch6 -p1

+ %patch7 -p1

  

  iconv -f iso8859-1 -t utf8 < src/extra/ANS/e164_cc > src/extra/ANS/e164_cc.1

  mv src/extra/ANS/e164_cc.1 src/extra/ANS/e164_cc

@@ -95,6 +97,9 @@ 

  %{_libdir}/libatm.so

  

  %changelog

+ * Fri May 03 2019 Scott Talbert <swt@techie.net> - 2.5.1-23

+ - Remove _LINUX_NETDEVICE_H define hacks to fix FTBFS (#1675323)

+ 

  * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-22

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

@@ -0,0 +1,22 @@ 

+ diff -up linux-atm-2.5.1/src/arpd/arp.c.ftbfs linux-atm-2.5.1/src/arpd/arp.c

+ --- linux-atm-2.5.1/src/arpd/arp.c.ftbfs	2007-07-11 11:27:15.000000000 -0400

+ +++ linux-atm-2.5.1/src/arpd/arp.c	2019-05-02 20:15:45.497338836 -0400

+ @@ -15,7 +15,6 @@

+  #include <sys/types.h>

+  #include <sys/socket.h> /* for linux/if_arp.h */

+  #include <netinet/in.h> /* for ntohs, etc. */

+ -#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */

+  #include <linux/types.h>

+  #include <linux/if_arp.h>

+  #include <linux/if_ether.h>

+ diff -up linux-atm-2.5.1/src/arpd/itf.c.ftbfs linux-atm-2.5.1/src/arpd/itf.c

+ --- linux-atm-2.5.1/src/arpd/itf.c.ftbfs	2007-07-11 11:27:15.000000000 -0400

+ +++ linux-atm-2.5.1/src/arpd/itf.c	2019-05-02 20:19:08.046499027 -0400

+ @@ -12,7 +12,6 @@

+  #include <sys/types.h>

+  #include <linux/atmclip.h>

+  #include <sys/socket.h>

+ -#define _LINUX_NETDEVICE_H /* glibc2 */

+  #include <linux/types.h>

+  #include <linux/if_arp.h>

+  

no initial comment

Pull-Request has been merged by kevin

4 months ago

@kevin I see the build for this one failed. Something else must've changed since my initial fix. I'll look into it tonight.

Yeah. :(

Thanks! Ping me when you have a new PR...