summaryrefslogtreecommitdiff
path: root/graphics/dc20ctrl/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/dc20ctrl/files')
-rw-r--r--graphics/dc20ctrl/files/patch-aa63
-rw-r--r--graphics/dc20ctrl/files/patch-ab11
-rw-r--r--graphics/dc20ctrl/files/patch-ac11
-rw-r--r--graphics/dc20ctrl/files/patch-ae23
-rw-r--r--graphics/dc20ctrl/files/patch-af14
-rw-r--r--graphics/dc20ctrl/files/patch-ag13
-rw-r--r--graphics/dc20ctrl/files/patch-ah84
-rw-r--r--graphics/dc20ctrl/files/patch-pixmaps.c50
8 files changed, 0 insertions, 269 deletions
diff --git a/graphics/dc20ctrl/files/patch-aa b/graphics/dc20ctrl/files/patch-aa
deleted file mode 100644
index 040719482e72..000000000000
--- a/graphics/dc20ctrl/files/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.orig Wed Feb 18 19:30:56 1998
-+++ Makefile Wed Jun 14 19:38:36 2000
-@@ -50,7 +50,7 @@
- #
- # How to install the package.
- #
--INSTALL=/usr/bin/install
-+INSTALL?=/usr/bin/install
- #
- # Under FreeBSD we need to make it SGID to dialer, that is the serial port
- # owner.
-@@ -60,7 +60,7 @@
- #
- # Where to install it.
- #
--ROOTDIR=/usr/local
-+ROOTDIR=${PREFIX}
- BINDIR=${ROOTDIR}/bin
- MANDIR=${ROOTDIR}/man
-
-@@ -79,7 +79,7 @@
- #
- # Used only if you make the project with USE_TIFF defined.
- #
--TIFFLIB=-ltiff34
-+TIFFLIB=-ltiff
-
- #
- # Used only if you make the project with USE_PNG defined.
-@@ -91,8 +91,8 @@
- # make the project with at least one between USE_JPEG, USE_TIFF and USE_PNG
- # defined.
- #
--EXTRA_LIBS_PATH=-L/usr/local/lib
--EXTRA_INCLUDES_PATH=-I/usr/local/include
-+EXTRA_LIBS_PATH=-L${LOCALBASE}/lib
-+EXTRA_INCLUDES_PATH=-I${LOCALBASE}/include
-
- #
- # Do not change anything below this line
-@@ -151,11 +151,10 @@
- install: install.bin install.man
-
- install.bin: $(PROJECT)
-- ${INSTALL} -c -g ${INSTALL_GROUP} -m ${INSTALL_MODE} ${PROJECT} ${BINDIR}
-+ ${INSTALL} -c -o ${BINOWN} -g ${INSTALL_GROUP} -m ${INSTALL_MODE} ${PROJECT} ${BINDIR}
-
- install.man:
-- ${INSTALL} -c ${PROJECT}.man ${MANDIR}/man1/${PROJECT}.1
-- gzip --best ${MANDIR}/man1/${PROJECT}.1
-+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ${PROJECT}.man ${MANDIR}/man1/${PROJECT}.1
-
- man: ${PROJECT}.1
-
-@@ -163,7 +162,7 @@
- nroff -man ${PROJECT}.man >${PROJECT}.1
-
- $(PROJECT): $(OBJ)
-- cc -o $@ $(OBJ) $(LFLAGS) $(LIBS)
-+ ${CC} -o $@ $(OBJ) $(LFLAGS) $(LIBS)
-
- clean:
- rm -f $(OBJ) $(PROJECT) core $(PROJECT).core *.bak a.out .depend $(PROJECT)-${VERSION}.${REVISION}.tar.gz
diff --git a/graphics/dc20ctrl/files/patch-ab b/graphics/dc20ctrl/files/patch-ab
deleted file mode 100644
index a40c86f4e6b3..000000000000
--- a/graphics/dc20ctrl/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- dc20.h.orig Mon Dec 21 21:09:11 1998
-+++ dc20.h Mon Dec 21 21:09:47 1998
-@@ -45,7 +45,7 @@
- #include <string.h>
-
- #ifdef USE_TIFF
--#include <tiff34/tiffio.h>
-+#include <tiffio.h>
- #endif /* USE_TIFF */
-
- #ifndef TRUE
diff --git a/graphics/dc20ctrl/files/patch-ac b/graphics/dc20ctrl/files/patch-ac
deleted file mode 100644
index d35e49f9e6d1..000000000000
--- a/graphics/dc20ctrl/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru work/dc20ctrl-0.4/main.h dc20ctrl-0.4/main.h
---- work/dc20ctrl-0.4/main.h Tue Feb 17 09:19:46 1998
-+++ main.h Mon Feb 5 18:56:48 2001
-@@ -49,6 +49,6 @@
- tiff_predictor;
- #endif /* USE_TIFF */
-
--void main(int, char **);
-+int main(int, char **);
-
- #endif /* _MAIN_H_ */
diff --git a/graphics/dc20ctrl/files/patch-ae b/graphics/dc20ctrl/files/patch-ae
deleted file mode 100644
index 476e9d7510b5..000000000000
--- a/graphics/dc20ctrl/files/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru work/dc20ctrl-0.4/session.c dc20ctrl-0.4/session.c
---- work/dc20ctrl-0.4/session.c Tue Feb 17 09:19:47 1998
-+++ session.c Mon Feb 5 18:53:30 2001
-@@ -58,7 +58,8 @@
- if (!quiet) fprintf(stderr, "%s: get_session: error: cannot get home directory\n", __progname);
- return -1;
- }
-- sprintf(rc_name, "%s/" RC_NAME, home_dir);
-+ if (snprintf(rc_name, sizeof(rc_name), "%s/" RC_NAME, home_dir) >= sizeof(rc_name))
-+ return -1;
- if ((rcd = open(rc_name, O_RDWR | O_CREAT, 0644)) < 0) {
- if (!quiet) fprintf(stderr, "%s: get_session: warning: cannot open rc file\n", __progname);
- }
-@@ -84,7 +85,8 @@
- if (!quiet) fprintf(stderr, "%s: put_session: error: cannot get home directory\n", __progname);
- return -1;
- }
-- sprintf(rc_name, "%s/" RC_NAME, home_dir);
-+ if (snprintf(rc_name, sizeof(rc_name), "%s/" RC_NAME, home_dir) >= sizeof(rc_name))
-+ return -1;
- if ((rcd = open(rc_name, O_RDWR | O_CREAT, 0644)) < 0) {
- if (!quiet) fprintf(stderr, "%s: put_session: warning: cannot open rc file\n", __progname);
- }
diff --git a/graphics/dc20ctrl/files/patch-af b/graphics/dc20ctrl/files/patch-af
deleted file mode 100644
index e4f2ff760651..000000000000
--- a/graphics/dc20ctrl/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru work/dc20ctrl-0.4/thumbs_to_file.c dc20ctrl-0.4/thumbs_to_file.c
---- work/dc20ctrl-0.4/thumbs_to_file.c Tue Feb 17 09:19:47 1998
-+++ thumbs_to_file.c Mon Feb 5 18:51:27 2001
-@@ -67,8 +67,8 @@
- }
- }
-
-- sprintf(file, base_name, i+1);
--
-+ if (snprintf(file, sizeof(file), base_name, i+1) >= sizeof(file))
-+ return -1;
- save_pixmap(pp, file, (orientation_mask >> (i*2)) & ROT_MASK, format);
- }
- }
diff --git a/graphics/dc20ctrl/files/patch-ag b/graphics/dc20ctrl/files/patch-ag
deleted file mode 100644
index afa1b69661ec..000000000000
--- a/graphics/dc20ctrl/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru work/dc20ctrl-0.4/convert_pic.c dc20ctrl-0.4/convert_pic.c
---- work/dc20ctrl-0.4/convert_pic.c Tue Feb 17 09:19:46 1998
-+++ convert_pic.c Mon Feb 5 18:43:44 2001
-@@ -166,7 +166,8 @@
- * Remove the extension (.cmt) from the file name
- */
-
-- strcpy(file, base_name);
-+ if (strlcpy(file, base_name, sizeof(file)) >= sizeof(file))
-+ return -1;
- if ((extp = strrchr(file, '.')) != NULL)
- *extp = '\0';
-
diff --git a/graphics/dc20ctrl/files/patch-ah b/graphics/dc20ctrl/files/patch-ah
deleted file mode 100644
index adf382e60a13..000000000000
--- a/graphics/dc20ctrl/files/patch-ah
+++ /dev/null
@@ -1,84 +0,0 @@
---- main.c.orig Wed Feb 18 02:34:18 1998
-+++ main.c Mon Feb 5 19:32:38 2001
-@@ -169,7 +169,7 @@
- *pivot3;
- int result = 0,
- i,
-- first,
-+ first = 0,
- last,
- orientation = ROT_STRAIGHT,
- this_orientation;
-@@ -195,11 +195,14 @@
- }
- this_orientation = orientation; /* sets default orientation */
- strsep(&pivot2, "-");
-- first = strtol(string, &pivot3, 10);
-- if (first < 1 || first > 16) {
-- if (!quiet) fprintf(stderr, "%s: parse_pics: error: out of range %d\n", __progname, first);
-- return -1;
-+ if (string != NULL) {
-+ first = strtol(string, &pivot3, 10);
-+ if (first < 1 || first > 16) {
-+ if (!quiet) fprintf(stderr, "%s: parse_pics: error: out of range %d\n", __progname, first);
-+ return -1;
-+ }
- }
-+
- if (pivot2) {
- if (*pivot3) {
- if (!quiet) fprintf(stderr, "%s: parse_pics: error: extraneous characters '%s' in %d%s-%s\n", __progname, pivot3, first, pivot3, pivot2);
-@@ -216,8 +219,8 @@
- } else {
- last = first;
- }
--
-- if (*pivot3) {
-+
-+ if (pivot3 && *pivot3) {
- /*
- * "numberorientation"
- */
-@@ -245,7 +248,7 @@
- * Main program: parse switches and take actions
- */
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- int curopt,
- actions = 0,
-@@ -503,17 +506,29 @@
- clock = time(NULL);
-
- if (pics_pre) {
-- sprintf(pics_name, "%s_%%d.%%s", pics_pre);
-+ if (snprintf(pics_name, sizeof(pics_name), "%s_%%d.%%s", pics_pre) >= sizeof(pics_name)) {
-+ fprintf(stderr, "%s: error: filename too long\n", __progname);
-+ exit(1);
-+ }
- } else {
- strftime(name_template, NAME_LEN, "%%s_%Y_%m_%d_%%d_%%%%d.%%%%s", localtime(&clock));
-- sprintf(pics_name, name_template, "pic", session);
-+ if (snprintf(pics_name, sizeof(pics_name), name_template, "pic", session) >= sizeof(pics_name)) {
-+ fprintf(stderr, "%s: error: filename too long\n", __progname);
-+ exit(1);
-+ }
- }
-
- if (thumbs_pre) {
-- sprintf(thumbs_name, "%s_%%d", thumbs_pre);
-+ if (snprintf(thumbs_name, sizeof(thumbs_name), "%s_%%d", thumbs_pre) >= sizeof(thumbs_name)) {
-+ fprintf(stderr, "%s: error: filename too long\n", __progname);
-+ exit(1);
-+ }
- } else {
- strftime(name_template, NAME_LEN, "%%s_%Y_%m_%d_%%d_%%%%d", localtime(&clock));
-- sprintf(thumbs_name, name_template, "thumb", session);
-+ if (snprintf(thumbs_name, sizeof(thumbs_name), name_template, "thumb", session) >= sizeof(thumbs_name)) {
-+ fprintf(stderr, "%s: error: filename too long\n", __progname);
-+ exit(1);
-+ }
- }
-
- if (actions == 0) {
diff --git a/graphics/dc20ctrl/files/patch-pixmaps.c b/graphics/dc20ctrl/files/patch-pixmaps.c
deleted file mode 100644
index 8b910130f60c..000000000000
--- a/graphics/dc20ctrl/files/patch-pixmaps.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- pixmaps.c.orig 1998-02-17 18:19:47.000000000 +0100
-+++ pixmaps.c 2012-04-30 21:36:08.000000000 +0200
-@@ -446,7 +446,7 @@
- if (p) {
- if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) != NULL) {
- if ((info_ptr = png_create_info_struct(png_ptr)) != NULL) {
-- if (setjmp(png_ptr->jmpbuf) == 0) {
-+ if (setjmp(png_jmpbuf(png_ptr)) == 0) {
- png_init_io(png_ptr, fp);
- png_set_IHDR(png_ptr, info_ptr, p->width, p->height, 8, (p->components == 1) ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- png_write_info(png_ptr, info_ptr);
-@@ -504,26 +504,32 @@
- * Build the image name
- */
-
-- strcpy(fname, name);
-- strcat(fname, ".");
-+ if (strlcpy(fname, name, sizeof(fname)) >= sizeof(fname))
-+ return -1;
-+ if (strlcat(fname, ".", sizeof(fname)) >= sizeof(fname))
-+ return -1;
- switch (format & SAVE_FORMATS) {
- #ifdef USE_JPEG
- case SAVE_JPEG:
-- strcat(fname, JPEG_EXT);
-+ if (strlcat(fname, JPEG_EXT, sizeof(fname)) >= sizeof(fname))
-+ return -1;
- break;
- #endif /* USE_JPEG */
- #ifdef USE_TIFF
- case SAVE_TIFF:
-- strcat(fname, TIFF_EXT);
-+ if (strlcat(fname, TIFF_EXT, sizeof(fname)) >= sizeof(fname))
-+ return -1;
- break;
- #endif /* USE_TIFF */
- #ifdef USE_PNG
- case SAVE_PNG:
-- strcat(fname, PNG_EXT);
-+ if (strlcat(fname, PNG_EXT, sizeof(fname)) >= sizeof(fname))
-+ return -1;
- break;
- #endif /* USE_PNG */
- default:
-- strcat(fname, (to_be_saved->components == 3) ? PPM_EXT : PGM_EXT );
-+ if (strlcat(fname, (to_be_saved->components == 3) ? PPM_EXT : PGM_EXT, sizeof(fname)) >= sizeof(fname))
-+ return -1;
- break;
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 23:26:05 +0000