Răsfoiți Sursa

http://bugs.uclibc.org/view.php?id=289
Debian have removed version 5.1.2 patchlevel 6 from their FTP servers,
replacing it with 5.1.2 patchlevel 6.1. The resulting patch applies cleanly,
but one of the buildroot patches does not apply cleanly unless modified.
Patch is included to fix this.

Eric Andersen 20 ani în urmă
părinte
comite
7011c7fe12
2 a modificat fișierele cu 7 adăugiri și 6 ștergeri
  1. 1 1
      package/netsnmp/netsnmp.mk
  2. 6 5
      package/netsnmp/netsnmp.patch

+ 1 - 1
package/netsnmp/netsnmp.mk

@@ -7,7 +7,7 @@
 NETSNMP_URL:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp/
 NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1.2
 NETSNMP_SOURCE:=net-snmp-5.1.2.tar.gz
-NETSNMP_PATCH1:=net-snmp_5.1.2-6.diff.gz
+NETSNMP_PATCH1:=net-snmp_5.1.2-6.1.diff.gz
 NETSNMP_PATCH1_URL:=http://ftp.debian.org/debian/pool/main/n/net-snmp/
 
 $(DL_DIR)/$(NETSNMP_SOURCE):

+ 6 - 5
package/netsnmp/netsnmp.patch

@@ -1,18 +1,19 @@
 diff -urN net-snmp-5.1-dist/agent/mibgroup/host/hr_system.c net-snmp-5.1/agent/mibgroup/host/hr_system.c
---- net-snmp-5.1-dist/agent/mibgroup/host/hr_system.c	2003-02-28 22:35:13.000000000 -0600
-+++ net-snmp-5.1/agent/mibgroup/host/hr_system.c	2004-03-31 22:06:05.000000000 -0600
-@@ -286,7 +286,11 @@
+--- net-snmp-5.1-dist/agent/mibgroup/host/hr_system.c	2004-02-22 17:29:34.000000000 +0000
++++ net-snmp-5.1/agent/mibgroup/host/hr_system.c	2005-05-27 15:15:52.363982808 +0100
+@@ -603,7 +603,11 @@
                 current user */
              if (kill(utmp_p->ut_pid, 0) == -1 && errno == ESRCH) {
                  utmp_p->ut_type = DEAD_PROCESS;
+-                pututline(utmp_p);
 +#if HAVE_UTMPX_H
-                 pututxline(utmp_p);
++                pututxline(utmp_p);
 +#else
 +                pututline(utmp_p);
 +#endif
                  continue;
              }
-             ++total;
+ #endif
 diff -urN net-snmp-5.1-dist/configure.in net-snmp-5.1/configure.in
 --- net-snmp-5.1-dist/configure.in	2004-03-31 21:59:14.000000000 -0600
 +++ net-snmp-5.1/configure.in	2004-03-31 22:06:05.000000000 -0600