summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch122
-rw-r--r--package/ltp-testsuite/ltp-testsuite.mk2
-rw-r--r--package/ltp-testsuite/ltp-testsuite.patch25
3 files changed, 115 insertions, 34 deletions
diff --git a/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch b/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch
index 9cc6ac37f..be525abab 100644
--- a/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch
+++ b/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch
@@ -1,19 +1,17 @@
-diff -ur ltp-full-20050804/testcases/network/multicast/mc_member/member.c ltp-full-20050804-patched/testcases/network/multicast/mc_member/member.c
---- ltp-full-20050804/testcases/network/multicast/mc_member/member.c 2005-08-04 15:33:05.000000000 -0500
-+++ ltp-full-20050804-patched/testcases/network/multicast/mc_member/member.c 2006-06-21 22:56:15.746866000 -0500
-@@ -74,7 +74,7 @@
+--- ltp/testcases/network/multicast/mc_member/member.c.orig 2005-10-03 12:19:46.000000000 -0600
++++ ltp/testcases/network/multicast/mc_member/member.c 2006-07-04 18:29:28.000000000 -0600
+@@ -80,7 +80,7 @@
}
- if(hp = gethostbyname(interface)) {
+ if((hp = gethostbyname(interface))) {
- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
-+ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
++ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
} else
if((n = sscanf(interface, "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
fprintf(stderr, "bad group address\n" );
-diff -ur ltp-full-20050804/testcases/network/tcp_cmds/echo/echoes.c ltp-full-20050804-patched/testcases/network/tcp_cmds/echo/echoes.c
---- ltp-full-20050804/testcases/network/tcp_cmds/echo/echoes.c 2005-08-04 15:33:05.000000000 -0500
-+++ ltp-full-20050804-patched/testcases/network/tcp_cmds/echo/echoes.c 2006-06-21 22:55:13.000000000 -0500
-@@ -121,7 +121,7 @@
+--- ltp/testcases/network/tcp_cmds/echo/echoes.c.orig 2005-10-03 11:58:24.000000000 -0600
++++ ltp/testcases/network/tcp_cmds/echo/echoes.c 2006-07-04 18:27:06.000000000 -0600
+@@ -133,7 +133,7 @@
exit(1);
}
port=sp->s_port;
@@ -22,3 +20,107 @@ diff -ur ltp-full-20050804/testcases/network/tcp_cmds/echo/echoes.c ltp-full-200
bzero((char *)&sa,sizeof (sa));
sa.sin_port=port;
sa.sin_family=AF_INET;
+--- ltp/testcases/network/tcp_cmds/perf_lan/pingpong.c.orig 2006-07-04 18:33:14.000000000 -0600
++++ ltp/testcases/network/tcp_cmds/perf_lan/pingpong.c 2006-07-04 18:33:44.000000000 -0600
+@@ -118,7 +118,7 @@
+ hp = gethostbyname(av[1]);
+ if (hp) {
+ to->sin_family = hp->h_addrtype;
+- bcopy(hp->h_addr, (caddr_t)&to->sin_addr, hp->h_length);
++ memcpy((caddr_t)&to->sin_addr, hp->h_addr, hp->h_length);
+ hostname = hp->h_name;
+ } else {
+ tst_resm (TINFO, "%s: unknown host, couldn't get address\n",argv[0]);
+--- ltp/testcases/network/rpc/rpc01/rpc1.c.orig 2006-07-04 18:34:29.000000000 -0600
++++ ltp/testcases/network/rpc/rpc01/rpc1.c 2006-07-04 18:34:47.000000000 -0600
+@@ -101,7 +101,7 @@
+ }
+ bzero(&server_sin, sizeof(server_sin));
+ server_sin.sin_family = AF_INET;
+- bcopy(hp->h_addr, (char *) &server_sin.sin_addr, sizeof(hp->h_addr));
++ memcpy((char *) &server_sin.sin_addr, hp->h_addr, sizeof(hp->h_addr));
+
+ if (!file_name) {
+ fprintf(stderr, "file name not given\n");
+--- ltp/testcases/network/multicast/mc_commo/mc_recv.c.orig 2006-07-04 18:35:24.000000000 -0600
++++ ltp/testcases/network/multicast/mc_commo/mc_recv.c 2006-07-04 18:35:59.000000000 -0600
+@@ -45,7 +45,7 @@
+ imr.imr_multiaddr.s_addr = htonl((g1<<24) | (g2<<16) | (g3<<8) | g4);
+
+ if((hp = gethostbyname(argv[2])))
+- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
++ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
+ else
+ if((n = sscanf(argv[2], "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
+ fprintf (stderr,"Bad group interface address\n");
+--- ltp/testcases/network/multicast/mc_commo/mc_send.c.orig 2006-07-04 18:36:34.000000000 -0600
++++ ltp/testcases/network/multicast/mc_commo/mc_send.c 2006-07-04 18:36:52.000000000 -0600
+@@ -48,7 +48,7 @@
+ imr.imr_multiaddr.s_addr = htonl((g1<<24) | (g2<<16) | (g3<<8) | g4);
+
+ if((hp = gethostbyname(argv[2]))) {
+- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
++ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
+ } else
+ if((n = sscanf(argv[2], "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
+ fprintf (stderr,"Bad interface address\n");
+--- ltp/testcases/kernel/ipc/pipeio/pipeio.c.orig 2006-07-04 18:37:26.000000000 -0600
++++ ltp/testcases/kernel/ipc/pipeio/pipeio.c 2006-07-04 18:38:44.000000000 -0600
+@@ -742,7 +742,7 @@
+ /*
+ * get the last 2 words printed
+ */
+- bcopy(a-(width*NBPW),c,width*NBPW);
++ memcpy(c,a-(width*NBPW),width*NBPW);
+ for (p = c; (p-c) < width*NBPW; ++p) {
+ if (*p < '!' || *p > '~')
+ *p = '.';
+@@ -761,7 +761,7 @@
+ printf("%10.10ld ",*word);
+ break;
+ case ASCII:
+- bcopy(a,b,NBPW);
++ memcpy(b,a,NBPW);
+ for (p = b; (p-b) < NBPW; ++p) {
+ if (*p < '!' || *p > '~')
+ *p = '.';
+@@ -780,7 +780,7 @@
+ */
+ bzero(c,width*NBPW);
+ if (extra_words) width = extra_words; /* odd number of words */
+- bcopy(a-(width*NBPW),c,width*NBPW);
++ memcpy(c,a-(width*NBPW),width*NBPW);
+ for (p = c; (p-c) < width*NBPW; ++p) {
+ if (*p < '!' || *p > '~')
+ *p = '.';
+--- ltp/testcases/ballista/ballista/serverCommunication.cpp.orig 2006-07-04 18:39:39.000000000 -0600
++++ ltp/testcases/ballista/ballista/serverCommunication.cpp 2006-07-04 18:40:33.000000000 -0600
+@@ -67,7 +67,7 @@
+ #ifdef SUN
+
+ #include <strings.h>
+-//includes bcopy proto
++//includes memcpy proto
+
+ #endif
+
+@@ -118,7 +118,7 @@
+ }
+
+
+- bcopy ((const char *)hp->h_addr,(char *)&(server_addr.sin_addr.s_addr),hp->h_length);
++ memcpy ((char *)&(server_addr.sin_addr.s_addr),(const char *)hp->h_addr,hp->h_length);
+
+
+ server_addr.sin_family = AF_INET;
+--- ltp/tools/netpipe-2.4/TCP.c.orig 2006-07-04 18:41:13.000000000 -0600
++++ ltp/tools/netpipe-2.4/TCP.c 2006-07-04 18:41:39.000000000 -0600
+@@ -85,7 +85,7 @@
+ }
+
+ lsin1->sin_family = addr->h_addrtype;
+- bcopy(addr->h_addr, (char*) &(lsin1->sin_addr.s_addr), addr->h_length);
++ memcpy((char*) &(lsin1->sin_addr.s_addr), addr->h_addr, addr->h_length);
+ }
+
+ lsin1->sin_port = htons(p->port);
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 02f12c428..7b44764a8 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -3,7 +3,7 @@
# ltp-testsuite
#
#############################################################
-LTP_TESTSUITE_VERSION:=20050804
+LTP_TESTSUITE_VERSION:=20060615
LTP_TESTSUITE_SOURCE:=ltp-full-$(LTP_TESTSUITE_VERSION).tgz
LTP_TESTSUITE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
LTP_TESTSUITE_CAT:=zcat
diff --git a/package/ltp-testsuite/ltp-testsuite.patch b/package/ltp-testsuite/ltp-testsuite.patch
index 9f955640c..054b91180 100644
--- a/package/ltp-testsuite/ltp-testsuite.patch
+++ b/package/ltp-testsuite/ltp-testsuite.patch
@@ -9,8 +9,8 @@
all: $(TARGETS)
---- ltp-full-20050707-dist/testcases/kernel/syscalls/getcontext01/Makefile 2005-05-26 14:38:47.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/getcontext01/Makefile 2005-08-02 19:56:11.000000000 -0600
+--- ltp-full-20050707-dist/testcases/kernel/syscalls/getcontext/Makefile 2005-05-26 14:38:47.000000000 -0600
++++ ltp-full-20050707/testcases/kernel/syscalls/getcontext/Makefile 2005-08-02 19:56:11.000000000 -0600
@@ -24,7 +24,7 @@
LOADLIBES+= -L../../../../lib -lltp
@@ -66,27 +66,6 @@
static void setup();
static void cleanup();
static int setup01();
---- ltp-full-20050707/testcases/kernel/fs/acls/acl_file_test.c.orig 2005-08-09 01:41:25.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/fs/acls/acl_file_test.c 2005-08-09 01:42:29.000000000 -0600
-@@ -52,12 +52,18 @@
- }
-
- //s = syscall(237, fd,tok); //fremovexattr
-+#ifdef __NR_fremovexattr
- s = syscall(__NR_fremovexattr, fd,tok); //fremovexattr
- if (s == -1) {
- printf ("User unable to remove extended attributes file %s !\n", argv[1]);
- printf("errno = %i\n", errno);
- rc = 1;
- }
-+#else
-+ printf ("User unable to remove extended attributes file %s !\n", argv[1]);
-+ printf("errno = %i\n", ENOSYS);
-+ rc = 1;
-+#endif
-
- close (fd);
- return rc;
--- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs01.c 2005-12-08 18:26:07.000000000 -0700
+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs01.c 2005-12-08 18:28:26.000000000 -0700
@@ -72,10 +72,6 @@
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 01:39:40 +0000