patches: remove unused patches

Version: 1.5.3-1 (no-bump)
This commit is contained in:
Pavel Raiskup 2014-07-04 13:29:03 +02:00
parent d3685061fa
commit ef56ea4fdf
3 changed files with 0 additions and 200 deletions

View File

@ -1,92 +0,0 @@
diff -urNp star-1.5.1-orig/include/schily/schily.h star-1.5.1/include/schily/schily.h
--- star-1.5.1-orig/include/schily/schily.h 2009-10-22 23:18:55.000000000 +0200
+++ star-1.5.1/include/schily/schily.h 2010-01-13 13:17:10.000000000 +0100
@@ -174,7 +174,7 @@ extern int fexecle __PR((const char *, F
/* 6th arg not const, fexecv forces av[ac] = NULL */
extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
char **));
-extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
+extern int sch_fexecve __PR((const char *, FILE *, FILE *, FILE *,
char * const *, char * const *));
extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
extern int fspawnl __PR((FILE *, FILE *, FILE *, const char *, ...));
@@ -311,7 +311,7 @@ extern char *findbytes __PR((const void
extern char *findinpath __PR((char *__name, int __mode, BOOL __plain_file));
extern int findline __PR((const char *, char, const char *,
int, char **, int));
-extern int getline __PR((char *, int));
+extern int sch_getline __PR((char *, int));
extern int getstr __PR((char *, int));
extern int breakline __PR((char *, char, char **, int));
extern int getallargs __PR((int *, char * const**, const char *, ...));
diff -urNp star-1.5.1-orig/lib/fexec.c star-1.5.1/lib/fexec.c
--- star-1.5.1-orig/lib/fexec.c 2009-11-15 15:14:28.000000000 +0100
+++ star-1.5.1/lib/fexec.c 2010-01-13 13:17:10.000000000 +0100
@@ -198,7 +198,7 @@ const char **pav;
} while (p != NULL);
va_end(args);
- ret = fexecve(name, in, out, err, av, env);
+ ret = sch_fexecve(name, in, out, err, av, env);
if (av != xav)
free(av);
return (ret);
@@ -212,11 +212,11 @@ fexecv(name, in, out, err, ac, av)
char *av[];
{
av[ac] = NULL; /* force list to be null terminated */
- return (fexecve(name, in, out, err, av, environ));
+ return (sch_fexecve(name, in, out, err, av, environ));
}
EXPORT int
-fexecve(name, in, out, err, av, env)
+sch_fexecve(name, in, out, err, av, env)
const char *name;
FILE *in, *out, *err;
char * const av[], * const env[];
diff -urNp star-1.5.1-orig/lib/libschily-mapvers star-1.5.1/lib/libschily-mapvers
--- star-1.5.1-orig/lib/libschily-mapvers 2007-10-06 15:21:55.000000000 +0200
+++ star-1.5.1/lib/libschily-mapvers 2010-01-13 13:17:10.000000000 +0100
@@ -77,7 +77,7 @@ global:
fexecl;
fexecle;
fexecv;
- fexecve;
+ sch_fexecve;
ffileread;
ffilewrite;
fgetline;
@@ -123,7 +123,7 @@ global:
geterrno;
getfiles;
getfp;
- getline;
+ sch_getline;
getmainfp;
#getstr;
#handlecond;
diff -urNp star-1.5.1-orig/lib/stdio/fgetline.c star-1.5.1/lib/stdio/fgetline.c
--- star-1.5.1-orig/lib/stdio/fgetline.c 2004-09-25 14:23:36.000000000 +0200
+++ star-1.5.1/lib/stdio/fgetline.c 2010-01-13 13:17:10.000000000 +0100
@@ -61,7 +61,7 @@ fgetline(f, buf, len)
}
EXPORT int
-getline(buf, len)
+sch_getline(buf, len)
char *buf;
int len;
{
diff -urNp star-1.5.1-orig/libfind/find.c star-1.5.1/libfind/find.c
--- star-1.5.1-orig/libfind/find.c 2009-11-15 16:25:02.000000000 +0100
+++ star-1.5.1/libfind/find.c 2010-01-13 13:17:10.000000000 +0100
@@ -1747,7 +1747,7 @@ doexec(f, ac, av, state)
#endif
av[ac] = NULL; /* -exec {} \; is not NULL terminated */
- fexecve(av[0], state->std[0], state->std[1], state->std[2],
+ sch_fexecve(av[0], state->std[0], state->std[1], state->std[2],
av, state->env);
err = geterrno();
#ifdef PLUS_DEBUG

View File

@ -1,12 +0,0 @@
diff -urNp star-1.5.1-orig/star/buffer.c star-1.5.1/star/buffer.c
--- star-1.5.1-orig/star/buffer.c 2009-07-13 21:05:02.000000000 +0200
+++ star-1.5.1/star/buffer.c 2011-01-04 13:50:25.452138625 +0100
@@ -799,7 +799,7 @@ initbuf(nblocks)
bigptr = bigbuf = ___malloc((size_t) bufsize+10+pagesize,
"buffer");
- bigptr = bigbuf = (char *)roundup((Intptr_t)bigptr, pagesize);
+ bigptr = bigbuf = (char *)roundup((UIntptr_t)bigptr, pagesize);
fillbytes(bigbuf, bufsize, '\0');
fillbytes(&bigbuf[bufsize], 10, 'U');

View File

@ -1,96 +0,0 @@
diff --git a/star/pax.c b/star/pax.c
index 8130109..9a2fb18 100644
--- a/star/pax.c
+++ b/star/pax.c
@@ -266,9 +266,11 @@ usage(ret)
error("\t-c\t\tinvert matching rules\n");
error("\t-d\t\tdo not descend directories\n");
error("\t-f nm\t\tuse 'nm' as tape instead of stdin/stdout\n");
+ error("\t-H\t\tsame as -L but follow only symlinks passed on the command line\n");
error("\t-i\t\tdo interactive creation/extraction/renaming\n");
error("\t-k\t\tkeep existing files\n");
error("\t-l\t\tlink files rather than copying them\n");
+ error("\t-L\t\tfollow symlinks, archive and dump the files they point to\n");
error("\t-n\t\tone match per pattern only\n");
error("\t-o\t\toptions (none specified with SUSv2 / UNIX-98)\n");
error("\t-p string\tset privileges\n");
diff --git a/star/spax.1 b/star/spax.1
index 79e2b99..b17dc05 100644
--- a/star/spax.1
+++ b/star/spax.1
@@ -282,6 +282,9 @@ except that the order of presentation of the
and
.B \-s
options is significant.
+
+See also the "OTHER OPTIONS" section.
+
.PP
The following options shall be supported:
.TP
@@ -3246,7 +3249,7 @@ existing files). As stated, it prevents any overwriting, even if
the target file is older than the source. This version adds more
granularity of options to solve this problem by introducing the
.BI "\-o invalid=" option
-\-specifically the UTF-8 action. (Note that an
+\- specifically the UTF-8 action. (Note that an
existing file that is named with a UTF-8 encoding is still subject
to overwriting in this case. The
.B \-k
@@ -4206,10 +4209,16 @@ field.
End of quoted text from the POSIX.1-2001 standard.
. \" .SH RETURNS
. \" .SH ERRORS
-.SH OPTIONS
+.SH OTHER OPTIONS
The following
.I "other options
-are implemented as extension to the POSIX standard:
+are implemented as extension to the POSIX standard. Note that some other
+non-POSIX options are mentioned in \fI\-help\fR and \fI-xhelp\fR output
+- these are also supported in
+.BR spax (1)
+and are well described in
+.BR star (1)
+manual page.
.TP
.B \-help
Prints a summary of the most important options for
@@ -4225,6 +4234,11 @@ and exits.
Prints the
.B spax
version number string and exists.
+.TP
+.B \-do-statistics
+Print statistic messages at the end of a
+.BR spax (1)
+run.
.SH EXAMPLES
.SH ENVIRONMENT
diff --git a/star/star.1 b/star/star.1
index 3ccd35d..0c88793 100644
--- a/star/star.1
+++ b/star/star.1
@@ -3025,7 +3025,7 @@ The bug in old
versions that cause a reversal of a space and a NULL byte
in the checksum field is not repeated.
If you want to have signed checksums you have to specify the
-.I \-singed\-checksum
+.I \-signed\-checksum
option too.
If you want directories not to be archived in order to be compatible
to very old historic tar archives, you need to specify the
diff --git a/star/star.c b/star/star.c
index fe9d984..e895898 100644
--- a/star/star.c
+++ b/star/star.c
@@ -1132,7 +1132,7 @@ xusage(ret)
error("\t-no-xheader\tdo not read or write extended headers regardless of format\n");
error("\t-meta\t\tuse inode metadata only (omit file content)\n");
error("\t-xmeta\t\textract meta files\n");
- error("\t-dupmeta\tuse inode metadata in dump mode if only ctime is newer\n");
+ error("\t-dumpmeta\tuse inode metadata in dump mode if only ctime is newer\n");
error("\t-keep-old-files,-k\tkeep existing files\n");
error("\t-refresh-old-files\trefresh existing files, don't create new files\n");
error("\t-refresh\trefresh existing files, don't create new files\n");