rediff the multilib patch
This commit is contained in:
parent
2116d0cf54
commit
5c2f314cc9
@ -1,47 +0,0 @@
|
|||||||
Make the man pages multilib safe.
|
|
||||||
|
|
||||||
diff -up net-snmp-5.5/man/config_api.3.def.orig net-snmp-5.5/man/config_api.3.def
|
|
||||||
--- net-snmp-5.5/man/config_api.3.def.orig 2009-04-21 11:36:52.000000000 +0200
|
|
||||||
+++ net-snmp-5.5/man/config_api.3.def 2009-09-29 11:45:44.000000000 +0200
|
|
||||||
@@ -256,7 +256,7 @@ machines and the second file can be used
|
|
||||||
for one particular machine.
|
|
||||||
.PP
|
|
||||||
The default list of directories to search is
|
|
||||||
-SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by LIBDIR/snmp,
|
|
||||||
+SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by /usr/lib(64)/snmp,
|
|
||||||
followed by $HOME/.snmp.
|
|
||||||
This list can be changed by setting the environmental variable
|
|
||||||
.I SNMPCONFPATH
|
|
||||||
@@ -326,7 +326,7 @@ function that it should abort the operat
|
|
||||||
SNMPCONFPATH
|
|
||||||
A colon separated list of directories to search for configuration
|
|
||||||
files in.
|
|
||||||
-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
|
|
||||||
+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp
|
|
||||||
.SH "SEE ALSO"
|
|
||||||
.BR mib_api "(3), " snmp_api (3)
|
|
||||||
.\" Local Variables:
|
|
||||||
diff -up net-snmp-5.5/man/snmp_config.5.def.orig net-snmp-5.5/man/snmp_config.5.def
|
|
||||||
--- net-snmp-5.5/man/snmp_config.5.def.orig 2007-06-18 23:17:15.000000000 +0200
|
|
||||||
+++ net-snmp-5.5/man/snmp_config.5.def 2009-09-29 11:45:22.000000000 +0200
|
|
||||||
@@ -11,7 +11,7 @@ First off, there are numerous places tha
|
|
||||||
found and read from. By default, the applications look for
|
|
||||||
configuration files in the following 4 directories, in order:
|
|
||||||
SYSCONFDIR/snmp,
|
|
||||||
-DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these
|
|
||||||
+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp. In each of these
|
|
||||||
directories, it looks for files with the extension of both
|
|
||||||
.IR conf " and " local.conf
|
|
||||||
(reading the second ones last). In this manner, there are
|
|
||||||
diff -up net-snmp-5.5/man/snmpd.conf.5.def.orig net-snmp-5.5/man/snmpd.conf.5.def
|
|
||||||
--- net-snmp-5.5/man/snmpd.conf.5.def.orig 2009-06-01 17:53:30.000000000 +0200
|
|
||||||
+++ net-snmp-5.5/man/snmpd.conf.5.def 2009-09-29 11:44:59.000000000 +0200
|
|
||||||
@@ -1272,7 +1272,7 @@ filename), and call the initialisation r
|
|
||||||
.RS
|
|
||||||
.IP "Note:"
|
|
||||||
If the specified PATH is not a fully qualified filename, it will
|
|
||||||
-be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR
|
|
||||||
+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR
|
|
||||||
will be appended to the filename.
|
|
||||||
.RE
|
|
||||||
.PP
|
|
47
net-snmp-5.6-multilib.patch
Normal file
47
net-snmp-5.6-multilib.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
Make the man pages multilib safe.
|
||||||
|
|
||||||
|
diff -up net-snmp-5.6/man/netsnmp_config_api.3.def.multilib net-snmp-5.6/man/netsnmp_config_api.3.def
|
||||||
|
--- net-snmp-5.6/man/netsnmp_config_api.3.def.multilib 2010-09-08 17:41:37.000000000 +0200
|
||||||
|
+++ net-snmp-5.6/man/netsnmp_config_api.3.def 2010-10-25 17:40:43.433726423 +0200
|
||||||
|
@@ -295,7 +295,7 @@ for one particular machine.
|
||||||
|
.PP
|
||||||
|
The default list of directories to search is \fC SYSCONFDIR/snmp\fP,
|
||||||
|
followed by \fC DATADIR/snmp\fP,
|
||||||
|
-followed by \fC LIBDIR/snmp\fP,
|
||||||
|
+followed by \fC /usr/lib(64)/snmp\fP,
|
||||||
|
followed by \fC $HOME/.snmp\fP.
|
||||||
|
This list can be changed by setting the environmental variable
|
||||||
|
.I SNMPCONFPATH
|
||||||
|
@@ -365,7 +365,7 @@ function that it should abort the operat
|
||||||
|
SNMPCONFPATH
|
||||||
|
A colon separated list of directories to search for configuration
|
||||||
|
files in.
|
||||||
|
-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
|
||||||
|
+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp
|
||||||
|
.SH "SEE ALSO"
|
||||||
|
.BR mib_api "(3), " snmp_api (3)
|
||||||
|
.\" Local Variables:
|
||||||
|
diff -up net-snmp-5.6/man/snmp_config.5.def.multilib net-snmp-5.6/man/snmp_config.5.def
|
||||||
|
--- net-snmp-5.6/man/snmp_config.5.def.multilib 2010-09-17 11:51:52.000000000 +0200
|
||||||
|
+++ net-snmp-5.6/man/snmp_config.5.def 2010-10-25 17:40:12.681976439 +0200
|
||||||
|
@@ -10,7 +10,7 @@ First off, there are numerous places tha
|
||||||
|
found and read from. By default, the applications look for
|
||||||
|
configuration files in the following 4 directories, in order:
|
||||||
|
SYSCONFDIR/snmp,
|
||||||
|
-DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these
|
||||||
|
+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp. In each of these
|
||||||
|
directories, it looks for files with the extension of both
|
||||||
|
.IR conf " and " local.conf
|
||||||
|
(reading the second ones last). In this manner, there are
|
||||||
|
diff -up net-snmp-5.6/man/snmpd.conf.5.def.multilib net-snmp-5.6/man/snmpd.conf.5.def
|
||||||
|
--- net-snmp-5.6/man/snmpd.conf.5.def.multilib 2010-09-17 11:51:52.000000000 +0200
|
||||||
|
+++ net-snmp-5.6/man/snmpd.conf.5.def 2010-10-25 17:40:12.682976925 +0200
|
||||||
|
@@ -1387,7 +1387,7 @@ filename), and call the initialisation r
|
||||||
|
.RS
|
||||||
|
.IP "Note:"
|
||||||
|
If the specified PATH is not a fully qualified filename, it will
|
||||||
|
-be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR
|
||||||
|
+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR
|
||||||
|
will be appended to the filename.
|
||||||
|
.RE
|
||||||
|
.PP
|
@ -28,7 +28,7 @@ Source7: net-snmpd.sysconfig
|
|||||||
Source8: net-snmptrapd.sysconfig
|
Source8: net-snmptrapd.sysconfig
|
||||||
Patch1: net-snmp-5.6-pie.patch
|
Patch1: net-snmp-5.6-pie.patch
|
||||||
Patch2: net-snmp-5.5-dir-fix.patch
|
Patch2: net-snmp-5.5-dir-fix.patch
|
||||||
Patch3: net-snmp-5.5-multilib.patch
|
Patch3: net-snmp-5.6-multilib.patch
|
||||||
Patch4: net-snmp-5.5-sensors3.patch
|
Patch4: net-snmp-5.5-sensors3.patch
|
||||||
Patch5: net-snmp-5.5-udptable-index.patch
|
Patch5: net-snmp-5.5-udptable-index.patch
|
||||||
Patch6: net-snmp-5.5-missing-bcast.patch
|
Patch6: net-snmp-5.5-missing-bcast.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user