diff --git a/package/network/utils/linux-atm/Makefile b/package/network/utils/linux-atm/Makefile old mode 100755 new mode 100644 index f2ad888e4e..c74febcbbc --- a/package/network/utils/linux-atm/Makefile +++ b/package/network/utils/linux-atm/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=linux-atm PKG_VERSION:=2.5.2 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) diff --git a/package/network/utils/linux-atm/patches/000-debian_16.patch b/package/network/utils/linux-atm/patches/000-debian_16.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/200-no_libfl.patch b/package/network/utils/linux-atm/patches/200-no_libfl.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/300-objcopy_path.patch b/package/network/utils/linux-atm/patches/300-objcopy_path.patch deleted file mode 100755 index 4f11516b2f..0000000000 --- a/package/network/utils/linux-atm/patches/300-objcopy_path.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/extra/Makefile.am -+++ b/src/extra/Makefile.am -@@ -7,6 +7,8 @@ EXTRA_DIST = linux-atm.spec.in \ - BUILT_SOURCES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2 - CLEANFILES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2 - -+OBJCOPY = objcopy -+ - install-exec-hook: - $(MKDIR_P) $(DESTDIR)/lib/firmware - $(INSTALL_DATA) $(srcdir)/pca200e.bin $(DESTDIR)/lib/firmware -@@ -14,7 +16,7 @@ install-exec-hook: - $(INSTALL_DATA) $(srcdir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware - - %.bin %.bin2: %.data -- objcopy -Iihex $< -Obinary $@.gz -+ $(OBJCOPY) -Iihex $< -Obinary $@.gz - gzip -n -df $@.gz - - ---- a/src/extra/Makefile.in -+++ b/src/extra/Makefile.in -@@ -187,6 +187,8 @@ CLEANFILES = pca200e.bin pca200e_ecd.bin - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -+OBJCOPY = objcopy -+ - .SUFFIXES: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ -@@ -385,7 +387,7 @@ install-exec-hook: - $(INSTALL_DATA) $(srcdir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware - - %.bin %.bin2: %.data -- objcopy -Iihex $< -Obinary $@.gz -+ $(OBJCOPY) -Iihex $< -Obinary $@.gz - gzip -n -df $@.gz - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/package/network/utils/linux-atm/patches/400-portability_fixes.patch b/package/network/utils/linux-atm/patches/400-portability_fixes.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/500-br2684ctl_script.patch b/package/network/utils/linux-atm/patches/500-br2684ctl_script.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/501-br2684ctl_itfname.patch b/package/network/utils/linux-atm/patches/501-br2684ctl_itfname.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/510-remove-LINUX_NETDEVICE-hack.patch b/package/network/utils/linux-atm/patches/510-remove-LINUX_NETDEVICE-hack.patch new file mode 100644 index 0000000000..d76ec1eaf4 --- /dev/null +++ b/package/network/utils/linux-atm/patches/510-remove-LINUX_NETDEVICE-hack.patch @@ -0,0 +1,52 @@ +This fixes the following compile problem with kernel 4.20: + +In file included from arp.c:20:0: +include/linux/if_arp.h:121:16: error: 'IFNAMSIZ' undeclared here (not in a function) + char arp_dev[IFNAMSIZ]; + ^~~~~~~~ +make[7]: *** [Makefile:459: arp.o] Error 1 + +This is caused by commit 6a12709da354 ("net: if_arp: use define instead +of hard-coded value") in the upstream Linux kernel which is integrated +in Linux 4.20. + +--- a/src/oamd/io.c ++++ b/src/oamd/io.c +@@ -20,7 +20,6 @@ + #include + #include + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + +--- a/src/arpd/itf.c ++++ b/src/arpd/itf.c +@@ -12,7 +12,6 @@ + #include + #include + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + +--- a/src/arpd/io.c ++++ b/src/arpd/io.c +@@ -21,7 +21,6 @@ + #include + #include /* for CLIP_DEFAULT_IDLETIMER */ + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + +--- a/src/arpd/arp.c ++++ b/src/arpd/arp.c +@@ -15,7 +15,6 @@ + #include + #include /* for linux/if_arp.h */ + #include /* for ntohs, etc. */ +-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include + #include + #include diff --git a/package/network/utils/linux-atm/patches/600-fix-format-errors.patch b/package/network/utils/linux-atm/patches/600-fix-format-errors.patch old mode 100755 new mode 100644 diff --git a/package/network/utils/linux-atm/patches/700-musl-include.patch b/package/network/utils/linux-atm/patches/700-musl-include.patch new file mode 100644 index 0000000000..2b2268d8ac --- /dev/null +++ b/package/network/utils/linux-atm/patches/700-musl-include.patch @@ -0,0 +1,30 @@ +--- a/src/include/atmd.h ++++ b/src/include/atmd.h +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + +--- a/src/lib/unix.c ++++ b/src/lib/unix.c +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/sigd/kernel.c ++++ b/src/sigd/kernel.c +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/package/network/utils/linux-atm/patches/rtability_fixes.patch b/package/network/utils/linux-atm/patches/rtability_fixes.patch new file mode 100644 index 0000000000..e69de29bb2