cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to sharutils-4.15.2

Browse Source
This commit is contained in:
jasper 2015-09-07 17:57:07 +00:00
parent bb70117daf
commit 30da4e4ea2
6 changed files with 122 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archivers/gshar+gunshar/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2013/11/09 23:19:01 naddy Exp $
# $OpenBSD: Makefile,v 1.32 2015/09/07 17:57:07 jasper Exp $
COMMENT= packing and unpacking of shell archives
DISTNAME= sharutils-4.13.1
REVISION= 0
DISTNAME= sharutils-4.15.2
CATEGORIES= archivers
@ -22,6 +21,7 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --program-prefix="g" \
--disable-nls \
--disable-uucode
CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib"
# Regression tests pass without --disable-uuencode
NO_TEST=Yes

4
archivers/gshar+gunshar/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (sharutils-4.13.1.tar.gz) = ME+LE/cyj4ph6BhpMhuH8cgXdJ4OOP0SB/FBWHH/QIk=
SIZE (sharutils-4.13.1.tar.gz) = 1667601
SHA256 (sharutils-4.15.2.tar.gz) = 7jNuaFSWZOehmxF63wLt/erGMH8i5bp4uspFcRaRRjc=
SIZE (sharutils-4.15.2.tar.gz) = 2193381

158
archivers/gshar+gunshar/patches/patch-doc_shar_1
View File

@ -1,71 +1,80 @@
$OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
--- doc/shar.1.orig Sun Jun 16 10:13:12 2013
+++ doc/shar.1 Sun Jun 16 10:23:43 2013
$OpenBSD: patch-doc_shar_1,v 1.2 2015/09/07 17:57:07 jasper Exp $
--- doc/shar.1.orig Sat May 30 17:34:15 2015
+++ doc/shar.1 Mon Sep 7 19:38:10 2015
@@ -1,4 +1,4 @@
-.TH shar 1 "27 Dec 2012" "GNU sharutils (4.13.1)" "User Commands"
-.de1 NOP
+.TH gshar 1 "27 Dec 2012" "GNU sharutils (4.13.1)" "User Commands"
.\"
.\" DO NOT EDIT THIS FILE (shar.man)
.\"
@@ -7,16 +7,16 @@
.\" and the template file agman-cmd.tpl
.\"
. it 1 an-trap
. if \\n[.$] \,\\$*\/
..
@@ -18,10 +18,10 @@
.\" From the definitions shar-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
-shar \- create a shell archive
+gshar \- create a shell archive
-\f\*[B-Font]shar\fP
+\f\*[B-Font]gshar\fP
\- create a shell archive
.SH SYNOPSIS
-.B shar
+.B gshar
-\f\*[B-Font]shar\fP
+\f\*[B-Font]gshar\fP
.\" Mixture of short (flag) options and long options
.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP "[[=| ]\fIvalue\fP]]..." " " "[file ...]"
.PP
[\f\*[B-Font]\-flags\f[]]
[\f\*[B-Font]\-flag\f[] [\f\*[I-Font]value\f[]]]
@@ -33,12 +33,12 @@
If no \fIfile\fPs are specified, the list of input files is read
from a standard input. Standard input must not be a terminal.
from standard input. Standard input must not be a terminal.
.SH "DESCRIPTION"
-\fBshar\fP creates "shell archives" (or shar files) which are in
+\fBgshar\fP creates "shell archives" (or shar files) which are in
text format and can be emailed. These files may be unpacked later by
executing them with /bin/sh. The resulting archive is sent to
executing them with \fI/bin/sh\fP. The resulting archive is sent to
standard out unless the \fB-o\fP option is given. A wide range of
@@ -124,7 +124,7 @@ This option is a member of the mixed\-uuencode class o
features provide extensive flexibility in manufacturing shars and in
-specifying \fBshar\fP "smartness". Archives may be fairly simple
+specifying \fBgshar\fP "smartness". Archives may be fairly simple
(\fB--vanilla-operation\fP) or essentially a mailable \fBtar\fP
archive.
.sp
@@ -168,7 +168,7 @@ This option is a member of the mixed-uuencode class of
.sp
Automatically determine if the files are text or binary and archive
correctly. Files found to be binary are uuencoded prior to packing.
-This is the default behavior for \fIshar\fP.
+This is the default behavior for \fIgshar\fP.
-This is the default behavior for \fBshar\fP.
+This is the default behavior for \fBgshar\fP.
.sp
For a file to be considered a text file instead of a binary file,
all the following should be true:
@@ -219,8 +219,8 @@ Limit output file size to XXk bytes and split files if
archive parts created with this option must be unpacked in correct
order. If the recipient of the shell archives wants to put all of
them in a single email folder (file), they will have to be saved in
-the correct order for \fBunshar\fP to unpack them all at once (using
-one of the split archive options). see: unshar Invocation.
+the correct order for \fBgunshar\fP to unpack them all at once (using
+one of the split archive options). see: gunshar Invocation.
@@ -270,9 +270,9 @@ necessary. The allowed values are specified as with t
The archive parts created with this option must be unpacked in the
correct order. If the recipient of the shell archives wants to put
all of them in a single email folder (file), they will have to be
-saved in the correct order for \fBunshar\fP to unpack them all at
+saved in the correct order for \fBgunshar\fP to unpack them all at
once (using one of the split archive options).
-see: unshar Invocation.
+see: gunshar Invocation.
.TP
.BR \-I " \fIfile\fP, " \-\-input\-file\-list "=" \fIfile\fP
.NOP \f\*[B-Font]\-I\f[] \f\*[I-Font]file\f[], \f\*[B-Font]\-\-input\-file\-list\f[]=\f\*[I-Font]file\f[]
read file list from a file.
@@ -245,7 +245,7 @@ For example:
@@ -294,7 +294,7 @@ For example:
.nf
{ echo \-\-compact xz
{ echo \--compact xz
find . \-type f \-print | sort
- } | shar \-S \-p \-L50K \-o /somewhere/big
+ } | gshar \-S \-p \-L50K \-o /somewhere/big
.fi
.TP
.BR \-S ", " \-\-stdin\-file\-list
@@ -264,7 +264,7 @@ See the \fB\-\-net\-headers\fP option.
.BR \-s " \fIwho@where\fP, " \-\-submitter "=" \fIwho@where\fP
.NOP \f\*[B-Font]\-S\f[], \f\*[B-Font]\-\-stdin\-file\-list\f[]
@@ -316,7 +316,7 @@ files. See the \fB--net-headers\fP option.
.NOP \f\*[B-Font]\-s\f[] \f\*[I-Font]who@where\f[], \f\*[B-Font]\-\-submitter\f[]=\f\*[I-Font]who@where\f[]
override the submitter name.
.sp
-\fBshar\fP will normally determine the submitter name by querying
+\fBgshar\fP will normally determine the submitter name by querying
the system. Use this option if it is being done on behalf of another.
.TP
.BR \-a ", " \-\-net\-headers
@@ -309,7 +309,7 @@ start of each output file.
.NOP \f\*[B-Font]\-a\f[], \f\*[B-Font]\-\-net\-headers\f[]
@@ -361,7 +361,7 @@ start of each output file.
translate messages in the script.
.sp
Translate messages in the script. If you have set the \fBLANG\fP
@ -74,8 +83,8 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
specified language. The produced script will still be emitted using
messages in the lingua franca of the computer world: English. This
option will cause the script messages to appear in the languages
@@ -362,7 +362,7 @@ decompression or decoding in the unpacking environment
.BR \-P ", " \-\-no\-piping
@@ -416,7 +416,7 @@ decompression or decoding in the unpacking environment
.NOP \f\*[B-Font]\-P\f[], \f\*[B-Font]\-\-no\-piping\f[]
use temporary files between programs.
.sp
-In the \fIshar\fP file, use a temporary file to hold file contents
@ -83,17 +92,8 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
between unpacking stages instead of using pipes. This option is
mandatory when you know the unpacking will happen on systems that do
not support pipes.
@@ -378,7 +378,7 @@ overwrite pre\-existing files. In all cases, however,
unpacking, then existing files will be overwritten unconditionally.
.sp
.nf
- sh shar\-archive\-file \-c
+ sh gshar\-archive\-file \-c
.fi
.TP
.BR \-X ", " \-\-query\-user
@@ -396,13 +396,13 @@ feature mainly for archives to be passed among agreeab
Certainly, \fB\-X\fP is \fInot\fP for shell archives which are to be
@@ -450,13 +450,13 @@ feature mainly for archives to be passed among agreeab
Certainly, \fB-X\fP is \fInot\fP for shell archives which are to be
submitted to Usenet or other public networks.
.sp
-The problem is that \fBunshar\fP programs or procedures often feed
@ -109,16 +109,16 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
programs or procedures, and call \fI/bin/sh\fP directly. In vanilla
mode, using \fI/dev/tty\fP is not even attempted.
.TP
@@ -429,7 +429,7 @@ restore in one directory, despite hierarchy.
@@ -483,7 +483,7 @@ restore in one directory, despite hierarchy.
Restore by the base file name only, rather than path. This option
causes only file names to be used, which is useful when building a
shar from several directories, or another directory. Note that if a
-directory name is passed to shar, the substructure of that directory
+directory name is passed to gshar, the substructure of that directory
will be restored whether this option is specified or not.
.SS "Internationalization options:"
.SS "Internationalization options"
.TP
@@ -437,7 +437,7 @@ will be restored whether this option is specified or n
@@ -491,7 +491,7 @@ will be restored whether this option is specified or n
do not internationalize.
.sp
Do not produce internationalized shell archives, use default English
@ -127,22 +127,17 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
messages in the unpackers preferred language (as determined by the
LANG/LC_MESSAGES environmental variables) when they are unpacked. If
no message file for the unpackers language is found at unpack time,
@@ -446,7 +446,7 @@ messages will be in English.
.BR \-\-print\-text\-domain\-dir
@@ -500,7 +500,7 @@ messages will be in English.
.NOP \f\*[B-Font]\-\-print\-text\-domain\-dir\f[]
print directory with shar messages.
.sp
-Prints the directory shar looks in to find messages files
+Prints the directory gshar looks in to find messages files
for different languages, then immediately exits.
.SS "user feedback/entertainment"
.SS "User feedback/entertainment"
.TP
@@ -485,21 +485,21 @@ by loading values from configuration ("RC" or ".INI")
The file "\fI$HOME/.sharrc\fP" will be used, if present.
.SH "REPORTING BUGS"
Report bugs to \fIbug\-gnu\-utils@gnu.org\fP.
-Please put \fBsharutils\fP in the subject line.
+Please put \fBgsharutils\fP in the subject line.
It helps to spot the message..Sh WARNINGS
@@ -541,7 +541,7 @@ The file "\fI$HOME/.sharrc\fP" will be used, if presen
.SH WARNINGS
No attempt is made to restore the protection and modification dates
for directories, even if this is done by default for files. Thus, if
-a directory is given to \fBshar\fP, the protection and modification
@ -150,21 +145,7 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
dates of corresponding unpacked directory may not match those of the
original.
.sp
-If a directory is passed to shar, it may be scanned more than once, to
+If a directory is passed to gshar, it may be scanned more than once, to
conserve memory. Therefore, do not change the directory contents
-while shar is running.
+while gshar is running.
.sp
Be careful that the output file(s) are not included in the inputs or
-shar may loop until the disk fills up. Be particularly careful when a
-directory is passed to shar that the output files are not in that
+gshar may loop until the disk fills up. Be particularly careful when a
+directory is passed to gshar that the output files are not in that
directory or a subdirectory of it.
.sp
Use of the compression and encoding options will slow the archive
@@ -528,10 +528,10 @@ archive which will use only the file names at unpack t
@@ -579,10 +579,10 @@ archive which will use only the file names at unpack t
.br
.in +4
.nf
@ -179,22 +160,9 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
.in -4
.fi
.SH "EXIT STATUS"
@@ -550,10 +550,10 @@ a specified input could not be found
open/close of specified directory failed
.TP
.BR 4 " (EXIT_FAILED)"
-Resource limit/miscelleaneous shar command failure
+Resource limit/miscelleaneous gshar command failure
.TP
.BR 63 " (EXIT_BUG)"
-There is a shar command bug. Please report it.
+There is a gshar command bug. Please report it.
.TP
.BR 66 " (EX_NOINPUT)"
A specified configuration file could not be loaded.
@@ -562,9 +562,9 @@ A specified configuration file could not be loaded.
libopts had an internal operational error. Please report
@@ -614,9 +614,9 @@ libopts had an internal operational error. Please rep
it to autogen-users@lists.sourceforge.net. Thank you.
.PP
.SH "SEE ALSO"
-unshar(1)
+gunshar(1)
@ -204,8 +172,8 @@ $OpenBSD: patch-doc_shar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
many authors. Many people contributed by reporting problems,
suggesting various improvements or submitting actual code. A list of
these people is in the \fITHANKS\fP file in the sharutils distribution.
@@ -574,5 +574,5 @@ This program is released under the terms of the GNU Ge
.SH "BUGS"
@@ -631,5 +631,5 @@ reports. It helps to spot the message.
Please send bug reports to: bug-gnu-utils@gnu.org
.SH "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBshar\fP

12
archivers/gshar+gunshar/patches/patch-doc_sharutils_info
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_sharutils_info,v 1.1 2013/06/25 06:14:57 rpe Exp $
--- doc/sharutils.info.orig Mon Jun 24 23:25:50 2013
+++ doc/sharutils.info Mon Jun 24 23:26:00 2013
@@ -11,7 +11,7 @@ START-INFO-DIR-ENTRY
* unshar: (sharutils)unshar Invocation. Explode a shell archive.
* uudecode: (sharutils)uudecode Invocation. Restore file from 7-bits.
* uuencode: (sharutils)uuencode Invocation. Force binary file to 7-bits.
-* doc-license: GNU Free Documentation License. Documentation license.
+* doc-license: (sharutils)GNU Free Documentation License. Documentation license.
END-INFO-DIR-ENTRY
This manual documents version 4.13.1 of the GNU shar utilities.

69
archivers/gshar+gunshar/patches/patch-doc_unshar_1
View File

@ -1,44 +1,63 @@
$OpenBSD: patch-doc_unshar_1,v 1.1 2013/06/25 06:14:57 rpe Exp $
--- doc/unshar.1.orig Sun Jun 16 10:24:38 2013
+++ doc/unshar.1 Sun Jun 16 10:26:02 2013
$OpenBSD: patch-doc_unshar_1,v 1.2 2015/09/07 17:57:07 jasper Exp $
--- doc/unshar.1.orig Sat May 30 17:34:19 2015
+++ doc/unshar.1 Mon Sep 7 19:34:56 2015
@@ -1,4 +1,4 @@
-.TH unshar 1 "27 Dec 2012" "GNU sharutils (4.13.1)" "User Commands"
-.de1 NOP
+.TH gunshar 1 "27 Dec 2012" "GNU sharutils (4.13.1)" "User Commands"
.\"
.\" DO NOT EDIT THIS FILE (unshar.man)
.\"
@@ -7,9 +7,9 @@
.\" and the template file agman-cmd.tpl
.\"
. it 1 an-trap
. if \\n[.$] \,\\$*\/
..
@@ -18,10 +18,10 @@
.\" From the definitions unshar-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
-unshar \- unpack a shar archive
+gunshar \- unpack a shar archive
-\f\*[B-Font]unshar\fP
+\f\*[B-Font]gunshar\fP
\- unpack a shar archive
.SH SYNOPSIS
-.B unshar
+.B gunshar
-\f\*[B-Font]unshar\fP
+\f\*[B-Font]gunshar\fP
.\" Mixture of short (flag) options and long options
.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP "[[=| ]\fIvalue\fP]]..." " " "[ file ... ]"
[\f\*[B-Font]\-flags\f[]]
[\f\*[B-Font]\-flag\f[] [\f\*[I-Font]value\f[]]]
@@ -39,7 +39,7 @@ Standard input may not be a terminal.
.ne 2
.SH "DESCRIPTION"
@@ -37,7 +37,7 @@ This is an alias for the overwrite option.
.BR \-E " \fIsplit\-pat\fP, " \-\-split\-at "=" \fIsplit\-pat\fP
separate archives on \fIsplit\-pat\fP lines.
-Unshar scans the input files (typically email messages) looking for
+Gunshar scans the input files (typically email messages) looking for
the start of a shell archive. If no files are given, then standard
input is processed instead. It then passes each archive discovered
through an invocation of the shell program to unpack it.
@@ -56,7 +56,7 @@ which are blank lines or lines beginning with a '#' ch
unpack into the directory \fIdir\fP.
.sp
-With this option, \fIunshar\fP isolates each different shell archive
+With this option, \fIgunshar\fP isolates each different shell archive
The input file names are relative to the current directory
-when the program was started. This option tells \fBunshar\fP
+when the program was started. This option tells \fBgunshar\fP
to insert a \fBcd <dir>\fP commad at the start of the
\fBshar\fP text written to the shell.
.TP
@@ -78,7 +78,7 @@ for this option is:
.ti +4
exit 0
.sp
-With this option, \fBunshar\fP isolates each different shell archive
+With this option, \fBgunshar\fP isolates each different shell archive
from the others which have been placed in the same file, unpacking each
in turn, from the beginning of the file to the end. Its proper
operation relies on the fact that many shar files are terminated by a
@@ -105,7 +105,7 @@ A specified configuration file could not be loaded.
libopts had an internal operational error. Please report
it to autogen-users@lists.sourceforge.net. Thank you.
@@ -165,7 +165,7 @@ it to autogen-users@lists.sourceforge.net. Thank you.
.SH "SEE ALSO"
shar(1)
.SH AUTHORS
-The \fIshar\fP and \fIunshar\fP programs is the collective work of
+The \fgIshar\fP and \fIgunshar\fP programs is the collective work of
many authors. Many people contributed by reporting problems,
suggesting various improvements or submitting actual code. A list of
these people is in the \fITHANKS\fP file in the sharutils distribution.
@@ -115,5 +115,5 @@ This program is released under the terms of the GNU Ge
.SH "BUGS"
@@ -180,5 +180,5 @@ reports. It helps to spot the message.
Please send bug reports to: bug-gnu-utils@gnu.org
.SH "NOTES"
-This manual page was \fIAutoGen\fP-erated from the \fBunshar\fP

20
archivers/gshar+gunshar/patches/patch-src_unshar_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_unshar_c,v 1.1 2013/06/25 06:14:57 rpe Exp $
--- src/unshar.c.orig Sun Jun 16 10:27:20 2013
+++ src/unshar.c Sun Jun 16 10:27:37 2013
@@ -476,7 +476,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
static FILE*
load_stdin (char **p_name_buf)
$OpenBSD: patch-src_unshar_c,v 1.2 2015/09/07 17:57:07 jasper Exp $
--- src/unshar.c.orig Wed Jan 7 03:14:10 2015
+++ src/unshar.c Mon Sep 7 19:32:27 2015
@@ -311,7 +311,7 @@ get_env_tmpdir(void)
static FILE *
load_file (char const ** tmp_fname, FILE * infp)
{
- static const char z_tmpfile[] = "unsh.XXXXXX";
+ static const char z_tmpfile[] = "unsh.XXXXXXXXXX";
char *pz_fname;
FILE *fp;
- static char const z_tmpfile[] = "unsh.XXXXXX";
+ static char const z_tmpfile[] = "unsh.XXXXXXXXXX";
char * pz_fname;
FILE * outfp;