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

- regen patches, add missing rcs id's

Browse Source
This commit is contained in:
jasper 2010-11-03 06:56:37 +00:00
parent f825c4aa38
commit 19b8bdd531
9 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/fileutils/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2010/10/18 20:52:09 espie Exp $
# $OpenBSD: Makefile,v 1.25 2010/11/03 06:56:37 jasper Exp $
COMMENT-main= GNU versions of common file management utilities
COMMENT-ls= colorized GNU 'ls'
@ -26,7 +26,7 @@ MODULES= devel/gettext
SEPARATE_BUILD= concurrent
USE_GMAKE= Yes
USE_GROFF = Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \

12
misc/fileutils/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2005/02/20 01:51:43 alek Exp $
--- configure.orig Sat Feb 19 22:38:14 2005
+++ configure Sat Feb 19 22:38:43 2005
@@ -22370,7 +22370,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
$OpenBSD: patch-configure,v 1.2 2010/11/03 06:56:37 jasper Exp $
--- configure.orig Sun Apr 29 10:26:09 2001
+++ configure Wed Nov 3 07:55:57 2010
@@ -22370,7 +22370,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1 2005/02/20 01:51:43 alek Exp $
cat >conftest.$ac_ext <<_ACEOF
#line 22375 "configure"
#include "confdefs.h"
@@ -22421,7 +22421,7 @@ if test "${ac_cv_lib_intl_gettext+set}"
@@ -22421,7 +22421,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.1 2005/02/20 01:51:43 alek Exp $
cat >conftest.$ac_ext <<_ACEOF
#line 22426 "configure"
#include "confdefs.h"
@@ -22469,7 +22469,7 @@ if test $ac_cv_lib_intl_gettext = yes; t
@@ -22469,7 +22469,7 @@ if test $ac_cv_lib_intl_gettext = yes; then
#define HAVE_LIBINTL 1
EOF

11
misc/fileutils/patches/patch-src_Makefile_in
View File

@ -1,14 +1,15 @@
--- src/Makefile.in.orig Sun Apr 29 07:40:37 2001
+++ src/Makefile.in Mon Feb 24 23:18:38 2003
$OpenBSD: patch-src_Makefile_in,v 1.4 2010/11/03 06:56:37 jasper Exp $
--- src/Makefile.in.orig Sun Apr 29 13:40:37 2001
+++ src/Makefile.in Wed Nov 3 07:55:57 2010
@@ -135,7 +135,7 @@ noinst_HEADERS = \
EXTRA_DIST = dcgen dircolors.hin
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
DEFS = -DLOCALEDIR=\"$(localedir)\" -DSHAREDIR=\"$(datadir)\" @DEFS@
LDADD = @INTLLIBS@ ../lib/libfetish.a
@@ -338,7 +338,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \

1
misc/fileutils/patches/patch-src_dircolors_c
View File

@ -1,3 +1,4 @@
$OpenBSD: patch-src_dircolors_c,v 1.4 2010/11/03 06:56:37 jasper Exp $
--- src/dircolors.c.orig Mon Aug 7 12:46:16 2000
+++ src/dircolors.c Mon Feb 24 23:18:38 2003
@@ -69,13 +69,15 @@ static const char *const slack_codes[] =

11
misc/fileutils/patches/patch-src_ls_c
View File

@ -1,5 +1,6 @@
--- src/ls.c.orig Sun Apr 29 05:42:47 2001
+++ src/ls.c Mon Feb 24 23:18:38 2003
$OpenBSD: patch-src_ls_c,v 1.4 2010/11/03 06:56:37 jasper Exp $
--- src/ls.c.orig Sun Apr 29 11:42:47 2001
+++ src/ls.c Wed Nov 3 07:55:57 2010
@@ -510,13 +510,13 @@ enum color_type
enum indicator_no
{
@ -16,7 +17,7 @@
};
struct color_ext_type
@@ -542,7 +542,11 @@ static struct bin_str color_indicator[]
@@ -542,7 +542,11 @@ static struct bin_str color_indicator[] =
{ 0, NULL }, /* mi: Missing file: undefined */
{ 0, NULL }, /* or: Orphanned symlink: undefined */
{ LEN_STR_PAIR ("01;32") }, /* ex: Executable: bright green */
@ -29,7 +30,7 @@
};
/* FIXME: comment */
@@ -2883,7 +2887,14 @@ print_color_indicator (const char *name,
@@ -2883,7 +2887,14 @@ print_color_indicator (const char *name, unsigned int
else
{
if (S_ISDIR (mode))
@ -45,7 +46,7 @@
else if (S_ISLNK (mode))
type = ((!linkok && color_indicator[C_ORPHAN].string)
? C_ORPHAN : C_LINK);
@@ -2898,7 +2909,13 @@ print_color_indicator (const char *name,
@@ -2898,7 +2909,13 @@ print_color_indicator (const char *name, unsigned int
else if (S_ISDOOR (mode))
type = C_DOOR;

1
misc/fileutils/patches/patch-src_ls_h
View File

@ -1,3 +1,4 @@
$OpenBSD: patch-src_ls_h,v 1.3 2010/11/03 06:56:37 jasper Exp $
--- src/ls.h.orig Mon Feb 15 17:27:12 1999
+++ src/ls.h Fri Jul 20 21:03:51 2001
@@ -7,4 +7,7 @@

15
misc/fileutils/patches/patch-src_mv_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_mv_c,v 1.1 2003/02/25 14:35:43 brad Exp $
--- src/mv.c.orig Sat Feb 3 11:48:34 2001
+++ src/mv.c Mon Feb 24 23:21:17 2003
$OpenBSD: patch-src_mv_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
--- src/mv.c.orig Sat Feb 3 17:48:34 2001
+++ src/mv.c Wed Nov 3 07:55:57 2010
@@ -1,5 +1,5 @@
/* mv -- move or rename files
- Copyright (C) 86, 89, 90, 91, 1995-2001 Free Software Foundation, Inc.
@ -8,13 +8,13 @@ $OpenBSD: patch-src_mv_c,v 1.1 2003/02/25 14:35:43 brad Exp $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -235,6 +235,19 @@ do_move (const char *source, const char
@@ -235,7 +235,20 @@ do_move (const char *source, const char *dest, const s
struct rm_options rm_options;
struct File_spec fs;
enum RM_status status;
+ static int first_rm = 1;
+ static struct dev_ino cwd_dev_ino;
+
+ if (first_rm)
+ {
+ struct stat cwd_sb;
@ -25,10 +25,11 @@ $OpenBSD: patch-src_mv_c,v 1.1 2003/02/25 14:35:43 brad Exp $
+ cwd_dev_ino.st_dev = cwd_sb.st_dev;
+ cwd_dev_ino.st_ino = cwd_sb.st_ino;
+ }
+
rm_option_init (&rm_options);
rm_options.verbose = x->verbose;
@@ -247,7 +260,7 @@ do_move (const char *source, const char
@@ -247,7 +260,7 @@ do_move (const char *source, const char *dest, const s
took the else branch of movefile. */
strip_trailing_slashes_2 (fs.filename);

22
misc/fileutils/patches/patch-src_remove_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
--- src/remove.c.orig Sun Feb 18 11:17:32 2001
+++ src/remove.c Mon Feb 24 23:21:17 2003
@@ -433,10 +433,13 @@ same_file (const char *file_1, const cha
$OpenBSD: patch-src_remove_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
--- src/remove.c.orig Sun Feb 18 17:17:32 2001
+++ src/remove.c Wed Nov 3 07:55:57 2010
@@ -433,10 +433,13 @@ same_file (const char *file_1, const char *file_2)
/* Recursively remove all of the entries in the current directory.
@ -17,7 +17,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
{
/* NOTE: this is static. */
static DIR *dirp = NULL;
@@ -549,7 +552,7 @@ remove_cwd_entries (const struct rm_opti
@@ -549,7 +552,7 @@ remove_cwd_entries (const struct rm_options *x)
/* CAUTION: after this call to rm, DP may not be valid --
it may have been freed due to a close in a recursive call
(through rm and remove_dir) to this function. */
@ -26,7 +26,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
/* Update status. */
if (tmp_status > status)
@@ -664,12 +667,14 @@ remove_file (struct File_spec *fs, const
@@ -664,12 +667,14 @@ remove_file (struct File_spec *fs, const struct rm_opt
FIXME: describe need_save_cwd parameter. */
static enum RM_status
@ -42,7 +42,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
if (!x->recursive)
{
@@ -738,6 +743,9 @@ was replaced with either another directo
@@ -738,6 +743,9 @@ was replaced with either another directory or a link t
(unsigned long)(sb.st_dev),
(unsigned long)(sb.st_ino));
}
@ -52,7 +52,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
}
push_dir (dir_name);
@@ -747,7 +755,7 @@ was replaced with either another directo
@@ -747,7 +755,7 @@ was replaced with either another directory or a link t
remove_cwd_entries may close the directory. */
ASSIGN_STRDUPA (dir_name, dir_name);
@ -61,7 +61,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
pop_dir ();
@@ -761,11 +769,34 @@ was replaced with either another directo
@@ -761,11 +769,34 @@ was replaced with either another directory or a link t
}
free_cwd (&cwd);
}
@ -100,7 +100,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
}
if (x->interactive)
@@ -814,10 +845,13 @@ was replaced with either another directo
@@ -814,10 +845,13 @@ was replaced with either another directory or a link t
things. Return RM_OK if it is removed, and RM_ERROR or RM_USER_DECLINED
if not. If USER_SPECIFIED_NAME is non-zero, then the name part of FS may
be `.', `..', or may contain slashes. Otherwise, it must be a simple file
@ -116,7 +116,7 @@ $OpenBSD: patch-src_remove_c,v 1.1 2003/02/25 14:35:43 brad Exp $
{
mode_t filetype_mode;
@@ -899,7 +933,7 @@ The following two directories have the s
@@ -899,7 +933,7 @@ The following two directories have the same inode numb
if (need_save_cwd)
need_save_cwd = (strchr (fs->filename, '/') != NULL);

15
misc/fileutils/patches/patch-src_rm_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_rm_c,v 1.1 2003/02/25 14:35:43 brad Exp $
--- src/rm.c.orig Sun Apr 29 02:56:24 2001
+++ src/rm.c Mon Feb 24 23:21:17 2003
$OpenBSD: patch-src_rm_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
--- src/rm.c.orig Sun Apr 29 08:56:24 2001
+++ src/rm.c Wed Nov 3 07:55:57 2010
@@ -1,5 +1,5 @@
/* `rm' file deletion utility for GNU.
- Copyright (C) 88, 90, 91, 1994-2001 Free Software Foundation, Inc.
@ -16,7 +16,10 @@ $OpenBSD: patch-src_rm_c,v 1.1 2003/02/25 14:35:43 brad Exp $
- {
- struct File_spec fs;
- enum RM_status status;
-
+ {
+ struct stat cwd_sb;
+ struct dev_ino cwd_dev_ino;
- /* Stripping slashes is harmless for rmdir;
- if the arg is not a directory, it will fail with ENOTDIR. */
- strip_trailing_slashes (argv[optind]);
@ -26,10 +29,6 @@ $OpenBSD: patch-src_rm_c,v 1.1 2003/02/25 14:35:43 brad Exp $
- if (status == RM_ERROR)
- fail = 1;
- }
+ {
+ struct stat cwd_sb;
+ struct dev_ino cwd_dev_ino;
+
+ /* FIXME: this lstat is not always necessary -- e.g., if there are no
+ directories, or if all directories arguments are specified via
+ absolute names. */