- added patches based on ucd-snmp: dlopen-fix (dlmod works now), manpage (paths

  correction), link (link libsnmp and libnetsnmp with -lcrypto)
- release 0.2

Changed files:
    net-snmp-dlopen-fix.patch -> 1.1
    net-snmp-link.patch -> 1.1
    net-snmp-manpage.patch -> 1.1
    net-snmp.spec -> 1.13

diff --git a/net-snmp-dlopen-fix.patch b/net-snmp-dlopen-fix.patch
new file mode 100644 (file)
index 0000000..d292aec
--- /dev/null
+++ b/net-snmp-dlopen-fix.patch
@@ -0,0 +1,12 @@
+--- net-snmp-5.0.8/configure.in.orig   2003-05-17 15:51:58.000000000 +0200
++++ net-snmp-5.0.8/configure.in        2003-05-17 17:26:14.000000000 +0200
+@@ -1423,8 +1423,7 @@
+ dnl Replace `main' with a function in -lkvm:
+ AC_CHECK_LIB(kvm, kvm_read)
+ dnl DYNAMIC MODULE SUPPORT
+-AC_CHECK_LIB(dl, dlopen)
+-AC_CHECK_FUNCS(dlopen)
++AC_CHECK_LIB(dl, dlopen, [AC_DEFINE([HAVE_DLOPEN],,[dlopen function])])
+ 
+ AC_CHECK_FUNCS(kvm_openfiles nlist knlist kvm_getprocs)
+ echo "$with_mib_modules" | grep "ucd-snmp/diskio" >/dev/null

diff --git a/net-snmp-link.patch b/net-snmp-link.patch
new file mode 100644 (file)
index 0000000..eddfd13
--- /dev/null
+++ b/net-snmp-link.patch
@@ -0,0 +1,16 @@
+--- net-snmp-5.0.8/snmplib/Makefile.in.orig    2002-10-29 20:30:10.000000000 +0100
++++ net-snmp-5.0.8/snmplib/Makefile.in 2003-05-17 17:54:14.000000000 +0200
+@@ -136,11 +136,11 @@
+ 
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-      $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++      $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
+       $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto
+       $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ #

diff --git a/net-snmp-manpage.patch b/net-snmp-manpage.patch
new file mode 100644 (file)
index 0000000..921242a
--- /dev/null
+++ b/net-snmp-manpage.patch
@@ -0,0 +1,22 @@
+--- net-snmp-5.0.8/Makefile.top.orig   2003-03-05 21:08:26.000000000 +0100
++++ net-snmp-5.0.8/Makefile.top        2003-05-17 17:43:03.000000000 +0200
+@@ -27,7 +27,7 @@
+ snmplibdir    = $(datadir)/snmp
+ mibdir                = $(snmplibdir)/mibs
+ persistentdir = @PERSISTENT_DIRECTORY@
+-
++sysconfdir    = @sysconfdir@
+ 
+ #
+ # Programs
+--- net-snmp-5.0.8/man/mib2c.1.def.orig        2003-02-25 19:20:33.000000000 +0100
++++ net-snmp-5.0.8/man/mib2c.1.def     2003-05-17 17:40:02.000000000 +0200
+@@ -35,7 +35,7 @@
+ .TP
+ .BI -c " CONFIGFILE"
+ Use CONFIGFILE when generating code.  These files will be searched for
+-first in the current directory and then in the DATADIR directory
++first in the current directory and then in the DATADIR/snmp directory
+ (which is where the default mib2c configuration files can be found).
+ .TP
+ .BI -f " OUTNAME"

diff --git a/net-snmp.spec b/net-snmp.spec
index 4f822fabf3dfcb37cb0f3ad19a4b52754df932eb..1d43c4d4b6d8023a0b0728f1f255c7f55c868374 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -6,14 +6,7 @@
 # - review Obsoletes:
 # - review Provides:
 # - review ucd patches:
-# -- link_libsnmp_with_libcrypto
-# -- noinstalled
 # -- ia64
-# -- include-netinet_in_h
-# -- dlopen-fix
-# -- glibc21
-# -- manpage
-# -- no_libelf
 # -- init_master-libwrap
 %include       /usr/lib/rpm/macros.perl
 Summary:       A collection of SNMP protocol tools
@@ -24,7 +17,7 @@ Summary(ru):  
 Summary(uk):   îÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÐÒÏÔÏËÏÌÕ SNMP ×¦Ä UC-Davis
 Name:          net-snmp
 Version:       5.0.8
-Release:       0.1
+Release:       0.2
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -40,6 +33,9 @@ Patch1:               %{name}-acfix.patch
 Patch2:                %{name}-rpm-implicit-libs.patch
 Patch3:                %{name}-DESTDIR.patch
 Patch4:                %{name}-config-noflags.patch
+Patch5:                %{name}-dlopen-fix.patch
+Patch6:                %{name}-manpage.patch
+Patch7:                %{name}-link.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.57-3
 BuildRequires: automake
@@ -376,6 +372,9 @@ Przegl
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -470,8 +469,8 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post  compat -p /sbin/ldconfig
-%postun        compat -p /sbin/ldconfig
+%post  compat-libs -p /sbin/ldconfig
+%postun        compat-libs -p /sbin/ldconfig
 
 %post snmptrapd
 /sbin/chkconfig --add snmptrapd