Description: Patch xdeview to know where Debian MIME info is kept. Author: Josip Rodin Bug-Debian: https://bugs.debian.org/47561 0.5.13-4 --- a/tcl/xdeview +++ b/tcl/xdeview @@ -59,8 +59,8 @@ ifndef NNTPServer "" # MIME configuration # -ifndef MIMEGlobalTypes "" -ifndef MIMEGlobalCap "" +ifndef MIMEGlobalTypes "/etc/mime.types" +ifndef MIMEGlobalCap "/etc/mailcap" if { ! [ catch { set env(HOME) } ] } { ifndef MIMELocalTypes $env(HOME)/.mime.types ifndef MIMELocalCap $env(HOME)/.mailcap Description: Use rename() in preference to copy if possible. See 0.5.19+beta20030413-1. Author: Peter Muir , Chris Hanson Bug-Debian: https://bugs.debian.org/166040 --- a/uulib/uulib.c +++ b/uulib/uulib.c @@ -872,7 +872,10 @@ UUDecodeToTemp (uulist *thefile) } /* - * decode file first to temp file, then copy it to a final location + * Decode file first to temp file, then copy it to a final location. + * A move is preferable to a copy. If the file is on the same + * partition, no copy is performed. This is important for large + * files. */ int UUEXPORT @@ -978,6 +981,12 @@ UUDecodeFile (uulist *thefile, char *des return UURET_IOERR; } + if (rename(thefile->binfile, uugen_fnbuffer) == 0) { + fclose(source); + close(fildes); + goto finish_ok; + } + if ((target = fdopen (fildes, "wb")) == NULL) { progress.action = 0; UUMessage (uulib_id, __LINE__, UUMSG_ERROR, @@ -1042,6 +1051,8 @@ UUDecodeFile (uulist *thefile, char *des thefile->binfile, strerror (uu_errno = errno)); } + + finish_ok: _FP_free (thefile->binfile); thefile->binfile = NULL; thefile->state &= ~UUFILE_TMPFILE; Description: Add description of -v option to uudeview(1). 0.5.19+beta20030413-2 Author: Peter Muir Bug-Debian: http://bugs.debian.org/166079 --- a/man/uudeview.1 +++ b/man/uudeview.1 @@ -164,6 +164,16 @@ delivered in have different subject line verbosity. Normally, the program prints some status messages while reading the input files, which can be very helpful if something should go wrong. Use if these messages disturb you. +Disables progress bars. See +.B -n +option. +.TP +.B -v +(disables Verbosity) Disables verbose messages, i.e. notes are not +displayed, but does not remove warnings and errors. Is not as quiet as +the +.B -q +(Quiet) option. .TP .B -n No progress bars. Normally, UUDeview prints ASCII bars crawling up Description: Use hevea instead of latex2html, now that latter has moved to non-free. 0.5.19+beta20030413-2 Author: Chris Hanson Bug-Debian: https://bugs.debian.org/221348 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ DVI = library.dvi PS = ${DVI:.dvi=.ps} - +HTML = ${DVI:.dvi=.html} LATEX = latex DVIPS = dvips @@ -18,13 +18,17 @@ FIG2DEV = fig2dev all: $(DVI) dvi: $(DVI) ps: $(PS) +html: $(HTML) library.ps: library.dvi library.dvi: library.ltx structure.tex binhex.tex +library.html: library.ltx library.dvi + hevea -fix -o $@ $< + clean: - rm -f *.aux *.log *.toc *~ + rm -f *.aux *.haux *.log *.toc *.htoc *~ *.html rm -f *.o td-v1 td-v2 td-v3 distclean: clean Description: Fix problem with long headers causing duplicate output in text files. See 0.5.20-1. Author: Matthew Mueller Origin: http://nget.sf.net/patches/uulib-0.5.19-uuinfofile-long-headers.patch --- a/uulib/uulib.c +++ b/uulib/uulib.c @@ -1114,9 +1114,9 @@ UUInfoFile (uulist *thefile, void *opaqu while (!feof (inpfile) && (uu_fast_scanning || ftell(inpfile) < maxpos)) { - if (_FP_fgets (uugen_inbuffer, 511, inpfile) == NULL) + if (_FP_fgets (uugen_inbuffer, 1023, inpfile) == NULL) break; - uugen_inbuffer[511] = '\0'; + uugen_inbuffer[1023] = '\0'; if (ferror (inpfile)) break; Description: Fix build problem caused by removal of psfig.sty. 0.5.20-2 Author: Chris Hanson Bug-Debian: http://bugs.debian.org/266068 --- a/doc/library.ltx +++ b/doc/library.ltx @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{psfig} +\usepackage{epsfig} \usepackage{times} \usepackage{a4wide} \author{Frank Pilhofer} Description: CAN-2004-2265 Fix possible (but highly unlikely) race in temporary file generation (CAN-2004-2265), by passing the "x" (O_EXCL) flag to fopen when opening such files. (Closes: #320541) 0.5.20-2.1 Author: Steinar H. Gunderson Bug-Debian: http://bugs.debian.org/320541 --- a/unix/uudeview.c +++ b/unix/uudeview.c @@ -454,7 +454,7 @@ proc_stdin (void) return 0; } - if ((target = fopen (stdfile, "wb")) == NULL) { + if ((target = fopen (stdfile, "wbx")) == NULL) { fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n", stdfile, strerror (errno)); _FP_free (stdfile); --- a/uulib/uunconc.c +++ b/uulib/uunconc.c @@ -1325,9 +1325,9 @@ UUDecode (uulist *data) return UURET_NODATA; if (data->uudet == PT_ENCODED) - mode = "wt"; /* open text files in text mode */ + mode = "wtx"; /* open text files in text mode */ else - mode = "wb"; /* otherwise in binary */ + mode = "wbx"; /* otherwise in binary */ if ((data->binfile = tempnam (NULL, "uu")) == NULL) { UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, @@ -1502,7 +1502,7 @@ UUDecode (uulist *data) progress.action = 0; return UURET_NOMEM; } - if ((datain = fopen (data->binfile, "rb")) == NULL) { + if ((datain = fopen (data->binfile, "rbx")) == NULL) { UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, uustring (S_NOT_OPEN_FILE), data->binfile, strerror (uu_errno = errno)); Description: suspicious-file patch from 0.5.20-3 Add file open information so that if S_DATA_SUSPICIOUS message.occurs, the name of the bad file is printed. There is probablly a better method but I did not see how to obtain the filename from within the function. Author: Peter Muir Bug-Debian: http://bugs.debian.org/166077 --- a/uulib/uunconc.c +++ b/uulib/uunconc.c @@ -1437,6 +1437,9 @@ UUDecode (uulist *data) res = UURET_IOERR; break; } + UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE, + uustring (S_OPEN_FILE), + iter->data->sfname); _FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024); } --- a/uulib/uustring.c +++ b/uulib/uustring.c @@ -107,6 +107,7 @@ static stringmap messages[] = { { S_MIME_B_NOT_FOUND, "Boundary expected on Multipart message but found EOF" }, { S_MIME_MULTI_DEPTH, "Multipart message nested too deep" }, { S_MIME_PART_MULTI, "Handling partial multipart message as plain text" }, + { S_OPEN_FILE, "Opened file %s" }, { 0, "" } }; --- a/uulib/uustring.h +++ b/uulib/uustring.h @@ -36,3 +36,4 @@ #define S_MIME_B_NOT_FOUND 35 #define S_MIME_MULTI_DEPTH 36 #define S_MIME_PART_MULTI 37 +#define S_OPEN_FILE 38 Description: Don't force overwrite mode if auto-rename enabled. 0.5.20-3 Author: Chris Hanson Bug-Debian: https://bugs.debian.org/378076 --- a/unix/uudeview.c +++ b/unix/uudeview.c @@ -657,9 +657,6 @@ work_comline (int argc, char *argv[]) else switch (*(argv[number] + 1)) { case '\0': interact = 0; - if (overwrite == 0) { - overwrite = 1; - } proc_stdin (); break; case 'a': @@ -699,10 +696,7 @@ work_comline (int argc, char *argv[]) fprintf (stderr, "WARNING: cannot interact when reading from stdin\n"); } else { - interact = (*argv[number] == '+') ? 1 : 0; - if (overwrite == 0 && *argv[number] == '-') { - overwrite = 1; - } + interact = (*argv[number] == '+') ? 1 : 0; } break; case 'm': @@ -773,6 +767,8 @@ work_comline (int argc, char *argv[]) break; } } + if (overwrite == 0 && interact == 0 && autoren == 0) + overwrite = 1; return 1; } Description: Don't ignore special chars when parsing MIME. 0.5.20-3 Author: Chris Hanson Bug-Debian: https://bugs.debian.org/341440 --- a/uulib/uuscan.c +++ b/uulib/uuscan.c @@ -387,10 +387,10 @@ ParseValue (char *attribute) *attribute != '(' && *attribute != ')' && *attribute != '<' && *attribute != '>' && *attribute != '@' && *attribute != ',' && - /* *attribute != ';' && */ *attribute != ':' && - *attribute != '\\' &&*attribute != '"' && - *attribute != '/' && /* *attribute != '[' && - *attribute != ']' && */ *attribute != '?' && + *attribute != ';' && *attribute != ':' && + *attribute != '\\' && *attribute != '"' && + *attribute != '/' && *attribute != '[' && + *attribute != ']' && *attribute != '?' && *attribute != '=' && length < 255) { *ptr++ = *attribute++; length++; Description: Fixed a classical tempfile symlink attack vulnerability in libuu. See Version: 0.5.20-3.1. Author: Nico Golde Bug-Debian: http://bugs.debian.org/480972 --- a/uulib/uunconc.c +++ b/uulib/uunconc.c @@ -1311,6 +1311,11 @@ UUDecode (uulist *data) char *mode, *ntmp; uufile *iter; size_t bytes; +#ifdef HAVE_MKSTEMP + int tmpfd; + const char *tmpprefix = "uuXXXXXX"; + char *tmpdir = NULL; +#endif /* HAVE_MKSTEMP */ if (data == NULL || data->thisfile == NULL) return UURET_ILLVAL; @@ -1329,13 +1334,35 @@ UUDecode (uulist *data) else mode = "wbx"; /* otherwise in binary */ +#ifdef HAVE_MKSTEMP + if ((getuid()==geteuid()) && (getgid()==getegid())) { + tmpdir=getenv("TMPDIR"); + } + + if (!tmpdir) { + tmpdir = "/tmp"; + } + data->binfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2); + + if (!data->binfile) { +#else if ((data->binfile = tempnam (NULL, "uu")) == NULL) { +#endif /* HAVE_MKSTEMP */ UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, uustring (S_NO_TEMP_NAME)); return UURET_NOMEM; } +#ifdef HAVE_MKSTEMP + strcpy(data->binfile, tmpdir); + strcat(data->binfile, "/"); + strcat(data->binfile, tmpprefix); + + if ((tmpfd = mkstemp(data->binfile)) == -1 || + (dataout = fdopen(tmpfd, mode)) == NULL) { +#else if ((dataout = fopen (data->binfile, mode)) == NULL) { +#endif /* HAVE_MKSTEMP */ /* * we couldn't create a temporary file. Usually this means that TMP * and TEMP aren't set @@ -1343,6 +1370,12 @@ UUDecode (uulist *data) UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, uustring (S_WR_ERR_TARGET), data->binfile, strerror (uu_errno = errno)); +#ifdef HAVE_MKSTEMP + if (tmpfd != -1) { + unlink(data->binfile); + close(tmpfd); + } +#endif /* HAVE_MKSTEMP */ _FP_free (data->binfile); data->binfile = NULL; uu_errno = errno; @@ -1499,7 +1532,13 @@ UUDecode (uulist *data) */ if (data->uudet == BH_ENCODED && data->binfile) { +#ifdef HAVE_MKSTEMP + ntmp = malloc(strlen(tmpdir)+strlen(tmpprefix)+2); + + if (ntmp == NULL) { +#else if ((ntmp = tempnam (NULL, "uu")) == NULL) { +#endif /* HAVE_MKSTEMP */ UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, uustring (S_NO_TEMP_NAME)); progress.action = 0; @@ -1513,15 +1552,31 @@ UUDecode (uulist *data) free (ntmp); return UURET_IOERR; } + +#ifdef HAVE_MKSTEMP + strcpy(ntmp, tmpdir); + strcat(ntmp, "/"); + strcat(ntmp, tmpprefix); + if ((tmpfd = mkstemp(ntmp)) == -1 || + (dataout = fdopen(tmpfd, "wb")) == NULL) { +#else if ((dataout = fopen (ntmp, "wb")) == NULL) { +#endif /* HAVE_MKSTEMP */ UUMessage (uunconc_id, __LINE__, UUMSG_ERROR, uustring (S_NOT_OPEN_TARGET), ntmp, strerror (uu_errno = errno)); progress.action = 0; fclose (datain); +#ifdef HAVE_MKSTEMP + if (tmpfd != -1) { + unlink(ntmp); + close(tmpfd); + } +#endif /* HAVE_MKSTEMP */ free (ntmp); return UURET_IOERR; } + /* * read fork lengths. remember they're in Motorola format */ --- a/uulib/configure.in +++ b/uulib/configure.in @@ -41,6 +41,7 @@ AC_CHECK_HEADERS(io.h sys/time.h) AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNC(tempnam,,AC_DEFINE(tempnam,_FP_tempnam)) +AC_CHECK_FUNCS([mkstemp]) # # strerror might be internally defined. this would cause a --- a/unix/uudeview.c +++ b/unix/uudeview.c @@ -443,18 +443,45 @@ proc_stdin (void) FILE *target; size_t bytes; int res; +#ifdef HAVE_MKSTEMP + int tmpfd; + const char *tmpprefix = "uuXXXXXX"; + char *tmpdir = NULL; +#endif /* HAVE_MKSTEMP */ if (stdinput) { fprintf (stderr, "proc_stdin: cannot process stdin twice\n"); return 0; } +#ifdef HAVE_MKSTEMP + if ((getuid()==geteuid()) && (getgid()==getegid())) { + tmpdir=getenv("TMPDIR"); + } + + if (!tmpdir) { + tmpdir = "/tmp"; + } + stdfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2); + + if (!stdfile) { +#else if ((stdfile = tempnam (NULL, "uu")) == NULL) { +#endif fprintf (stderr, "proc_stdin: cannot get temporary file\n"); return 0; } +#ifdef HAVE_MKSTEMP + strcpy(stdfile, tmpdir); + strcat(stdfile, "/"); + strcat(stdfile, tmpprefix); + + if ((tmpfd = mkstemp(stdfile)) == -1 || + (target = fdopen(tmpfd, "wbx")) == NULL) { +#else if ((target = fopen (stdfile, "wbx")) == NULL) { +#endif fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n", stdfile, strerror (errno)); _FP_free (stdfile); --- a/configure.in +++ b/configure.in @@ -510,6 +510,7 @@ AC_CHECK_HEADERS(io.h sys/time.h) AC_CHECK_FUNCS(getcwd popen gettimeofday isatty) AC_CHECK_FUNC(tempnam,,AC_DEFINE(tempnam,_FP_tempnam)) +AC_CHECK_FUNCS([mkstemp]) # # strerror might be internally defined. this would cause a Description: Build shlib, use AC_PROG_INSTALL Author: Marco d'Itri --- a/Makefile.in +++ b/Makefile.in @@ -37,12 +37,12 @@ bindir = @bindir@ mandir = @mandir@ BINDIR = $(bindir) MANDIR = $(mandir) +DESTDIR = # -# install program. use our own, as AC_PROG_INSTALL doesn't work reliably -# -INSTALL = @srcdir@/install-sh -INSTALL_PROGRAM = ${INSTALL} -c -INSTALL_DATA = ${INSTALL} -c -m 644 +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ # # If you don't have the GNU C compiler installed, set CC=cc here # @@ -183,23 +183,17 @@ doc: install: $(DOINST) -for d in $(MPAGES) ; do \ - $(INSTALL_DATA) $(srcdir)/man/$$d $(MANDIR)/man1/$$d ; \ + $(INSTALL_DATA) $(srcdir)/man/$$d $(DESTDIR)$(MANDIR)/man1/$$d ; \ done install-uudeview: uudeview - for d in uudeview uuenview ; do \ - $(INSTALL_PROGRAM) unix/$$d $(BINDIR)/$$d ; \ - done + (cd unix && $(MAKE) install) install-tcl: xdeview - for d in xdeview uuwish ; do \ - $(INSTALL_PROGRAM) tcl/$$d $(BINDIR)/$$d ; \ - done + (cd tcl && $(MAKE) install) install-minews: minews - for d in minews ; do \ - $(INSTALL_PROGRAM) inews/$$d $(BINDIR)/$$d ; \ - done + (cd inews && $(MAKE) install) links: tcl/config.h unix/config.h uulib/config.h --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ AC_PROG_CC AC_PROG_CPP wi_PROTOTYPES AC_PROG_MAKE_SET -dnl AC_PROG_INSTALL +AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_LN_S --- a/tcl/Makefile.in +++ b/tcl/Makefile.in @@ -23,12 +23,12 @@ VPATH = @srcdir@ # BINDIR = @bindir@ MANDIR = @mandir@ +DESTDIR = # -# install program. use our own, as AC_PROG_INSTALL doesn't work reliably -# -INSTALL = @srcdir@/install-sh -INSTALL_PROGRAM = ${INSTALL} -c -INSTALL_DATA = ${INSTALL} -c -m 644 +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ # # If you don't have the GNU C compiler installed, set CC=cc here # @@ -36,7 +36,7 @@ CC = @CC@ # # C Compiler Options # -CFLAGS = @CFLAGS@ -I@srcdir@ @CPPFLAGS@ @TCL_CPPFLAGS@ @DEFS@ +CFLAGS = @CFLAGS@ -I@srcdir@ -I../uulib @CPPFLAGS@ @DEFS@ @TCL_CPPFLAGS@ # # Libraries to link and their paths # @@ -61,6 +61,7 @@ SHLIB_VERSION = @SHLIB_VERSION@ @SET_MAKE@ # +PROGS = uuwish xdeview SOURCE = uuwish.c uutcl.c OBJ = ${SOURCE:.c=.o} @@ -85,24 +86,21 @@ realclean: distclean install: all for d in $(PROGS) ; do \ - $(INSTALL_PROGRAM) $(srcdir)/$$d $(BINDIR)/$$d ; \ - done - -for d in $(MPAGES) ; do \ - $(INSTALL_DATA) $(srcdir)/$$d $(MANDIR)/man1/$$d ; \ + $(INSTALL_PROGRAM) $(srcdir)/$$d $(DESTDIR)$(BINDIR)/$$d ; \ done new: clean rm -f uuwish make all -uuwish: $(OBJ) ../uulib/libuu.a +uuwish: $(OBJ) $(CC) -o $@ $(OBJ) -L../uulib -luu $(LIBS) xdeview: chmod 755 $@ .c.o: - $(CC) -c $(CFLAGS) -I../uulib $(VDEF) $< + $(CC) -c $(CFLAGS) $(VDEF) $< uuwish.o: uuwish.c config.h uutcl.o: uutcl.c config.h --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -34,12 +34,12 @@ VPATH = @srcdir@ # BINDIR = @bindir@ MANDIR = @mandir@ +DESTDIR = # -# install program. use our own, as AC_PROG_INSTALL doesn't work reliably -# -INSTALL = @srcdir@/install-sh -INSTALL_PROGRAM = ${INSTALL} -c -INSTALL_DATA = ${INSTALL} -c -m 644 +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ # # If you don't have the GNU C compiler installed, set CC=cc here # @@ -47,11 +47,11 @@ CC = @CC@ # # C Compiler Options # -CFLAGS = @CFLAGS@ -I@srcdir@ @CPPFLAGS@ @DEFS@ +CFLAGS = @CFLAGS@ -I@srcdir@ -I../uulib @CPPFLAGS@ @DEFS@ # # Libraries to link and their paths # -LIBS = @LDFLAGS@ @LIBS@ +LIBS = @LDFLAGS@ # # the ranlib program # @@ -78,6 +78,7 @@ VDEF = -DVERSION=\"$(VERSION)\" -DPATCH= @SET_MAKE@ # +PROGS = uudeview uuenview UUDEVIEW_SOURCE = uudeview.c uufnflt.c UUENVIEW_SOURCE = uuenview.c uufnflt.c UUDEVIEW_OBJ = ${UUDEVIEW_SOURCE:.c=.o} @@ -104,24 +105,21 @@ realclean: distclean install: all for d in $(PROGS) ; do \ - $(INSTALL_PROGRAM) $(srcdir)/$$d $(BINDIR)/$$d ; \ - done - -for d in $(MPAGES) ; do \ - $(INSTALL_DATA) $(srcdir)/$$d $(MANDIR)/man1/$$d ; \ + $(INSTALL_PROGRAM) $(srcdir)/$$d $(DESTDIR)$(BINDIR)/$$d ; \ done new: clean rm -f uudeview uuenview make all -uudeview: $(UUDEVIEW_OBJ) ../uulib/libuu.a +uudeview: $(UUDEVIEW_OBJ) $(CC) -o $@ $(UUDEVIEW_OBJ) -L../uulib -luu $(LIBS) -uuenview: $(UUENVIEW_OBJ) ../uulib/libuu.a +uuenview: $(UUENVIEW_OBJ) $(CC) -o $@ $(UUENVIEW_OBJ) -L../uulib -luu $(LIBS) .c.o: - $(CC) -c $(CFLAGS) -I../uulib $(VDEF) $< + $(CC) -c $(CFLAGS) $(VDEF) $< uudeview.o: uudeview.c config.h uuenview.o: uuenview.c config.h --- a/uulib/Makefile.in +++ b/uulib/Makefile.in @@ -21,9 +21,17 @@ SHELL = /bin/sh # CC = @CC@ # +# Library options +SOMAJOR = 0 +SOMINOR = $(PATCH) +SHLIB = libuu.so.$(SOMAJOR).$(SOMINOR) +SHLIBSOMAJ = libuu.so.$(SOMAJOR) +SHLIBSO = libuu.so +# # C Compiler Options # -CFLAGS = @CFLAGS@ -I. @CPPFLAGS@ @DEFS@ +CFLAGS = @CFLAGS@ -I. @CPPFLAGS@ @DEFS@ -fpic -shared +LDFLAGS = $(subst -pie,, $(subst -fPIE,,@LDFLAGS@)) # # the ranlib program # @@ -51,11 +59,11 @@ UULIB_OBJ = ${UULIB_SOURCE:.c=.o} .SUFFIXES: .SUFFIXES: .c .o -all: libuu.a +all: $(SHLIB) clean: rm -f [Xx]deview gif2gfp - rm -f *.o *.a *.so core *~ TAGS + rm -f *.o *.a *.so $(SHLIBSOMAJ) $(SHLIB) core *~ TAGS distclean: clean rm -f config.status config.cache config.log Makefile config.h @@ -67,6 +75,11 @@ new: clean rm -f libuu.a $(MAKE) all +$(SHLIB): $(UULIB_OBJ) + $(CC) -o $@ -fpic -shared -Wl,-soname,$(SHLIBSOMAJ) $(LDFLAGS) $^ + ln -sf $(SHLIB) $(SHLIBSOMAJ) + ln -sf $(SHLIBSOMAJ) $(SHLIBSO) + libuu.a: $(UULIB_OBJ) rm -f $@ ar r $@ $(UULIB_OBJ) Description: Fix potential security issue (arbitrary string being passed as a format string to fprintf). Author: Andrew Shadura --- a/unix/uuenview.c +++ b/unix/uuenview.c @@ -310,7 +310,7 @@ SendMkCommand (char **rcptlist, char *to } if ((*rcptlist = (char *) malloc (strlen (towhom) + 16)) == NULL) { - fprintf (stderr, "error: Out of memory allocating %d bytes\n", + fprintf (stderr, "error: Out of memory allocating %zd bytes\n", strlen (towhom)+16); _FP_free (command); return NULL; @@ -483,7 +483,7 @@ AttachFiles (char *towhom, char *subject if (_FP_stristr (input, "multipart") != NULL) { /* it is already a multipart posting. grab the boundary */ if ((ptr = _FP_stristr (input, "boundary=")) != NULL) { - fprintf(thepipe, input); + fprintf(thepipe, "%s", input); strcpy (boundary, ParseValue (ptr)); hadmulti = 1; } Description: Multiple typo fixes, found by lintian. Author: Andreas Metzler Origin: vendor Forwarded: no Last-Update: 2018-11-17 --- a/acconfig.h +++ b/acconfig.h @@ -78,7 +78,7 @@ /* * your mailing program. full path and the necessary parameters. - * the recepient address is added to the command line (with a leading + * the recipient address is added to the command line (with a leading * space) without any further options */ #undef PROG_MAILER --- a/doc/library.ltx +++ b/doc/library.ltx @@ -2142,7 +2142,7 @@ text is \emph{required} by certain decod \end{quote} BinHex is another three-in-four encoding, and not surprisingly, another different character table is used (table \ref{tab-bh}). -The documentation does not explicitely mention what is supposed to +The documentation does not explicitly mention what is supposed to happen if the original input data does not have a multiple of three octets. But from reading between the lines, it looks like ``unnecessary'' characters (those that would result in equal --- a/inews/nntp.h +++ b/inews/nntp.h @@ -11,7 +11,7 @@ * 4xx Command was correct, but couldn't be performed * for some specified reason. * 5xx Command unimplemented, incorrect, or a - * program error has occured. + * program error has occurred. * * Second digit: * --- a/man/uudeview.1 +++ b/man/uudeview.1 @@ -31,7 +31,7 @@ decoded properly. You can then pick file .TP .B -i Disables interactivity. After scanning the files and sorting -everything out, the program will not promt you for whether a file +everything out, the program will not prompt you for whether a file shall be decoded or not, but batch-decodes all available files. This is the default when reading from standard input. .TP @@ -341,7 +341,7 @@ No encoded data found. File looks Ok .TP .B 32 -An error occured during decoding of the file. +An error occurred during decoding of the file. .TP .B 64 File was successfully decoded. --- a/man/xdeview.1 +++ b/man/xdeview.1 @@ -199,7 +199,7 @@ number from the subject line. The algori in braces () higher priority than numbers in brackets []. If both kinds of brackets are present, and their use is conflicting (for example if both the part number and a series number are given), -then you may have to explicitely select the bracket policy. If this +then you may have to explicitly select the bracket policy. If this option is false (default), then the "part number" is taken from the braces (), otherwise from the brackets []. .TP @@ -509,7 +509,7 @@ No encoded data found. File looks Ok .TP .B 32 -An error occured during decoding of the file. +An error occurred during decoding of the file. .TP .B 64 File was successfully decoded. --- a/tcl/xdeview +++ b/tcl/xdeview @@ -1174,7 +1174,7 @@ proc Encode {} { $EncodeFileName $EncodeSubject "" $EncodeMaxLines \ $EncodeEncoding $EncodeFrom $EncodeReplyTo } message ] } { tk_dialog ._Dialog { Error while Encoding } "The following\ - error occured while encoding into a file: $message" \ + error occurred while encoding into a file: $message" \ error 0 OK } } @@ -1185,7 +1185,7 @@ proc Encode {} { $EncodeFileName $EncodeSubject "" $EncodeMaxLines \ $EncodeEncoding $EncodeFrom $EncodeReplyTo } message ] } { tk_dialog ._Dialog { Error while Encoding } "The following\ - error occured while sending the file via mail:\ + error occurred while sending the file via mail:\ $message" \ error 0 OK } @@ -1197,7 +1197,7 @@ proc Encode {} { $EncodeFileName $EncodeSubject "" $EncodeMaxLines \ $EncodeEncoding $EncodeFrom $EncodeReplyTo } message ] } { tk_dialog ._Dialog { Error while Encoding } "The following\ - error occured while sending the file via news:\ + error occurred while sending the file via news:\ $message" \ error 0 OK } @@ -1270,7 +1270,7 @@ proc DecodeProc { DecodeList } { if { $result } { tk_dialog ._Dialog "Error while Decoding" "The following\ - problem occured while decoding: $errorMsg" \ + problem occurred while decoding: $errorMsg" \ error 0 OK continue } @@ -1362,7 +1362,7 @@ proc InfoFile { TheInfoFile } { .info.top.text configure -state normal if { [ catch { uu_InfoFile $FileNumber .info.top.text } errorMsg ] } { - tk_dialog ._Dialog "No Info" "The following problem occured\ + tk_dialog ._Dialog "No Info" "The following problem occurred\ while trying to get Info: $errorMsg" error 0 OK } @@ -1419,7 +1419,7 @@ proc List {} { .list.top.text configure -state normal if { [ catch { uu_ListFile $ListFile .list.top.text } errorMsg ] } { - tk_dialog ._Dialog "Oops" "The following problem occured\ + tk_dialog ._Dialog "Oops" "The following problem occurred\ while trying to list the file: $errorMsg" error 0 OK } @@ -1551,7 +1551,7 @@ proc Execute {} { if { [ catch { uu_GetTempFile $FileNumb } tempFile ] } { tk_dialog ._Dialog "Error while decoding" "The following problem\ - occured while decoding: $tempFile" \ + occurred while decoding: $tempFile" \ error 0 OK } else { # @@ -1632,7 +1632,7 @@ proc Execute {} { if { [ catch { eval exec $RunString } errorMsg ] } { tk_dialog ._Dialog "Execution failed" "The following problem\ - occured while executing your command: $errorMsg" \ + occurred while executing your command: $errorMsg" \ error 0 OK } } --- a/unix/uuenview.c +++ b/unix/uuenview.c @@ -163,7 +163,7 @@ usage (char *argv0) \tinfile the local file, where to read data from. If no infile\n\ \t is given, or infile is a single hyphen, the standard\n\ \t input is used instead.\n\ -\tremotefile the name as which the recepient will receive the file\n\ +\tremotefile the name as which the recipient will receive the file\n\ \n\ For much more powerful encoding facilities, try calling this program\n\ as 'uuenview'.\n\ @@ -1285,7 +1285,7 @@ main (int argc, char *argv[]) } /* - * mail it separately to each recepient + * mail it separately to each recipient */ if (outflags[UUE_MAILTO] > 0) { --- a/uulib/acconfig.h +++ b/uulib/acconfig.h @@ -43,7 +43,7 @@ /* * your mailing program. full path and the necessary parameters. - * the recepient address is added to the command line (with a leading + * the recipient address is added to the command line (with a leading * space) without any further options */ #undef PROG_MAILER --- a/uulib/uuscan.c +++ b/uulib/uuscan.c @@ -2344,7 +2344,7 @@ ScanPart (FILE *datei, char *fname, int } } /* produce result if uu_handletext is set */ - /* or if the file is explicitely named */ + /* or if the file is explicitly named */ if (result->uudet == B64ENCODED || lcount) { if (localenv.fname) { _FP_free (result->filename); --- a/inews/inews.c +++ b/inews/inews.c @@ -81,7 +81,7 @@ char *argv[]; "Can't get the name of the news server from %s.\n", SERVER_FILE); fprintf(stderr, - "Either fix this file, or put NNTPSERVER in your enviroment.\n"); + "Either fix this file, or put NNTPSERVER in your environment.\n"); exit(1); } --- a/man/uuenview.1 +++ b/man/uuenview.1 @@ -93,7 +93,7 @@ comma-separated list. The .BR inews (1) program is invoked for posting. You may have to set the .I NNTPSERVER -enviroment variable to your news server. +environment variable to your news server. .TP .B -a Attaches files. This feature is expected to be used from shell scripts Description: Improve on documentation for uuenview -a. Author: Andreas Metzler Origin: vendor Bug-Debian: https://bugs.debian.org/594355 Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: no Last-Update: 2016-07-30 --- uudeview-0.5.20.orig/man/uuenview.1 +++ uudeview-0.5.20/man/uuenview.1 @@ -108,6 +108,17 @@ or .B -p in order to directly mail or post the result. Else, the message, complete with attachments, is written to standard output. + +Uudeview is using a heuristic to determine where the provided message +headers end and the message body starts. If the first line does +.B not +start +with either +.I "From " +or some non-whitespace characters followed by a colon (e.g. +"X-header-blah:" or "Patch#1:") uuenview interprets the whole input as +message body. Else anything before the first empty line is interpreted as +headers and the rest of the provided input is taken as message body. .PP If no target option is given, the encoded data is printed to standard output. Description: Remove a hack for Sun that causes FTBFS with glibc >= 2.27 Author: Adrian Bunk --- uudeview-0.5.20.orig/tcl/uutcl.c +++ uudeview-0.5.20/tcl/uutcl.c @@ -48,14 +48,6 @@ #include #endif -/* - * The following variable is a special hack that is needed in order for - * Sun shared libraries to be used for Tcl. - */ - -extern int matherr(); -int *tclDummyMathPtr = (int *) matherr; - #include #include #include Description: Include for a declaration of strerror in the strerror probe. Prevents build issues with future compilers. . Patch from Fedora 0.5.20-52, ditching the changes ./configure since we are running autreconf. Author: Florian Weimer Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=2189809 Last-Update: 2023-05-01 diff --git a/configure.in b/configure.in index 78df97b2af450bfc..1f3175b05948db2b 100644 --- a/configure.in +++ b/configure.in @@ -518,6 +518,9 @@ AC_CHECK_FUNC(tempnam,,AC_DEFINE(tempnam,_FP_tempnam)) # AC_MSG_CHECKING([for strerror]) AC_TRY_LINK([ +#ifdef STDC_HEADERS +#include +#endif char *blubb() { return (char *) strerror (42); } ],[ (void) blubb();