fixed packaging

diff --git a/packaging/libsmi-0.4.8-gnu-source.patch b/packaging/libsmi-0.4.8-gnu-source.patch
deleted file mode 100644 (file)
index 98cd5b8..0000000
--- a/packaging/libsmi-0.4.8-gnu-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr libsmi-0.4.8-orig/lib/smi.c libsmi-0.4.8/lib/smi.c
---- libsmi-0.4.8-orig/lib/smi.c        2008-04-18 12:42:50.000000000 +0200
-+++ libsmi-0.4.8/lib/smi.c     2010-03-23 10:51:12.373123639 +0100
-@@ -11,6 +11,7 @@
-  * @(#) $Id: smi.c 8071 2008-04-17 11:14:46Z schoenw $
-  */
- 
-+#define _GNU_SOURCE
- #include <config.h>
- 
- #include <stdlib.h>

diff --git a/packaging/libsmi-0.4.8-parser.patch b/packaging/libsmi-0.4.8-parser.patch
deleted file mode 100644 (file)
index 68f68d4..0000000
--- a/packaging/libsmi-0.4.8-parser.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr libsmi-0.4.8-orig/lib/parser-sming.y libsmi-0.4.8/lib/parser-sming.y
---- libsmi-0.4.8-orig/lib/parser-sming.y       2008-04-18 12:42:50.000000000 +0200
-+++ libsmi-0.4.8/lib/parser-sming.y    2010-03-23 10:44:11.777122974 +0100
-@@ -2161,8 +2161,8 @@
-                                                         classPtr, thisParserPtr);
-                           setAttributeParentType($$, smiHandle->typeBitsPtr);
-                           if ($1) {
--                              setAttributeList($$, $1);
--                              for (p = $1; p; p = p->nextPtr)
-+                              setAttributeList($$, (void *)$1);
-+                              for (p = (void *)$1; p; p = (void *)p->nextPtr)
-                                   ((NamedNumber *)(p->ptr))->typePtr = (Type*)$$;
-                           }
-                           

diff --git a/packaging/libsmi-CVE-2010-2891.patch b/packaging/libsmi-CVE-2010-2891.patch
deleted file mode 100644 (file)
index 114431d..0000000
--- a/packaging/libsmi-CVE-2010-2891.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: lib/smi.c
-===================================================================
---- lib/smi.c  (revision 29144)
-+++ lib/smi.c  (working copy)
-@@ -1793,10 +1793,15 @@
-     }
- 
-     if (isdigit((int)node2[0])) {
--      for (oidlen = 0, p = strtok(node2, ". "); p;
-+      for (oidlen = 0, p = strtok(node2, ". ");
-+           p && oidlen < sizeof(oid)/sizeof(oid[0]);
-            oidlen++, p = strtok(NULL, ". ")) {
-           oid[oidlen] = strtoul(p, NULL, 0);
-       }
-+      if (p) {
-+          /* the numeric OID is too long */
-+          return NULL;
-+      }
-       nodePtr = getNode(oidlen, oid);
-       if (nodePtr) {
-           if (modulePtr) {

diff --git a/packaging/libsmi.spec b/packaging/libsmi.spec
index 17f8cb3..959202f 100644 (file)
--- a/packaging/libsmi.spec
+++ b/packaging/libsmi.spec
@@ -6,13 +6,9 @@ Summary:        A Library to Access SMI MIB Information
 Url:            http://www.ibr.cs.tu-bs.de/projects/libsmi
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         libsmi-0.4.8-parser.patch
-Patch1:         libsmi-0.4.8-gnu-source.patch
-Patch2:         libsmi-CVE-2010-2891.patch
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libtool
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The purpose of libsmi is to
@@ -39,9 +35,6 @@ libsmi.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2
 
 %build
 autoreconf --force --install
@@ -54,16 +47,16 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-rm -f %{buildroot}%{_libdir}/*.la
-
 %post -n libsmi -p /sbin/ldconfig
 
 %postun -n libsmi -p /sbin/ldconfig
 
+
+%docs_package
+
 %files
 %defattr(-, root, root)
-%doc COPYING  doc/*.txt
-%doc %{_mandir}/man?/*
+%doc COPYING 
 %{_bindir}/*
 %{_datadir}/mibs
 %{_datadir}/pibs