OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jan-2003 15:49:07
Branch: HEAD Handle: 2003011714490601
Added files:
openpkg-src/coreutils coreutils-dirent.patch
Modified files:
openpkg-src/coreutils coreutils.spec
openpkg-web news.txt
Log:
Fixed rm -r bug on FreeBSD
Summary:
Revision Changes Path
1.1 +23 -0 openpkg-src/coreutils/coreutils-dirent.patch
1.9 +4 -2 openpkg-src/coreutils/coreutils.spec
1.2911 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils-dirent.patch
============================================================================
$ cvs diff -u -r0 -r1.1 coreutils-dirent.patch
--- /dev/null 2003-01-17 15:49:07.000000000 +0100
+++ coreutils-dirent.patch 2003-01-17 15:49:07.000000000 +0100
@@ -0,0 +1,23 @@
+--- src/remove.c.dist 2003-01-17 15:33:54.000000000 +0100
++++ src/remove.c 2003-01-17 15:37:08.000000000 +0100
+@@ -632,9 +632,11 @@
+
+ #if HAVE_STRUCT_DIRENT_D_TYPE
+ # define DT_IS_DIR(D) ((D)->d_type == DT_DIR)
++# define DT_IS_DEF(D) ((D)->d_type != DT_UNKNOWN)
+ #else
+ /* Use this only if the member exists -- i.e., don't return 0. */
+ # define DT_IS_DIR(D) do_not_use_this_macro
++# define DT_IS_DEF(D) do_not_use_this_macro
+ #endif
+
+ #define DO_UNLINK(Filename, X) \
+@@ -704,7 +706,7 @@
+ if (is_dir == T_UNKNOWN)
+ {
+ # if HAVE_STRUCT_DIRENT_D_TYPE
+- if (dp)
++ if (dp && DT_IS_DEF (dp))
+ is_dir = DT_IS_DIR (dp) ? T_YES : T_NO;
+ else
+ # endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 12 Jan 2003 12:19:07 -0000 1.8
+++ openpkg-src/coreutils/coreutils.spec 17 Jan 2003 14:49:07 -0000 1.9
@@ -33,11 +33,12 @@
Group: Utility
License: GPL
Version: 4.5.4
-Release: 20030112
+Release: 20030117
# list of sources
Source0: ftp://alpha.gnu.org/gnu/coreutils/coreutils-%{version}.tar.bz2
Patch0: coreutils.patch
+Patch1: coreutils-dirent.patch
# build information
Prefix: %{l_prefix}
@@ -65,7 +66,8 @@
%prep
%setup -q
- %patch -p0
+ %patch0 -p0
+ %patch1 -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2910 -r1.2911 news.txt
--- openpkg-web/news.txt 17 Jan 2003 14:46:50 -0000 1.2910
+++ openpkg-web/news.txt 17 Jan 2003 14:49:06 -0000 1.2911
@@ -1,3 +1,4 @@
+17-Jan-2003: Upgraded package: P<coreutils-4.5.4-20030117>
17-Jan-2003: New package: P<perl-conv-20030117-20030117>
17-Jan-2003: Upgraded package: P<perl-www-20030117-20030117>
17-Jan-2003: Upgraded package: P<perl-mail-20030117-20030117>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
