diff --git a/.sharutils.metadata b/.sharutils.metadata new file mode 100644 index 0000000..b094bbb --- /dev/null +++ b/.sharutils.metadata @@ -0,0 +1 @@ +50582fcededd1891c47ec1caa98491e280950cbd SOURCES/sharutils-4.13.3.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch b/SOURCES/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch new file mode 100644 index 0000000..1a57c33 --- /dev/null +++ b/SOURCES/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch @@ -0,0 +1,36 @@ +From 2e633b222dbdccfd04506a0c0028471feb101524 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 23 Jan 2013 13:15:18 +0100 +Subject: [PATCH] Allow exactly one input file when specifying output file + +This fixes regression in 4.13.3. The fix ported from 4.13.4pre2. + +--- + src/uudecode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/uudecode.c b/src/uudecode.c +index 2ef5a92..723bcff 100644 +--- a/src/uudecode.c ++++ b/src/uudecode.c +@@ -490,7 +490,7 @@ main (int argc, char const * const * argv) + exit_status = decode ("stdin"); + break; + +- case 1: ++ default: + if (HAVE_OPT(OUTPUT_FILE)) + { + usage_message(_("You cannot specify an output file when processing\n\ +@@ -499,7 +499,7 @@ multiple input files.\n")); + } + /* FALLTHROUGH */ + +- default: ++ case 1: + while (--argc >= 0) + { + char const * f = *(argv++); +-- +1.8.1 + diff --git a/SOURCES/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch b/SOURCES/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch new file mode 100644 index 0000000..017dc9d --- /dev/null +++ b/SOURCES/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch @@ -0,0 +1,74 @@ +From 49857a3ee79226ce870607104f7ef28bacae3f57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 23 Jan 2013 14:06:50 +0100 +Subject: [PATCH] Do not open - and /dev/stdout + +Ported from 4.13.4pre2. + + +I have duplicated the autogen code to C because the build system does +not run autogen. +--- + src/uudecode-opts.c | 17 ++++++++++++++++- + src/uudecode-opts.def | 17 ++++++++++++++++- + 2 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/src/uudecode-opts.c b/src/uudecode-opts.c +index 19f4ee1..33ebe2f 100644 +--- a/src/uudecode-opts.c ++++ b/src/uudecode-opts.c +@@ -385,7 +385,22 @@ doOptOutput_File(tOptions* pOptions, tOptDesc* pOptDesc) + * reset its state. + */ + /* extracted from uudecode-opts.def, line 60 */ +- FILE * fp = freopen (pOptDesc->optArg.argString, "w", stdout); ++ FILE * fp; ++ switch (*pOptDesc->optArg.argString) ++ { ++ case '-': ++ if (pOptDesc->optArg.argString[1] == '\0') ++ return; ++ break; ++ ++ case '/': ++ if (strcmp (pOptDesc->optArg.argString + 1, "dev/stdout") == 0) ++ return; ++ ++ default: ++ break; ++ } ++ fp = freopen (pOptDesc->optArg.argString, "w", stdout); + if (fp != stdout) + { + error (0, errno, "%s", pOptDesc->optArg.argString); +diff --git a/src/uudecode-opts.def b/src/uudecode-opts.def +index ae11b0a..419387b 100644 +--- a/src/uudecode-opts.def ++++ b/src/uudecode-opts.def +@@ -57,7 +57,22 @@ flag = { + arg-name = file; + descrip = 'direct output to @file{file}'; + flag-code = <<- _EOCode_ +- FILE * fp = freopen (pOptDesc->optArg.argString, "w", stdout); ++ FILE * fp; ++ switch (*pOptDesc->optArg.argString) ++ { ++ case '-': ++ if (pOptDesc->optArg.argString[1] == '\0') ++ return; ++ break; ++ ++ case '/': ++ if (strcmp (pOptDesc->optArg.argString + 1, "dev/stdout") == 0) ++ return; ++ ++ default: ++ break; ++ } ++ fp = freopen (pOptDesc->optArg.argString, "w", stdout); + if (fp != stdout) + { + error (0, errno, "%s", pOptDesc->optArg.argString); +-- +1.8.1 + diff --git a/SPECS/sharutils.spec b/SPECS/sharutils.spec new file mode 100644 index 0000000..66fb383 --- /dev/null +++ b/SPECS/sharutils.spec @@ -0,0 +1,289 @@ +Summary: The GNU shar utilities for packaging and unpackaging shell archives +Name: sharutils +Version: 4.13.3 +Release: 4%{?dist} +# The main code: GPLv3+ +# lib (gnulib): LGPLv3+ +# lib/sys_socket.in.h: LGPLv2+ +# lib/md5.c: Public Domain +# libopts: LGPLv3+ or BSD +# doc/sharutils.texi: GFDL +License: GPLv3+ and LGPLv3+ and (LGPLv3+ or BSD) and LGPLv2+ and Public Domain and GFDL +Group: Applications/Archiving +Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +URL: http://www.gnu.org/software/%{name}/ +# Bug #901895, in upstream 4.13.4pre2 +Patch0: %{name}-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch +# Bug #901895, in upstream 4.13.4pre2 +Patch1: %{name}-4.13.3-Do-not-open-and-dev-stdout.patch +BuildRequires: gettext +Requires(post): info +Requires(preun): info +Provides: bundled(gnulib) +Provides: bundled(libopts) + +%description +The sharutils package contains the GNU shar utilities, a set of tools +for encoding and decoding packages of files (in binary or text format) +in a special plain text format called shell archives (shar). This +format can be sent through e-mail (which can be problematic for regular +binary files). The shar utility supports a wide range of capabilities +(compressing, uuencoding, splitting long files for multi-part +mailings, providing check-sums), which make it very flexible at +creating shar files. After the files have been sent, the unshar tool +scans mail messages looking for shar files. Unshar automatically +strips off mail headers and introductory text and then unpacks the +shar files. + +%prep +%setup -q +%patch0 -p1 -b .input_count +%patch1 -p1 -b .dev_stdout + +# convert TODO, THANKS to UTF-8 +for i in TODO THANKS; do + iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} + mv $i{.utf8,} +done + +%build +%configure +make %{?_smp_mflags} + +%install +make DESTDIR=${RPM_BUILD_ROOT} INSTALL='install -p' install +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir +# gnulib-tool installs compat header files mistakenly +rm -rf ${RPM_BUILD_ROOT}%{_includedir} +chmod 644 AUTHORS ChangeLog COPYING NEWS README THANKS TODO +%find_lang %{name} + +%check +make check + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir ||: + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||: +fi + +%files -f %{name}.lang +%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO +%{_bindir}/* +%{_infodir}/*info* +%{_mandir}/man1/* +%{_mandir}/man5/* + +%changelog +* Tue May 28 2013 Petr Pisar - 4.13.3-4 +- Correct license declaration (LGPLv3+ and (LGPLv3+ or BSD) and GFDL added) + +* Fri Feb 08 2013 Petr Pisar - 4.13.3-3 +- Collect message catalogs in install phase (bug #908967) + +* Wed Jan 23 2013 Petr Pisar - 4.13.3-2 +- Fix decoding from positional argument while overriding output file + (bug #901895) +- Fix decoding to standard output when output file is - or /dev/stdout + (bug #901895) + +* Mon Jan 07 2013 Petr Pisar - 4.13.3-1 +- 4.13.3 bump + +* Thu Jan 03 2013 Petr Pisar - 4.13.1-2 +- Fix MD5 checksum generation on big-endian machines + +* Thu Jan 03 2013 Petr Pisar - 4.13.1-1 +- 4.13.1 bump + +* Thu Aug 02 2012 Petr Pisar - 4.11.1-5 +- Fix building with glibc-2.16.6 + +* Sat Jul 21 2012 Fedora Release Engineering - 4.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 15 2012 Petr Pisar - 4.11.1-3 +- Export bundled(gnulib) (bug #821789) + +* Sat Jan 14 2012 Fedora Release Engineering - 4.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri May 06 2011 Petr Pisar - 4.11.1-1 +- 4.11.1 bump + +* Wed Feb 09 2011 Fedora Release Engineering - 4.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Petr Pisar - 4.11-1 +- 4.11 bump +- Do not install header files injected by gnulib-tool +- Remove BuildRoot stuff + +* Mon Aug 30 2010 Petr Pisar - 4.10-1 +- 4.10 bump (bug #628304) + +* Thu Jun 3 2010 Petr Pisar - 4.9-1 +- version bump to 4.9 (bug #569059, bug #583187) + +* Mon Feb 1 2010 Stepan Kasal - 4.7-6 +- fix the License tag + +* Sun Jul 26 2009 Fedora Release Engineering - 4.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 4.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Sep 04 2008 Jason L Tibbitts III - 4.7-3 +- Requires(pre) should be Requires(post). + +* Thu Sep 4 2008 Tom "spot" Callaway - 4.7-2 +- forgot the new source + +* Thu Sep 4 2008 Tom "spot" Callaway - 4.7-1 +- update to 4.7 +- fix license tag +- package cleanups + +* Tue Feb 19 2008 Fedora Release Engineering - 4.6.3-2 +- Autorebuild for GCC 4.3 + +* Tue Apr 10 2007 Than Ngo - 4.6.3-1 +- 4.6.3 + +* Fri Jul 14 2006 Jesse Keating - 4.6.1-2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 4.6.1-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 4.6.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Feb 06 2006 Florian La Roche +- 4.6.1 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 03 2005 Than Ngo 4.6-2 +- fix wrong permission #171889 + +* Wed Oct 26 2005 Than Ngo 4.6-1 +- update to 4.6 + +* Mon Apr 11 2005 Than Ngo 4.2.1-27 +- apply debian patch to fix insecure temporary file creation + in unshar #154049, CAN-2005-0990 + +* Thu Mar 31 2005 Than Ngo 4.2.1-26 +- apply patch to fix multiple buffer overflows #152571 + +* Mon Mar 07 2005 Than Ngo 4.2.1-25 +- cleanup + +* Sat Mar 05 2005 Than Ngo 4.2.1-24 +- rebuilt + +* Wed Feb 09 2005 Than Ngo 4.2.1-23 +- rebuilt + +* Fri Oct 01 2004 Than Ngo 4.2.1-22 +- fix buffer overflow in shar, (from Ulf Harnhammer) + +* Thu Jun 24 2004 Than Ngo 4.2.1-21 +- add builrequires on gettext, bug #126599 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri May 21 2004 Than Ngo 4.2.1-19 +- add suse patch, which fixes buffer overflow in handling of -o option, #123230 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 16 2003 Than Ngo 4.2.1-17 +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 4.2.1-13 +- rebuild on all arches + +* Mon Jun 24 2002 Than Ngo 4.2.1-12 +- fixed #66892 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sun Apr 14 2002 Than Ngo 4.2.1-9 +- added fix for Unsecure outputfile handling in uudecode (#63303) +- Copyright -> License + +* Fri May 11 2001 Than Ngo +- use find_lang macro +- use mktemp + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- fix typo (Bug# 12447) + +* Sun Jun 18 2000 Than Ngo +- rebuilt in the new build environment + +* Thu Jun 08 2000 Than Ngo +- add %%defattr(-,root,root) (Bug# 11990) +- use rpm macros + +* Sun May 21 2000 Ngo Than +- rebuild to put man pages and info files in right place + +* Mon Feb 07 2000 Preston Brown +- rebuild to gzip man pages + +* Tue Dec 21 1999 Preston Brown +- sharutils 4.2.1 for Y2K (2 digit date) fix. +- ja message catalog move (#7878) + +* Tue Sep 7 1999 Jeff Johnson +- handle spaces in uuencoded file names (David Fox ). + +* Wed Jul 28 1999 Cristian Gafton +- use the /usr/share/locale for the localedir instead of /usr/lib/locale + (#2998) + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 12) + +* Wed Dec 30 1998 Cristian Gafton +- build for glibc 2.1 + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Sat Apr 11 1998 Cristian Gafton +- manhattan rebuild + +* Fri Oct 17 1997 Donnie Barnes +- ALRIGHT! Woo-hoo! Erik already did the install-info stuff! +- added BuildRoot +- spec file cleanups + +* Sun Sep 14 1997 Erik Troan +- uses install-info + +* Fri Jul 18 1997 Erik Troan +- built against glibc +