r1153 - trunk/freebsd6-buildutils/debian/patches
Author: rmh
Date: 2006-02-09 18:29:48 +0000 (Thu, 09 Feb 2006)
New Revision: 1153
Modified:
trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
Log:
Fix broken hunk in usr.bin/make/main.c.
Modified: trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2006-02-08 19:26:24 UTC (rev 1152)
+++ trunk/freebsd6-buildutils/debian/patches/00_upstream.diff 2006-02-09 18:29:48 UTC (rev 1153)
@@ -1,6 +1,6 @@
-diff -ur ../foo.old/src/contrib/one-true-awk/b.c ./src/contrib/one-true-awk/b.c
---- ../foo.old/src/contrib/one-true-awk/b.c 2005-05-16 21:11:31.000000000 +0200
-+++ ./src/contrib/one-true-awk/b.c 2005-12-16 21:52:55.000000000 +0100
+diff -ur src.old/contrib/one-true-awk/b.c src/contrib/one-true-awk/b.c
+--- src.old/contrib/one-true-awk/b.c 2005-05-16 21:11:31.000000000 +0200
++++ src/contrib/one-true-awk/b.c 2006-02-09 19:27:55.000000000 +0100
@@ -25,6 +25,7 @@
/* lasciate ogne speranza, voi ch'entrate. */
@@ -9,9 +9,9 @@
#include <ctype.h>
#include <stdio.h>
-diff -ur ../foo.old/src/usr.bin/cksum/cksum.c ./src/usr.bin/cksum/cksum.c
---- ../foo.old/src/usr.bin/cksum/cksum.c 2003-03-14 00:32:28.000000000 +0100
-+++ ./src/usr.bin/cksum/cksum.c 2005-12-16 21:52:55.000000000 +0100
+diff -ur src.old/usr.bin/cksum/cksum.c src/usr.bin/cksum/cksum.c
+--- src.old/usr.bin/cksum/cksum.c 2003-03-14 00:32:28.000000000 +0100
++++ src/usr.bin/cksum/cksum.c 2006-02-09 19:27:55.000000000 +0100
@@ -57,6 +57,7 @@
#include <stdlib.h>
#include <string.h>
@@ -29,9 +29,9 @@
if ((p = rindex(argv[0], '/')) == NULL)
p = argv[0];
-diff -ur ../foo.old/src/usr.bin/cksum/extern.h ./src/usr.bin/cksum/extern.h
---- ../foo.old/src/usr.bin/cksum/extern.h 2003-03-14 00:32:28.000000000 +0100
-+++ ./src/usr.bin/cksum/extern.h 2005-12-16 21:52:55.000000000 +0100
+diff -ur src.old/usr.bin/cksum/extern.h src/usr.bin/cksum/extern.h
+--- src.old/usr.bin/cksum/extern.h 2003-03-14 00:32:28.000000000 +0100
++++ src/usr.bin/cksum/extern.h 2006-02-09 19:27:55.000000000 +0100
@@ -35,6 +35,7 @@
*/
@@ -40,18 +40,18 @@
__BEGIN_DECLS
int crc(int, uint32_t *, off_t *);
-diff -ur ../foo.old/src/usr.bin/make/main.c ./src/usr.bin/make/main.c
---- ../foo.old/src/usr.bin/make/main.c 2005-12-05 15:22:12.000000000 +0100
-+++ ./src/usr.bin/make/main.c 2005-12-16 21:52:55.000000000 +0100
-@@ -513,6 +513,7 @@
+diff -ur src.old/usr.bin/make/main.c src/usr.bin/make/main.c
+--- src.old/usr.bin/make/main.c 2005-12-17 12:46:35.000000000 +0100
++++ src/usr.bin/make/main.c 2006-02-09 19:28:13.000000000 +0100
+@@ -714,6 +714,7 @@
+ }
+ #endif
- oldVars = TRUE;
-
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
/*
- * Parse the rest of the arguments.
- * o Check for variable assignments and perform them if so.
-@@ -734,6 +735,7 @@
+ * PC-98 kernel sets the `i386' string to the utsname.machine and
+ * it cannot be distinguished from IBM-PC by uname(3). Therefore,
+@@ -733,6 +734,7 @@
machine = "pc98";
}
}
@@ -59,9 +59,9 @@
/*
* Get the name of this type of MACHINE from utsname
-diff -ur ../foo.old/src/usr.bin/yacc/main.c ./src/usr.bin/yacc/main.c
---- ../foo.old/src/usr.bin/yacc/main.c 2004-03-05 03:05:56.000000000 +0100
-+++ ./src/usr.bin/yacc/main.c 2005-12-16 21:52:55.000000000 +0100
+diff -ur src.old/usr.bin/yacc/main.c src/usr.bin/yacc/main.c
+--- src.old/usr.bin/yacc/main.c 2004-03-05 03:05:56.000000000 +0100
++++ src/usr.bin/yacc/main.c 2006-02-09 19:27:56.000000000 +0100
@@ -114,7 +114,10 @@
volatile sig_atomic_t sigdie;
@@ -74,9 +74,9 @@
done(k)
int k;
{
-diff -ur ../foo.old/src/usr.sbin/config/main.c ./src/usr.sbin/config/main.c
---- ../foo.old/src/usr.sbin/config/main.c 2005-11-30 18:55:49.000000000 +0100
-+++ ./src/usr.sbin/config/main.c 2005-12-16 21:52:55.000000000 +0100
+diff -ur src.old/usr.sbin/config/main.c src/usr.sbin/config/main.c
+--- src.old/usr.sbin/config/main.c 2005-12-17 12:47:02.000000000 +0100
++++ src/usr.sbin/config/main.c 2006-02-09 19:27:56.000000000 +0100
@@ -52,6 +52,9 @@
#include <sysexits.h>
#include <unistd.h>
@@ -87,7 +87,7 @@
#include "y.tab.h"
#include "config.h"
#include "configvers.h"
-@@ -459,7 +462,11 @@
+@@ -455,7 +458,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
@@ -99,9 +99,9 @@
/* Skip non-headers */
if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
continue;
-diff -ur ../foo.old/src/usr.sbin/mtree/compare.c ./src/usr.sbin/mtree/compare.c
---- ../foo.old/src/usr.sbin/mtree/compare.c 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/compare.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/compare.c src/usr.sbin/mtree/compare.c
+--- src.old/usr.sbin/mtree/compare.c 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/compare.c 2006-02-09 19:27:56.000000000 +0100
@@ -176,21 +176,22 @@
(intmax_t)s->st_size, (intmax_t)p->fts_statp->st_size);
tab = "\t";
@@ -155,9 +155,9 @@
#ifdef MD5
if (s->flags & F_MD5) {
char *new_digest, buf[33];
-diff -ur ../foo.old/src/usr.sbin/mtree/create.c ./src/usr.sbin/mtree/create.c
---- ../foo.old/src/usr.sbin/mtree/create.c 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/create.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/create.c src/usr.sbin/mtree/create.c
+--- src.old/usr.sbin/mtree/create.c 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/create.c 2006-02-09 19:27:56.000000000 +0100
@@ -73,7 +73,11 @@
static u_long flags = 0xffffffff;
@@ -230,9 +230,9 @@
(void)printf("\n");
*puid = saveuid;
*pgid = savegid;
-diff -ur ../foo.old/src/usr.sbin/mtree/extern.h ./src/usr.sbin/mtree/extern.h
---- ../foo.old/src/usr.sbin/mtree/extern.h 2004-01-11 20:38:48.000000000 +0100
-+++ ./src/usr.sbin/mtree/extern.h 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/extern.h src/usr.sbin/mtree/extern.h
+--- src.old/usr.sbin/mtree/extern.h 2004-01-11 20:38:48.000000000 +0100
++++ src/usr.sbin/mtree/extern.h 2006-02-09 19:27:56.000000000 +0100
@@ -29,6 +29,9 @@
* @(#)extern.h 8.1 (Berkeley) 6/6/93
* $FreeBSD: ./src/usr.sbin/mtree/extern.h,v 1.13 2004/01/11 19:38:48 phk Exp $
@@ -243,9 +243,9 @@
extern uint32_t crc_total;
#ifdef _FTS_H_
-diff -ur ../foo.old/src/usr.sbin/mtree/misc.c ./src/usr.sbin/mtree/misc.c
---- ../foo.old/src/usr.sbin/mtree/misc.c 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/misc.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/misc.c src/usr.sbin/mtree/misc.c
+--- src.old/usr.sbin/mtree/misc.c 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/misc.c 2006-02-09 19:27:56.000000000 +0100
@@ -106,6 +106,7 @@
return (strcmp(((const KEY *)a)->name, ((const KEY *)b)->name));
}
@@ -259,9 +259,9 @@
return string;
}
+#endif /* __FreeBSD__ */
-diff -ur ../foo.old/src/usr.sbin/mtree/mtree.c ./src/usr.sbin/mtree/mtree.c
---- ../foo.old/src/usr.sbin/mtree/mtree.c 2004-06-04 21:29:28.000000000 +0200
-+++ ./src/usr.sbin/mtree/mtree.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/mtree.c src/usr.sbin/mtree/mtree.c
+--- src.old/usr.sbin/mtree/mtree.c 2004-06-04 21:29:28.000000000 +0200
++++ src/usr.sbin/mtree/mtree.c 2006-02-09 19:27:56.000000000 +0100
@@ -164,7 +164,7 @@
if (dir && chdir(dir))
err(1, "%s", dir);
@@ -271,9 +271,9 @@
errx(1, "%s", fullpath);
if (cflag) {
-diff -ur ../foo.old/src/usr.sbin/mtree/mtree.h ./src/usr.sbin/mtree/mtree.h
---- ../foo.old/src/usr.sbin/mtree/mtree.h 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/mtree.h 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/mtree.h src/usr.sbin/mtree/mtree.h
+--- src.old/usr.sbin/mtree/mtree.h 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/mtree.h 2006-02-09 19:27:56.000000000 +0100
@@ -42,7 +42,16 @@
struct _node *parent, *child; /* up, down */
struct _node *prev, *next; /* left, right */
@@ -302,9 +302,9 @@
#define MBITS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
mode_t st_mode; /* mode */
u_long st_flags; /* flags */
-diff -ur ../foo.old/src/usr.sbin/mtree/spec.c ./src/usr.sbin/mtree/spec.c
---- ../foo.old/src/usr.sbin/mtree/spec.c 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/spec.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/spec.c src/usr.sbin/mtree/spec.c
+--- src.old/usr.sbin/mtree/spec.c 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/spec.c 2006-02-09 19:27:56.000000000 +0100
@@ -169,7 +169,9 @@
char *kw, *val = NULL;
struct group *gr;
@@ -352,9 +352,9 @@
case F_TYPE:
switch(*val) {
case 'b':
-diff -ur ../foo.old/src/usr.sbin/mtree/specspec.c ./src/usr.sbin/mtree/specspec.c
---- ../foo.old/src/usr.sbin/mtree/specspec.c 2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/specspec.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/specspec.c src/usr.sbin/mtree/specspec.c
+--- src.old/usr.sbin/mtree/specspec.c 2005-03-29 13:44:17.000000000 +0200
++++ src/usr.sbin/mtree/specspec.c 2006-02-09 19:27:56.000000000 +0100
@@ -150,8 +150,10 @@
differs |= F_SIZE;
if (FS(n1, n2, F_SLINK, slink))
@@ -367,9 +367,9 @@
if (FF(n1, n2, F_UID, st_uid))
differs |= F_UID;
if (FF(n1, n2, F_UNAME, st_uid))
-diff -ur ../foo.old/src/usr.sbin/mtree/verify.c ./src/usr.sbin/mtree/verify.c
---- ../foo.old/src/usr.sbin/mtree/verify.c 2005-08-11 17:43:55.000000000 +0200
-+++ ./src/usr.sbin/mtree/verify.c 2005-12-16 21:52:56.000000000 +0100
+diff -ur src.old/usr.sbin/mtree/verify.c src/usr.sbin/mtree/verify.c
+--- src.old/usr.sbin/mtree/verify.c 2005-12-17 12:47:12.000000000 +0100
++++ src/usr.sbin/mtree/verify.c 2006-02-09 19:27:56.000000000 +0100
@@ -243,9 +243,11 @@
if (chmod(path, p->st_mode))
(void)printf("%s: permissions not set: %s\n",
Reply to: