[arch-commits] Commit in linux-atm/trunk (PKGBUILD remove-define-hacks.patch)

[Jelle van der Waa]

    Date: Friday, June 21, 2019 @ 08:58:40
  Author: jelle
Revision: 356670

upgpkg: linux-atm 2.5.2-6

Move linux-atm to extra, as it's no longer critical software and fix the build.

Added:
  linux-atm/trunk/remove-define-hacks.patch
Modified:
  linux-atm/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   15 ++++++++++-----
 remove-define-hacks.patch |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-21 08:56:53 UTC (rev 356669)
+++ PKGBUILD	2019-06-21 08:58:40 UTC (rev 356670)
@@ -3,7 +3,7 @@
 
 pkgname=linux-atm
 pkgver=2.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Drivers and tools to support ATM networking under Linux."
 arch=('x86_64')
 depends=('glibc')
@@ -10,18 +10,23 @@
 url="http://linux-atm.sourceforge.net/"
 license=(GPL)
 source=(https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        man-pages.patch)
+        man-pages.patch remove-define-hacks.patch)
 options=(!makeflags)
 md5sums=('d49499368c3cf15f73a05d9bce8824a8'
-         '181390736336cdb615ae32f1ae5acfa6')
+         '181390736336cdb615ae32f1ae5acfa6'
+         '74275ad95cef3898ef3ec52c21012e45')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd "${pkgname}-${pkgver}"
   patch -Np1 -i ../man-pages.patch
+  patch -Np1 -i ../remove-define-hacks.patch
 
   # install firmware in /usr/lib
   sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in
+}
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
   make
 }

Added: remove-define-hacks.patch
===================================================================
--- remove-define-hacks.patch	                        (rev 0)
+++ remove-define-hacks.patch	2019-06-21 08:58:40 UTC (rev 356670)
@@ -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>
+