|
|
@@ -10,7 +10,7 @@
|
|
|
## 'patch' tool to upgrade those files. Each patch snippet is annotated
|
|
|
## with a short description.
|
|
|
##
|
|
|
-## Created on: 28-Aug-2003
|
|
|
+## Created on: 01-Sep-2003
|
|
|
##
|
|
|
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
|
|
|
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
|
|
|
@@ -341,7 +341,7 @@ Index: rpmio/Makefile.in
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: rpmio/fts.c
|
|
|
--- rpmio/fts.c 18 Jan 2003 16:13:17 -0000 1.1.1.3
|
|
|
-+++ rpmio/fts.c 25 Aug 2003 09:19:37 -0000
|
|
|
++++ rpmio/fts.c 1 Sep 2003 06:59:34 -0000
|
|
|
@@ -34,6 +34,8 @@
|
|
|
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
|
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
@@ -391,12 +391,12 @@ Index: rpmio/rpmio.h
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: rpmio/rpmrpc.c
|
|
|
--- rpmio/rpmrpc.c 29 May 2003 22:14:04 -0000 1.1.1.8
|
|
|
-+++ rpmio/rpmrpc.c 24 Aug 2003 13:10:21 -0000
|
|
|
++++ rpmio/rpmrpc.c 1 Sep 2003 07:00:46 -0000
|
|
|
@@ -1079,6 +1079,8 @@
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
-+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) && !defined(__OpenBSD__)
|
|
|
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(sun)
|
|
|
+
|
|
|
struct __dirstream {
|
|
|
int fd; /* File descriptor. */
|
|
|
@@ -435,7 +435,7 @@ Index: rpmio/rpmrpc.c
|
|
|
/*@unchecked@*/
|
|
|
static int ftpmagicdir = 0x8440291;
|
|
|
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
|
|
|
-+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) && !defined(__OpenBSD__)
|
|
|
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(sun)
|
|
|
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
|
|
|
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
|
|
|
+#else
|
