[packages/docsis] - updated to 0.9.6 - updated link patch - removed obsolete gnu-m4-detect patch - added no-common pat

qboosh qboosh at pld-linux.org
Tue Oct 6 17:10:09 CEST 2020 

commit 6d264f08938aee54d5aade17b4301db5c47e7bd6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Oct 6 17:13:13 2020 +0200

    - updated to 0.9.6
    - updated link patch
    - removed obsolete gnu-m4-detect patch
    - added no-common patch to fix build with -fno-common (gcc 10 default)

 docsis-gnu-m4-detect.patch | 11 ----------
 docsis-link.patch          | 20 ++++++++-----------
 docsis-no-common.patch     | 27 +++++++++++++++++++++++++
 docsis.spec                | 50 ++++++++++++++++++++++++++++++++++------------
 4 files changed, 72 insertions(+), 36 deletions(-)
---
diff --git a/docsis.spec b/docsis.spec
index 4b5280a..be5162b 100644
--- a/docsis.spec
+++ b/docsis.spec
@@ -1,22 +1,24 @@
 Summary:	DOCSIS RFI 1.1 Encoding Configuration File Settings into binary configuration files
 Summary(pl.UTF-8):	Kodowanie ustawień konfiguracyjnych w plikach binarnych wg DOCSIS RFI 1.1
 Name:		docsis
-Version:	0.9.5
-Release:	8
+Version:	0.9.6
+Release:	1
 License:	GPL v2
 Group:		Applications
-Source0:	http://dl.sourceforge.net/docsis/%{name}-%{version}.tar.gz
-# Source0-md5:	2b89cf254a5eb07b0ee8b6331238ea96
-Patch0:		%{name}-gnu-m4-detect.patch
-Patch1:		%{name}-link.patch
+Source0:	http://downloads.sourceforge.net/docsis/%{name}-%{version}.tar.bz2
+# Source0-md5:	fd431046f04b10fe8e46c4dd1c178b58
+Patch0:		%{name}-link.patch
+Patch1:		%{name}-no-common.patch
 URL:		http://docsis.sourceforge.net/
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	bison
+BuildRequires:	automake >= 1:1.8
+BuildRequires:	bison >= 1.28
 BuildRequires:	flex
 BuildRequires:	libtool
-BuildRequires:	net-snmp-devel
-Requires:	mibs-%{name}
+BuildRequires:	m4
+BuildRequires:	net-snmp-devel >= 5.0.7
+Requires:	mibs-%{name} = %{version}-%{release}
+Requires:	net-snmp-libs >= 5.0.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,12 +31,16 @@ konfiguracyjnych zgodnie z DOCSIS RFI 1.1.
 
 %package -n mibs-%{name}
 Summary:	MIBs from DOCSIS
+Summary(pl.UTF-8):	MIB-y z DOCSIS
 Group:		Base
 Requires:	mibs-dirs
 Requires:	mibs-net-snmp
 
 %description -n mibs-%{name}
-MIBs (Management Information Base) from DOCSIS.
+MIB (Management Information Base) files from DOCSIS.
+
+%description -n mibs-%{name} -l pl.UTF-8
+Pliki MIB (Management Information Base) z DOCSIS.
 
 %prep
 %setup -q
@@ -45,8 +51,8 @@ MIBs (Management Information Base) from DOCSIS.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-%{__automake}
 %{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -68,4 +74,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mibs-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/mibs/*
+%{_datadir}/mibs/CLAB-DEF-MIB
+%{_datadir}/mibs/DIFFSERV-DSCP-TC
+%{_datadir}/mibs/DIFFSERV-MIB
+%{_datadir}/mibs/DOCS-BPI-MIB
+%{_datadir}/mibs/DOCS-BPI2-MIB
+%{_datadir}/mibs/DOCS-CABLE-DEVICE-MIB
+%{_datadir}/mibs/DOCS-CABLE-DEVICE-TRAP-MIB
+%{_datadir}/mibs/DOCS-IF-EXT-MIB
+%{_datadir}/mibs/DOCS-IF-MIB
+%{_datadir}/mibs/DOCS-QOS-MIB
+%{_datadir}/mibs/DOCS-SUBMGT-MIB
+%{_datadir}/mibs/IGMP-STD-MIB
+%{_datadir}/mibs/INTEGRATED-SERVICES-MIB
+%{_datadir}/mibs/PKTC-EVENT-MIB
+%{_datadir}/mibs/PKTC-IETF-SIG-MIB
+%{_datadir}/mibs/PKTC-MTA-MIB
+%{_datadir}/mibs/PKTC-SIG-MIB
+%{_datadir}/mibs/RMON2-MIB
+%{_datadir}/mibs/TOKEN-RING-RMON-MIB
diff --git a/docsis-gnu-m4-detect.patch b/docsis-gnu-m4-detect.patch
deleted file mode 100644
index a66b20b..0000000
--- a/docsis-gnu-m4-detect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- docsis-0.9.5/configure.in~	2007-09-22 00:55:03.862858273 +0200
-+++ docsis-0.9.5/configure.in	2007-09-22 00:58:30.177668639 +0200
-@@ -16,7 +16,7 @@
-   AC_MSG_ERROR([M4 is required])
- else
-   ac_m4_vers=`$M4 --version 2>/dev/null | head -1` ;
--  ac_is_gnu_m4=`echo $ac_m4_vers | cut -d' ' -f1`;
-+  ac_is_gnu_m4=`echo $ac_m4_vers | grep -q GNU && echo GNU` ;
-   if test "x$ac_is_gnu_m4" = "xGNU"; then
- 	AC_MSG_RESULT([   found $ac_m4_vers at $M4 ])
-   else
diff --git a/docsis-link.patch b/docsis-link.patch
index cbac01c..49046df 100644
--- a/docsis-link.patch
+++ b/docsis-link.patch
@@ -1,15 +1,11 @@
-diff -u b.docsis-0.9.5/configure.in n.docsis-0.9.5/configure.in
---- b.docsis-0.9.5/configure.in	2005-07-06 01:53:18.000000000 +0200
-+++ n.docsis-0.9.5/configure.in	2008-09-25 15:54:05.804556120 +0200
-@@ -10,6 +10,7 @@
+--- docsis-0.9.6/configure.in.orig	2020-10-06 17:01:31.477677619 +0200
++++ docsis-0.9.6/configure.in	2020-10-06 17:03:55.176899134 +0200
+@@ -8,7 +8,7 @@
+ dnl AC_PROG_YACC
  AC_PROG_LEX
  
- AC_CHECK_LIB(resolv, inet_aton)
-+AC_CHECK_LIB(m, trunc)
+-AC_CHECK_LIB(resolv, inet_aton)
++AC_SEARCH_LIBS(inet_aton, resolv)
+ AC_CHECK_LIBM
+ AC_SUBST(LIBM)
  
- AC_PATH_PROGS([M4], [gm4 gnum4 m4], [notfound],[/usr/local/bin:/usr/freeware/bin:/usr/gnu/bin:${prefix}/bin:${exec_prefix}/bin:$PATH] )
- if test "x$M4" = "xnotfound"; then
-Common subdirectories: b.docsis-0.9.5/doc and n.docsis-0.9.5/doc
-Common subdirectories: b.docsis-0.9.5/examples and n.docsis-0.9.5/examples
-Common subdirectories: b.docsis-0.9.5/mibs and n.docsis-0.9.5/mibs
-Common subdirectories: b.docsis-0.9.5/src and n.docsis-0.9.5/src
diff --git a/docsis-no-common.patch b/docsis-no-common.patch
new file mode 100644
index 0000000..83596d5
--- /dev/null
+++ b/docsis-no-common.patch
@@ -0,0 +1,27 @@
+--- docsis-0.9.6/src/docsis_globals.h.orig	2010-05-27 00:00:09.000000000 +0200
++++ docsis-0.9.6/src/docsis_globals.h	2020-10-06 17:08:17.658810480 +0200
+@@ -23,8 +23,8 @@
+ #ifndef _DOCSIS_GLOBALS_H
+ #define _DOCSIS_GLOBALS_H
+ 
+-char prog_name[255];
+-struct tlv *global_tlvtree_head;
+-symbol_type *global_symtable;
++extern char prog_name[255];
++extern struct tlv *global_tlvtree_head;
++extern symbol_type *global_symtable;
+ 
+ #endif /* _DOCSIS_GLOBALS_H */
+--- docsis-0.9.6/src/docsis.c.orig	2010-06-11 18:32:30.000000000 +0200
++++ docsis-0.9.6/src/docsis.c	2020-10-06 17:10:41.491364606 +0200
+@@ -44,6 +44,10 @@
+ 
+ extern unsigned int line;	/* defined in docsis_lex.l */
+ 
++char prog_name[255];
++struct tlv *global_tlvtree_head;
++symbol_type *global_symtable;
++
+ static void setup_mib_flags(void);
+ 
+ static unsigned int
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docsis.git/commitdiff/6d264f08938aee54d5aade17b4301db5c47e7bd6

More information about the pld-cvs-commit mailing list