From 7adb074801832b8ddf19489cd7fdec776c26f0ff Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 29 Sep 2004 14:16:26 +0000 Subject: rename patch --- .../sharutils/files/sharutils-4.2.1-gentoo.patch | 105 +++++++++++++++++++++ .../sharutils/files/sharutils-4.2.1-r6-gentoo.diff | 105 --------------------- app-arch/sharutils/sharutils-4.2.1-r6.ebuild | 4 +- app-arch/sharutils/sharutils-4.2.1-r7.ebuild | 4 +- app-arch/sharutils/sharutils-4.2.1-r8.ebuild | 4 +- app-arch/sharutils/sharutils-4.2.1-r9.ebuild | 4 +- 6 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 app-arch/sharutils/files/sharutils-4.2.1-gentoo.patch delete mode 100644 app-arch/sharutils/files/sharutils-4.2.1-r6-gentoo.diff (limited to 'app-arch') diff --git a/app-arch/sharutils/files/sharutils-4.2.1-gentoo.patch b/app-arch/sharutils/files/sharutils-4.2.1-gentoo.patch new file mode 100644 index 000000000000..6f8ef97973b1 --- /dev/null +++ b/app-arch/sharutils/files/sharutils-4.2.1-gentoo.patch @@ -0,0 +1,105 @@ +diff -r -C2 sharutils-4.2.1.orig/doc/remsync.texi sharutils-4.2.1/doc/remsync.texi +*** sharutils-4.2.1.orig/doc/remsync.texi Thu Nov 30 18:15:37 1995 +--- sharutils-4.2.1/doc/remsync.texi Fri Aug 3 18:57:02 2001 +*************** +*** 8,11 **** +--- 8,15 ---- + + @ifinfo ++ ++ @direntry ++ * remsync: (remsync). Synchronize remote files (sharutils). ++ @end direntry + This file documents the @code{remsync} command and friends, which have + the purpose of synchronizing remote directory trees using email. +diff -r -C2 sharutils-4.2.1.orig/doc/sharutils.texi sharutils-4.2.1/doc/sharutils.texi +*** sharutils-4.2.1.orig/doc/sharutils.texi Fri Nov 24 21:42:52 1995 +--- sharutils-4.2.1/doc/sharutils.texi Fri Aug 3 18:29:43 2001 +*************** +*** 16,31 **** + + @ifinfo +! @format +! START-INFO-DIR-ENTRY + * Shar utilities: (sharutils). GNU shar utilities. +! * mail-files: (sharutils)mail-files invocation. Send files to remote site. +! * mailshar: (sharutils)mailshar invocation. Make and send a shell archive. +! * remsync: (sharutils)remsync invocation. Synchronize remote files. +! * shar: (sharutils)shar invocation. Make a shell archive. +! * 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. +! END-INFO-DIR-ENTRY +! @end format + @end ifinfo + +--- 16,22 ---- + + @ifinfo +! @direntry + * Shar utilities: (sharutils). GNU shar utilities. +! @end direntry + @end ifinfo + +--- sharutils-4.2.1/src/uudecode.c.orig Sat Apr 13 01:26:31 2002 ++++ sharutils-4.2.1/src/uudecode.c Sat Apr 13 01:30:32 2002 +@@ -81,6 +81,9 @@ + /* Single character decode. */ + #define DEC(Char) (((Char) - ' ') & 077) + ++#if !defined S_ISLNK && defined S_IFLNK ++# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) ++#endif + + static int + read_stduu (inname) +@@ -279,6 +282,7 @@ + char buf[2 * BUFSIZ]; + char *outname; + int do_base64 = 0; ++ struct stat attr; + + /* Search for header line. */ + +@@ -337,6 +341,23 @@ + } + } + ++ /* Check out file if it exists */ ++ if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0 ++ && !access(outname, F_OK)) { ++ if (lstat(outname, &attr) == -1) { ++ error (0, errno, _("cannot access %s"), outname); ++ return 1; ++ } ++ if (S_ISFIFO(attr.st_mode)){ ++ error (0, errno, _("denied writing FIFO (%s)"), outname); ++ return 1; ++ } ++ if (S_ISLNK(attr.st_mode)) { ++ error (0, errno, _("not following symlink (%s)"), outname); ++ return 1; ++ } ++ } ++ + /* Create output file and set mode. */ + + if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0 + + + +--- sharutils-4.2.1/src/mailshar.in.orig Fri May 11 21:45:29 2001 ++++ sharutils-4.2.1/src/mailshar.in Fri May 11 21:50:40 2001 +@@ -33,7 +33,11 @@ + If none of -MTBzZ are given, -z is automatically selected if *none* + of the FILEs have an .arc, .exz, .gif, .z, .gz, .Z, .zip or .zoo suffix." + +-temp=/usr/tmp/$$.shar ++temp=`mktemp -q /tmp/$0.XXXXXX` ++if [ $? -ne 0 ]; then ++ echo "$0: Can't create temp file, exiting..." ++ exit 1 ++fi + + ### Decode the options. + diff --git a/app-arch/sharutils/files/sharutils-4.2.1-r6-gentoo.diff b/app-arch/sharutils/files/sharutils-4.2.1-r6-gentoo.diff deleted file mode 100644 index 6f8ef97973b1..000000000000 --- a/app-arch/sharutils/files/sharutils-4.2.1-r6-gentoo.diff +++ /dev/null @@ -1,105 +0,0 @@ -diff -r -C2 sharutils-4.2.1.orig/doc/remsync.texi sharutils-4.2.1/doc/remsync.texi -*** sharutils-4.2.1.orig/doc/remsync.texi Thu Nov 30 18:15:37 1995 ---- sharutils-4.2.1/doc/remsync.texi Fri Aug 3 18:57:02 2001 -*************** -*** 8,11 **** ---- 8,15 ---- - - @ifinfo -+ -+ @direntry -+ * remsync: (remsync). Synchronize remote files (sharutils). -+ @end direntry - This file documents the @code{remsync} command and friends, which have - the purpose of synchronizing remote directory trees using email. -diff -r -C2 sharutils-4.2.1.orig/doc/sharutils.texi sharutils-4.2.1/doc/sharutils.texi -*** sharutils-4.2.1.orig/doc/sharutils.texi Fri Nov 24 21:42:52 1995 ---- sharutils-4.2.1/doc/sharutils.texi Fri Aug 3 18:29:43 2001 -*************** -*** 16,31 **** - - @ifinfo -! @format -! START-INFO-DIR-ENTRY - * Shar utilities: (sharutils). GNU shar utilities. -! * mail-files: (sharutils)mail-files invocation. Send files to remote site. -! * mailshar: (sharutils)mailshar invocation. Make and send a shell archive. -! * remsync: (sharutils)remsync invocation. Synchronize remote files. -! * shar: (sharutils)shar invocation. Make a shell archive. -! * 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. -! END-INFO-DIR-ENTRY -! @end format - @end ifinfo - ---- 16,22 ---- - - @ifinfo -! @direntry - * Shar utilities: (sharutils). GNU shar utilities. -! @end direntry - @end ifinfo - ---- sharutils-4.2.1/src/uudecode.c.orig Sat Apr 13 01:26:31 2002 -+++ sharutils-4.2.1/src/uudecode.c Sat Apr 13 01:30:32 2002 -@@ -81,6 +81,9 @@ - /* Single character decode. */ - #define DEC(Char) (((Char) - ' ') & 077) - -+#if !defined S_ISLNK && defined S_IFLNK -+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) -+#endif - - static int - read_stduu (inname) -@@ -279,6 +282,7 @@ - char buf[2 * BUFSIZ]; - char *outname; - int do_base64 = 0; -+ struct stat attr; - - /* Search for header line. */ - -@@ -337,6 +341,23 @@ - } - } - -+ /* Check out file if it exists */ -+ if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0 -+ && !access(outname, F_OK)) { -+ if (lstat(outname, &attr) == -1) { -+ error (0, errno, _("cannot access %s"), outname); -+ return 1; -+ } -+ if (S_ISFIFO(attr.st_mode)){ -+ error (0, errno, _("denied writing FIFO (%s)"), outname); -+ return 1; -+ } -+ if (S_ISLNK(attr.st_mode)) { -+ error (0, errno, _("not following symlink (%s)"), outname); -+ return 1; -+ } -+ } -+ - /* Create output file and set mode. */ - - if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0 - - - ---- sharutils-4.2.1/src/mailshar.in.orig Fri May 11 21:45:29 2001 -+++ sharutils-4.2.1/src/mailshar.in Fri May 11 21:50:40 2001 -@@ -33,7 +33,11 @@ - If none of -MTBzZ are given, -z is automatically selected if *none* - of the FILEs have an .arc, .exz, .gif, .z, .gz, .Z, .zip or .zoo suffix." - --temp=/usr/tmp/$$.shar -+temp=`mktemp -q /tmp/$0.XXXXXX` -+if [ $? -ne 0 ]; then -+ echo "$0: Can't create temp file, exiting..." -+ exit 1 -+fi - - ### Decode the options. - diff --git a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild b/app-arch/sharutils/sharutils-4.2.1-r6.ebuild index f069c6e9d9a0..ce537ca4ecdf 100644 --- a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild +++ b/app-arch/sharutils/sharutils-4.2.1-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.7 2004/06/24 21:36:05 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.8 2004/09/29 14:16:26 vapier Exp $ inherit eutils @@ -20,7 +20,7 @@ DEPEND="sys-apps/texinfo src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${PF}-gentoo.diff + epatch ${FILESDIR}/${P}-gentoo.patch cd ${S}/po mv nl.po nl.po.orig diff --git a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild b/app-arch/sharutils/sharutils-4.2.1-r7.ebuild index 5aa594bc3e1e..10cf1da7d6bd 100644 --- a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild +++ b/app-arch/sharutils/sharutils-4.2.1-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.6 2004/06/24 21:36:05 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.7 2004/09/29 14:16:26 vapier Exp $ inherit eutils @@ -20,7 +20,7 @@ DEPEND="sys-apps/texinfo src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${P}-r6-gentoo.diff + epatch ${FILESDIR}/${P}-gentoo.patch cd ${S}/po cp ja_JP.EUC.po ja.po diff --git a/app-arch/sharutils/sharutils-4.2.1-r8.ebuild b/app-arch/sharutils/sharutils-4.2.1-r8.ebuild index 42822f3fd00f..b839fea159fa 100644 --- a/app-arch/sharutils/sharutils-4.2.1-r8.ebuild +++ b/app-arch/sharutils/sharutils-4.2.1-r8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r8.ebuild,v 1.7 2004/06/24 21:36:05 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r8.ebuild,v 1.8 2004/09/29 14:16:26 vapier Exp $ inherit eutils @@ -22,7 +22,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${P}-r6-gentoo.diff + epatch ${FILESDIR}/${P}-gentoo.patch epatch ${FILESDIR}/${P}-buffer-check.patch #46998 cd ${S}/po diff --git a/app-arch/sharutils/sharutils-4.2.1-r9.ebuild b/app-arch/sharutils/sharutils-4.2.1-r9.ebuild index b6fd8e5359f9..13bc17045e7b 100644 --- a/app-arch/sharutils/sharutils-4.2.1-r9.ebuild +++ b/app-arch/sharutils/sharutils-4.2.1-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r9.ebuild,v 1.10 2004/09/29 14:12:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r9.ebuild,v 1.11 2004/09/29 14:16:26 vapier Exp $ inherit eutils @@ -22,7 +22,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${P}-r6-gentoo.diff + epatch ${FILESDIR}/${P}-gentoo.patch epatch ${FILESDIR}/${P}-buffer-check.patch #46998 cd ${S}/po -- cgit v1.2.3-65-gdbad