From eb04fe87c684f22e0ac8377387bc7ecf5e49e656 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 03:49:23 +0100 Subject: [PATCH] update to 2.5.2 added debug package and aarch64 build fix [release 2.5.2-1mamba;Tue Dec 01 2020] --- libatm-2.5.2-glibc-2.32.patch | 22 +++++++ libatm-2.5.2-man-pages.patch | 45 ++++++++++++++ libatm-2.5.2-remove-define-hacks.patch | 22 +++++++ libatm.spec | 83 ++++++++++++++++++-------- 4 files changed, 148 insertions(+), 24 deletions(-) create mode 100644 libatm-2.5.2-glibc-2.32.patch create mode 100644 libatm-2.5.2-man-pages.patch create mode 100644 libatm-2.5.2-remove-define-hacks.patch diff --git a/libatm-2.5.2-glibc-2.32.patch b/libatm-2.5.2-glibc-2.32.patch new file mode 100644 index 0000000..dae437a --- /dev/null +++ b/libatm-2.5.2-glibc-2.32.patch @@ -0,0 +1,22 @@ +diff -up linux-atm-2.5.1/src/maint/atmdump.c.siocgstamp linux-atm-2.5.1/src/maint/atmdump.c +--- linux-atm-2.5.1/src/maint/atmdump.c.siocgstamp 2001-10-09 18:33:07.000000000 -0400 ++++ linux-atm-2.5.1/src/maint/atmdump.c 2019-06-17 23:12:50.570085260 -0400 +@@ -16,6 +16,7 @@ + #include + #include /* for htonl and ntohl */ + #include ++#include + + + static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE", +diff -up linux-atm-2.5.1/src/maint/saaldump.c.siocgstamp linux-atm-2.5.1/src/maint/saaldump.c +--- linux-atm-2.5.1/src/maint/saaldump.c.siocgstamp 2001-10-09 18:33:07.000000000 -0400 ++++ linux-atm-2.5.1/src/maint/saaldump.c 2019-06-17 23:13:06.620200319 -0400 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "pdu.h" + #define DUMP_MODE diff --git a/libatm-2.5.2-man-pages.patch b/libatm-2.5.2-man-pages.patch new file mode 100644 index 0000000..c504cfe --- /dev/null +++ b/libatm-2.5.2-man-pages.patch @@ -0,0 +1,45 @@ +diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 +--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 ++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 +@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using + recommended. Token Ring support has received less testing than its + Ethernet counterpart. + .SH FILES +-.IP \fI/var/run/lec[interface number].pid\fP ++\fI/var/run/lec[interface number].pid\fP + The file containing the process id of zeppelin. + .SH BUGS + John Bonham died 1980 and Led Zeppelin broke. +diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 +--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 +@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A + .B ]] + .SH DESCRIPTION + MPOA client +-.SM(MPC) is responsible for creating and receiving ++.SM (MPC) is responsible for creating and receiving + internetwork layer shortcuts. Using these shortcuts MPCs forward + unicast internetwork layer packets effectively over ATM without need + for routing protocols. +@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o + shortcuts is done with the help of + .SM MPOA + server +-.SM(MPS). ++.SM (MPS). + .PP + Just as the Linux + .SM LAN +diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 +--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 +@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e + .P + If an option is specified in \fBatmsigd.conf\fP and on the command + line, the command line has priority. +-.COMPATIBILITY ++.SH COMPATIBILITY + Certain options used by past versions of \fBatmsigd\fP but no longer documented + on the man page are still recognized and supported, but they also yield a + warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/libatm-2.5.2-remove-define-hacks.patch b/libatm-2.5.2-remove-define-hacks.patch new file mode 100644 index 0000000..cfac43c --- /dev/null +++ b/libatm-2.5.2-remove-define-hacks.patch @@ -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 + #include /* for linux/if_arp.h */ + #include /* for ntohs, etc. */ +-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include + #include + #include +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 + #include + #include +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include + #include + diff --git a/libatm.spec b/libatm.spec index a1fa68c..ebab246 100644 --- a/libatm.spec +++ b/libatm.spec @@ -1,36 +1,57 @@ Name: libatm -Version: 2.5.1 -Release: 2mamba -Summary: Drivers and tools to support ATM networking under Linux. +Version: 2.5.2 +Release: 1mamba +Summary: Drivers and tools to support ATM networking under Linux Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://sourceforge.net/projects/linux-atm/ -Source: http://downloads.sourceforge.net/project/linux-atm/linux-atm/%{version}/linux-atm-%{version}.tgz +Source: https://downloads.sourceforge.net/sourceforge/linux-atm/linux-atm-%{version}.tar.gz +Patch0: libatm-2.5.2-remove-define-hacks.patch +Patch1: libatm-2.5.2-man-pages.patch +Patch2: libatm-2.5.2-glibc-2.32.patch License: BSD, GPL, LGPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig +BuildRequires: libfl-devel ## AUTOBUILDREQ-END +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Drivers and tools to support ATM networking under Linux. Eventually this will also include support for some types of DSL modems. %package devel -Summary: Development tools for libatm +Summary: Development files for libatm Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: %{name}-tools = %{?epoch:%epoch:}%{version}-%{release} %description devel Drivers and tools to support ATM networking under Linux. Eventually this will also include support for some types of DSL modems. - This package contains static libraries and header files needed for development. +%package tools +Summary: Tools for linux-atm +Group: System/Tools +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description tools +Drivers and tools to support ATM networking under Linux. +Eventually this will also include support for some types of DSL modems. +This package contains the tools that come with linux-atm. + +%debug_package + %prep %setup -q -n linux-atm-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," config.sub %build %configure @@ -45,27 +66,41 @@ This package contains static libraries and header files needed for development. %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%files -%defattr(-,root,root) -%{_bindir}/* -%{_sysconfdir}/* -%{_sbindir}/* -%{_mandir}/man4/* -%{_mandir}/man7/* -%{_mandir}/man8/* -%{_libdir}/libatm.so* - -%files devel -%defattr(-,root,root) -%{_includedir}/*.h -%{_libdir}/*.a -%{_libdir}/*.la -%{_libdir}/*.so - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%files +%defattr(-,root,root) +%{_libdir}/libatm.so.* +%doc COPYING COPYING.LGPL + +%files devel +%defattr(-,root,root) +%{_includedir}/atm*.h +%{_libdir}/libatm.a +%{_libdir}/libatm.la +%{_libdir}/libatm.so + +%files tools +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/atmsigd.conf +%config(noreplace) %{_sysconfdir}/hosts.atm +%{_bindir}/* +%{_sbindir}/* +/lib/firmware/pca200e.bin +/lib/firmware/pca200e_ecd.bin2 +/lib/firmware/sba200e_ecd.bin2 +%{_mandir}/man4/atmsigd.conf.4* +%{_mandir}/man7/qos.7* +%{_mandir}/man7/sap.7* +%{_mandir}/man8/*.8* +%doc COPYING.GPL + %changelog +* Tue Dec 01 2020 Silvan Calarco 2.5.2-1mamba +- update to 2.5.2 +- added debug package and aarch64 build fix + * Mon Apr 06 2015 Automatic Build System 2.5.1-2mamba - automatic rebuild by autodist