summaryrefslogtreecommitdiff
path: root/sysutils/tcx/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/tcx/patches')
-rw-r--r--sysutils/tcx/patches/patch-aa29
-rw-r--r--sysutils/tcx/patches/patch-ab41
-rw-r--r--sysutils/tcx/patches/patch-ac172
-rw-r--r--sysutils/tcx/patches/patch-ad36
4 files changed, 278 insertions, 0 deletions
diff --git a/sysutils/tcx/patches/patch-aa b/sysutils/tcx/patches/patch-aa
new file mode 100644
index 00000000000..920e08a5b90
--- /dev/null
+++ b/sysutils/tcx/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+
+--- Makefile 2003/05/19 15:39:04 1.1
++++ Makefile 2003/05/19 16:01:40
+@@ -6,11 +6,11 @@
+
+ # C compiler of your choice. Should be ansi'ish
+ #CC = cc # IRIX, ULTRIX
+-CC = gcc # SUNOS, LINUX
++#CC = gcc # SUNOS, LINUX
+ #CC = c++ # try & see?
+
+ # Cflags of choice.
+-CFLAGS = -s -O6 -Wall
++#CFLAGS = -s -O6 -Wall
+
+
+ # Any libraries
+@@ -29,4 +29,9 @@
+ shar -c -l 45 -o tcx README VERSION COPYING Makefile tcx.1 untcx.1 tcx.c config.h untcx.c
+
+ clean:
+- /bin/rm -f *.o tcx untcx
++ rm -f *.o tcx untcx
++
++install:
++ ${BSD_INSTALL_PROGRAM} tcx ${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} untcx ${PREFIX}/bin
++ chmod 4755 ${PREFIX}/bin/untcx
diff --git a/sysutils/tcx/patches/patch-ab b/sysutils/tcx/patches/patch-ab
new file mode 100644
index 00000000000..6cf1712371d
--- /dev/null
+++ b/sysutils/tcx/patches/patch-ab
@@ -0,0 +1,41 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+
+--- config.h 2003/05/19 16:02:37 1.1
++++ config.h 2003/05/19 16:03:51
+@@ -23,7 +23,7 @@
+ /* Define one of the following where appropriate */
+ /************************************************************************/
+
+-#define LINUX
++/* #define LINUX */
+ /* #define SUNOS */
+ /* #define IRIX */
+ /* #define ULTRIX */
+@@ -45,14 +45,14 @@
+ /* since PATHUNTCX must run setuid to root. */
+ /************************************************************************/
+
+-#define PATHUNTCX "/usr/local/bin/untcx"
++#define PATHUNTCX @PREFIX@ "/bin/untcx"
+
+ /************************************************************************/
+ /* PATHTCX is the pathname to the tcx executable. This does not have to*/
+ /* be installed setuid. */
+ /************************************************************************/
+
+-#define PATHTCX "/usr/local/bin/tcx"
++#define PATHTCX @PREFIX@ "/bin/tcx"
+
+ /************************************************************************/
+ /* PATHPACKER is the pathname to the compression program you wish to use*/
+@@ -143,6 +143,10 @@
+ #define PUSLEEP(x) (usleep(x))
+ #endif
+
++#ifndef PUSLEEP
++#define PUSLEEP(x) (usleep(x))
++#endif
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/time.h>
diff --git a/sysutils/tcx/patches/patch-ac b/sysutils/tcx/patches/patch-ac
new file mode 100644
index 00000000000..2ce1e46145f
--- /dev/null
+++ b/sysutils/tcx/patches/patch-ac
@@ -0,0 +1,172 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+
+Minor security audit - the world has moved on since 1994.
+
+--- untcx.c 2003/06/20 07:59:56 1.1
++++ untcx.c 2003/06/20 08:09:26
+@@ -166,9 +166,9 @@
+
+ /* Set global paths */
+
+- (void)sprintf(logpath, "%s/log", ENFSDIR);
+- (void)sprintf(logtmppath, "%s/logtmp", ENFSDIR);
+- (void)sprintf(lockpath, "%s/.lock", ENFSDIR);
++ (void)snprintf(logpath, sizeof(logpath), "%s/log", ENFSDIR);
++ (void)snprintf(logtmppath, sizeof(logtmppath), "%s/logtmp", ENFSDIR);
++ (void)snprintf(lockpath, sizeof(lockpath), "%s/.lock", ENFSDIR);
+
+ /* Check and start tcxd as required */
+
+@@ -185,16 +185,16 @@
+
+ /* Grab argv[0] and resolve to full path name via getwd() */
+
+- if(getwd(cwd) == NULL)
++ if(getcwd(cwd, sizeof(cwd)) == NULL)
+ {
+ (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
+ exit(-1);
+ }
+
+ if(*argv[0] == '/')
+- (void)strcpy(realdir, argv[0]);
++ (void)strlcpy(realdir, argv[0], sizeof(realdir));
+ else
+- (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
++ (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
+ for(;;)
+ {
+ if((c = strrchr(realdir, '/')) == NULL)
+@@ -203,7 +203,7 @@
+ exit(-1);
+ }
+ c++;
+- (void)strcpy(execname, c);
++ (void)strlcpy(execname, c, sizeof(execname));
+ *c = '\0';
+
+ if(chdir(realdir) < 0) /* Oops. Failed. Report and quit. */
+@@ -212,7 +212,7 @@
+ exit(-1);
+ }
+
+- if(getwd(realdir) == NULL)
++ if(getcwd(realdir, sizeof(realdir)) == NULL)
+ {
+ (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
+ exit(-1);
+@@ -238,11 +238,11 @@
+ }
+ execpath[len] = '\0';
+ if(execpath[0] == '/')
+- (void)strcpy(realdir, execpath);
++ (void)strlcpy(realdir, execpath, sizeof(realdir));
+ else
+ {
+- (void)strcat(realdir, "/");
+- (void)strcat(realdir, execpath);
++ (void)strlcat(realdir, "/", sizeof(realdir));
++ (void)strlcat(realdir, execpath, sizeof(realdir));
+ }
+ continue;
+ }
+@@ -291,8 +291,8 @@
+ #else
+ if(setreuid(getuid(), getuid()) < 0) { perror("setreuid"); exit(-1); }
+ #endif
+- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
+- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
++ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
++ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
+ just_untcx(tcxtarg, untcxtmp);
+ exit(0);
+ }
+@@ -302,8 +302,8 @@
+
+ if(local)
+ {
+- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
+- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
++ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
++ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
+ untcx_and_exec_local(tcxtarg, untcxtmp, &(argv[1]));
+ }
+ #endif
+@@ -315,7 +315,7 @@
+ for(c = realdir; *c ; c++)
+ if(*c == '/')
+ *c = '=';
+- (void)sprintf(tcxtarg, "%s/%s", ENFSDIR, realdir);
++ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", ENFSDIR, realdir);
+ if(mkdir(tcxtarg, 0777) < 0)
+ if(errno != EEXIST)
+ {
+@@ -323,9 +323,9 @@
+ exit(-1);
+ }
+ (void)chmod(tcxtarg, 0777);
+- (void)strcat(tcxtarg,"/");
+- (void)strcat(tcxtarg, execname);
+- (void)sprintf(untcxtmp, "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
++ (void)strlcat(tcxtarg,"/", sizeof(tcxtarg));
++ (void)strlcat(tcxtarg, execname, sizeof(tcxtarg));
++ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
+
+ untcx_and_exec_nfs(argv[0], untcxtmp, tcxtarg, &(argv[1]));
+
+@@ -415,7 +415,7 @@
+
+ /* Write our process id to the lock file. Don't really care if fails. */
+
+- (void)sprintf(spid, "%d\n", getpid());
++ (void)snprintf(spid, sizeof(spid), "%d\n", getpid());
+ (void)write(lkfd, spid, strlen(spid));
+
+ #ifdef UNPACK_IN_PLACE
+@@ -810,30 +810,30 @@
+
+ /* resolve first stage of argv[0] */
+
+- if(getwd(cwd) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
++ if(getcwd(cwd, sizeof(cwd)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
+
+- if(*argv[0] == '/') (void)strcpy(realdir, argv[0]); else (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
++ if(*argv[0] == '/') (void)strlcpy(realdir, argv[0], sizeof(realdir)); else (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
+
+ if((c = strrchr(realdir, '/')) == NULL) { (void)fprintf(stderr, "Help! Internal corruption of variables!\n"); exit(-1); }
+
+- c++; (void)strcpy(execname, c); *c = '\0';
++ c++; (void)strlcpy(execname, c, sizeof(execname)); *c = '\0';
+
+ if(chdir(realdir) < 0) { perror(realdir); exit(-1); }
+
+- if(getwd(realdir) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
++ if(getcwd(realdir, sizeof(realdir)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
+
+ for(c = realdir; *c; c++)
+ if(*c == '/')
+ *c = '=';
+- (void)sprintf(linkpath, "%s/%s", ENFSDIR, realdir);
++ (void)snprintf(linkpath, sizeof(linkpath), "%s/%s", ENFSDIR, realdir);
+ if(mkdir(linkpath, 0777) < 0)
+ {
+ if(errno != EEXIST) { perror(linkpath); exit(-1); }
+ }
+ else
+ (void)chmod(linkpath, 0777);
+- (void)strcat(linkpath,"/");
+- (void)strcat(linkpath, execname);
++ (void)strlcat(linkpath,"/", sizeof(linkpath));
++ (void)strlcat(linkpath, execname, sizeof(linkpath));
+
+ if(chdir(cwd) < 0) { perror(cwd); exit(-1); }
+
+@@ -1244,7 +1244,7 @@
+ if((curr = (path *)malloc(sizeof(path))) == NULL)
+ continue;
+
+- (void)strcpy(curr->path, newpath);
++ (void)strlcpy(curr->path, newpath, sizeof(curr->path));
+ #ifdef UNPACK_IN_PLACE
+ curr->pid = -1;
+ (strstr(newpath, ENFSDIR) == newpath) ? (curr->local = 0) : (curr->local = 1);
diff --git a/sysutils/tcx/patches/patch-ad b/sysutils/tcx/patches/patch-ad
new file mode 100644
index 00000000000..489002cfcd5
--- /dev/null
+++ b/sysutils/tcx/patches/patch-ad
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
+
+Minor security audit
+
+--- tcx.c 2003/06/20 10:44:29 1.1
++++ tcx.c 2003/06/20 10:45:54
+@@ -120,16 +120,16 @@
+ /* If cannot, warn user and quit */
+
+ if(strrchr(argv[1], '/') == NULL)
+- (void)sprintf(tofile, ".tcx.%s", argv[1]);
++ (void)snprintf(tofile, sizeof(tofile), ".tcx.%s", argv[1]);
+ else
+ {
+- (void)strcpy(tofile, argv[1]);
++ (void)strlcpy(tofile, argv[1], sizeof(tofile));
+ s = strrchr(tofile, '/');
+ *s = '\0';
+- (void)strcat(tofile, "/.tcx.");
++ (void)strlcat(tofile, "/.tcx.", sizeof(tofile));
+ s = strrchr(argv[1], '/');
+ s++;
+- (void)strcat(tofile, s);
++ (void)strlcat(tofile, s, sizeof(tofile));
+ }
+
+ lck.l_type = F_WRLCK; lck.l_whence = 0; lck.l_start = 0; lck.l_len = 0;
+@@ -213,7 +213,7 @@
+
+ /* Spit out header and start encoding executable */
+
+- (void)sprintf(header, "#!%s\n", PATHUNTCX);
++ (void)snprintf(header, sizeof(header), "#!%s\n", PATHUNTCX);
+ if(write(outfd, header, strlen(header)) < 0) { (void)perror("write"); exit(-1); }
+
+ c = 0; if((write(outfd, &c, 1)) < 0) { (void)perror("write"); exit(-1); }
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 03:09:07 +0000