[Glibc-bsd-commits] r3011 - in trunk/freebsd-buildutils: . debian debian/patches
Aurelien Jarno
aurel32 at alioth.debian.org
Sat Apr 10 14:29:28 UTC 2010
Author: aurel32
Date: 2010-04-10 14:29:22 +0000 (Sat, 10 Apr 2010)
New Revision: 3011
Added:
trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
Removed:
trunk/freebsd-buildutils/debian/patches/12_unused.diff
trunk/freebsd-buildutils/debian/patches/13_bsd_sys.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/00_upstream.diff
trunk/freebsd-buildutils/debian/patches/03_glibc.diff
trunk/freebsd-buildutils/debian/patches/14_config.diff
trunk/freebsd-buildutils/debian/rules
trunk/freebsd-buildutils/fetch
Log:
* Remove part of the automatic patches in favor of patches.
* Use libbsd instead of hacked funtions.
* Use <bsd/sys/*.h> includes instead of <bsd/*.h>.
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/changelog 2010-04-10 14:29:22 UTC (rev 3011)
@@ -1,6 +1,8 @@
freebsd-buildutils (7.2-2) UNRELEASED; urgency=low
- * Use <bsd/sys/queue.h> instead of <bsd/queue.h>.
+ * Remove part of the automatic patches in favor of patches.
+ * Use libbsd instead of hacked funtions.
+ * Use <bsd/sys/*.h> includes instead of <bsd/*.h>.
-- Aurelien Jarno <aurel32 at debian.org> Sat, 10 Apr 2010 13:02:00 +0200
Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -258,16 +258,6 @@
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;
- struct passwd *pw;
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- mode_t *m;
-+#endif
- int value;
- char *ep;
-
@@ -204,12 +206,14 @@
if(!ip->rmd160digest)
errx(1, "strdup");
Added: trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/02_libbsd.diff (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/02_libbsd.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -0,0 +1,231 @@
+--- src/share/mk/version_gen.awk
++++ src/share/mk/version_gen.awk
+@@ -41,7 +41,7 @@
+ version_count = 0;
+ current_version = "";
+ stderr = "/dev/stderr";
+- while (getline < vfile) {
++ while (bsd_getline < vfile) {
+ # Strip comments.
+ sub("#.*$", "", $0);
+
+--- src/usr.bin/file2c/file2c.c
++++ src/usr.bin/file2c/file2c.c
+@@ -10,6 +10,7 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/usr.bin/file2c/file2c.c,v 1.10.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $");
+
++#include <bsd/stdlib.h>
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- src/usr.bin/file2c/Makefile
++++ src/usr.bin/file2c/Makefile
+@@ -1,5 +1,6 @@
+ # $FreeBSD: src/usr.bin/file2c/Makefile,v 1.8.20.1 2009/04/15 03:14:26 kensmith Exp $
+
+ PROG= file2c
++LDADD= -lbsd
+ WARNS?= 6
+ .include <bsd.prog.mk>
+--- src/usr.bin/make/arch.c
++++ src/usr.bin/make/arch.c
+@@ -88,7 +88,7 @@
+ */
+
+ #include <sys/param.h>
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+ #include <sys/types.h>
+ #include <ar.h>
+ #include <ctype.h>
+--- src/usr.bin/make/dir.h
++++ src/usr.bin/make/dir.h
+@@ -43,7 +43,7 @@
+ #ifndef dir_h_6002e3b8
+ #define dir_h_6002e3b8
+
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+ #include "hash.h"
+
+ struct GNode;
+--- src/usr.bin/make/job.c
++++ src/usr.bin/make/job.c
+@@ -101,7 +101,8 @@
+ * thems as need creatin'
+ */
+
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
++#include <bsd/stdlib.h>
+ #include <sys/types.h>
+ #include <sys/select.h>
+ #include <sys/stat.h>
+--- src/usr.bin/make/main.c
++++ src/usr.bin/make/main.c
+@@ -65,7 +65,8 @@
+ #include <sys/stat.h>
+ #include <sys/sysctl.h>
+ #include <sys/time.h>
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
++#include <bsd/err.h>
+ #include <sys/resource.h>
+ #include <sys/utsname.h>
+ #include <sys/wait.h>
+--- src/usr.bin/make/shell.c
++++ src/usr.bin/make/shell.c
+@@ -40,7 +40,7 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/usr.bin/make/shell.c,v 1.1.20.1 2009/04/15 03:14:26 kensmith Exp $");
+
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- src/usr.bin/make/shell.h
++++ src/usr.bin/make/shell.h
+@@ -42,7 +42,7 @@
+ #ifndef shell_h_6002e3b8
+ #define shell_h_6002e3b8
+
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+
+ #include "str.h"
+ #include "util.h"
+--- src/usr.bin/make/suff.c
++++ src/usr.bin/make/suff.c
+@@ -90,7 +90,7 @@
+ * if the target had no implicit sources.
+ */
+
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+ #include <assert.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- src/usr.bin/make/Makefile
++++ src/usr.bin/make/Makefile
+@@ -7,6 +7,7 @@
+ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
+ lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
+ util.c var.c
++LDFLAGS= -lbsd
+
+ WARNS?= 6
+ NO_SHARED?= YES
+--- src/usr.bin/yacc/test/ftp.tab.c
++++ src/usr.bin/yacc/test/ftp.tab.c
+@@ -490,10 +490,10 @@
+ #include <arpa/telnet.h>
+
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * bsd_getline - a hacked up version of fgets to ignore TELNET escape codes.
+ */
+ char *
+-getline(s, n, iop)
++bsd_getline(s, n, iop)
+ char *s;
+ register FILE *iop;
+ {
+@@ -584,7 +584,7 @@
+ case CMD:
+ (void) signal(SIGALRM, toolong);
+ (void) alarm((unsigned) timeout);
+- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++ if (bsd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ reply(221, "You could at least say goodbye.");
+ dologout(0);
+ }
+--- src/usr.bin/yacc/test/ftp.y
++++ src/usr.bin/yacc/test/ftp.y
+@@ -750,10 +750,10 @@
+ #include <arpa/telnet.h>
+
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * bsd_getline - a hacked up version of fgets to ignore TELNET escape codes.
+ */
+ char *
+-getline(s, n, iop)
++bsd_getline(s, n, iop)
+ char *s;
+ register FILE *iop;
+ {
+@@ -844,7 +844,7 @@
+ case CMD:
+ (void) signal(SIGALRM, toolong);
+ (void) alarm((unsigned) timeout);
+- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++ if (bsd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ reply(221, "You could at least say goodbye.");
+ dologout(0);
+ }
+--- src/usr.sbin/config/config.h
++++ src/usr.sbin/config/config.h
+@@ -34,7 +34,7 @@
+ * Config.
+ */
+ #include <sys/types.h>
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+--- src/usr.sbin/config/mkoptions.c
++++ src/usr.sbin/config/mkoptions.c
+@@ -40,6 +40,7 @@
+ * Make all the .h files for the optional entries
+ */
+
++#include <bsd/string.h>
+ #include <ctype.h>
+ #include <err.h>
+ #include <stdio.h>
+--- src/usr.sbin/config/Makefile
++++ src/usr.sbin/config/Makefile
+@@ -13,7 +13,7 @@
+ CFLAGS+= -I. -I${.CURDIR}
+
+ DPADD= ${LIBL} ${LIBSBUF}
+-LDADD= -ll -lsbuf
++LDADD= -ll -lsbuf -lbsd
+
+ CLEANFILES+= kernconf.c
+
+--- src/usr.sbin/mtree/excludes.c
++++ src/usr.sbin/mtree/excludes.c
+@@ -32,7 +32,8 @@
+
+ #include <sys/types.h>
+ #include <sys/time.h> /* XXX for mtree.h */
+-#include <sys/queue.h>
++#include <bsd/sys/queue.h>
++#include <bsd/stdio.h>
+
+ #include <err.h>
+ #include <fnmatch.h>
+--- src/usr.sbin/mtree/spec.c
++++ src/usr.sbin/mtree/spec.c
+@@ -35,6 +35,7 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.23.8.1 2009/04/15 03:14:26 kensmith Exp $");
+
++#include <bsd/stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+--- src/usr.sbin/mtree/Makefile
++++ src/usr.sbin/mtree/Makefile
+@@ -7,6 +7,7 @@
+ MAN= mtree.8
+ SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
+ SRCS+= specspec.c
++LDADD= -lbsd
+
+ WARNS?= 4
+
Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -1,6 +1,3 @@
-
- FIXME: use libbsd instead (strlcpy, strvis, strunvis ...)
-
diff -ur ../foo.old/src/usr.sbin/btxld/btx.h ./src/usr.sbin/btxld/btx.h
--- ../foo.old/src/usr.sbin/btxld/btx.h 1999-08-28 03:15:41.000000000 +0200
+++ ./src/usr.sbin/btxld/btx.h 2005-12-16 23:52:43.000000000 +0100
@@ -44,128 +41,9 @@
-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
-DPADD= ${LIBMD}
--LDADD+= -lmd
+-LDADD= -lmd
-
.include <bsd.prog.mk>
-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-12-16 23:52:51.000000000 +0100
-+++ ./src/usr.sbin/mtree/compare.c 2005-12-16 23:52:43.000000000 +0100
-@@ -59,7 +59,9 @@
- #include <stdio.h>
- #include <time.h>
- #include <unistd.h>
-+#ifdef __FreeBSD__
- #include <vis.h>
-+#endif
-
- #include "mtree.h"
- #include "extern.h"
-@@ -387,6 +389,21 @@
- if ((len = readlink(name, tbuf, sizeof(tbuf) - 1)) == -1)
- err(1, "line %d: %s", lineno, name);
- tbuf[len] = '\0';
-+
-+#ifdef __FreeBSD__
- strvis(lbuf, tbuf, VIS_WHITE | VIS_OCTAL);
-+#else
-+ int i = 0, j = 0;
-+ /* borrowed from src/lib/libc/gen/vis.c [rmh] */
-+ while (tbuf[j] != 0)
-+ {
-+ lbuf[i++] = '\\';
-+ lbuf[i++] = ((u_char) tbuf[j] >> 6 & 07) + '0';
-+ lbuf[i++] = ((u_char) tbuf[j] >> 3 & 07) + '0';
-+ lbuf[i++] = ((u_char) tbuf[j] & 07) + '0';
-+ j++;
-+ }
-+ lbuf[i++] = '\0';
-+#endif
- return (lbuf);
- }
-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-12-16 23:52:51.000000000 +0100
-+++ ./src/usr.sbin/mtree/create.c 2005-12-16 23:52:43.000000000 +0100
-@@ -60,7 +60,6 @@
- #include <stdio.h>
- #include <time.h>
- #include <unistd.h>
--#include <vis.h>
- #include "mtree.h"
- #include "extern.h"
-
-@@ -160,7 +159,23 @@
- escaped_name = calloc(1, p->fts_namelen * 4 + 1);
- if (escaped_name == NULL)
- errx(1, "statf(): calloc() failed");
-- strvis(escaped_name, p->fts_name, VIS_WHITE | VIS_OCTAL | VIS_GLOB);
-+#ifdef __FreeBSD__
-+ strvis(escaped_name, p->fts_name, VIS_WHITE | VIS_OCTAL | VIS_GLOB);
-+#else
-+ /* borrowed from src/lib/libc/gen/vis.c
-+ FIXME: this replacement was meant for VIS_WHITE | VIS_OCTAL, but
-+ not VIS_GLOB. I'll have to review that. */
-+ int i = 0, j = 0;
-+ while (p->fts_name[j] != 0)
-+ {
-+ escaped_name[i++] = '\\';
-+ escaped_name[i++] = ((u_char) p->fts_name[j] >> 6 & 07) + '0';
-+ escaped_name[i++] = ((u_char) p->fts_name[j] >> 3 & 07) + '0';
-+ escaped_name[i++] = ((u_char) p->fts_name[j] & 07) + '0';
-+ j++;
-+ }
-+ escaped_name[i++] = '\0';
-+#endif
-
- if (iflag || S_ISDIR(p->fts_statp->st_mode))
- offset = printf("%*s%s", indent, "", escaped_name);
-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-12-16 23:52:51.000000000 +0100
-+++ ./src/usr.sbin/mtree/spec.c 2005-12-16 23:52:43.000000000 +0100
-@@ -45,7 +45,6 @@
- #include <pwd.h>
- #include <stdio.h>
- #include <unistd.h>
--#include <vis.h>
- #include "mtree.h"
- #include "extern.h"
-
-@@ -143,8 +142,10 @@
- #define MAGIC "?*["
- if (strpbrk(p, MAGIC))
- centry->flags |= F_MAGIC;
-+#ifdef __FreeBSD__ /* this is just to detect invalid scape sequences */
- if (strunvis(centry->name, p) == -1)
- errx(1, "filename %s is ill-encoded", p);
-+#endif
- set(NULL, centry);
-
- if (!root) {
-@@ -228,11 +229,7 @@
- /* just set flag bit */
- break;
- case F_MODE:
-- if ((m = setmode(val)) == NULL)
-- errx(1, "line %d: invalid file mode %s",
-- lineno, val);
-- ip->st_mode = getmode(m, 0);
-- free(m);
-+ sscanf (val, "%o", &(ip->st_mode));
- break;
- case F_NLINK:
- ip->st_nlink = strtoul(val, &ep, 10);
-@@ -250,8 +247,10 @@
- ip->slink = malloc(strlen(val) + 1);
- if (ip->slink == NULL)
- errx(1, "malloc");
-- if (strunvis(ip->slink, val) == -1)
-- errx(1, "symlink %s is ill-encoded", val);
-+#ifdef __FreeBSD__ /* this is just to detect invalid scape sequences */
-+ if (strunvis(ip->slink, val) == -1)
-+ errx(1, "symlink %s is ill-encoded", val);
-+#endif
- break;
- #ifdef ST_MTIM
- case F_TIME:
--- src/usr.sbin/mtree/specspec.c~ 2005-12-17 11:59:50.000000000 +0100
+++ src/usr.sbin/mtree/specspec.c 2005-12-17 12:04:11.000000000 +0100
@@ -83,8 +83,6 @@
@@ -177,3 +55,215 @@
printf("\n");
}
+--- src/usr.bin/make/cond.c
++++ src/usr.bin/make/cond.c
+@@ -1115,7 +1115,7 @@
+ * Handle .else statement.
+ */
+ void
+-Cond_Else(char *line __unused, int code __unused, int lineno __unused)
++Cond_Else(char *line, int code, int lineno)
+ {
+
+ while (isspace((u_char)*line))
+@@ -1156,7 +1156,7 @@
+ * Handle .endif statement.
+ */
+ void
+-Cond_Endif(char *line __unused, int code __unused, int lineno __unused)
++Cond_Endif(char *line, int code, int lineno)
+ {
+
+ while (isspace((u_char)*line))
+--- src/usr.bin/make/job.c
++++ src/usr.bin/make/job.c
+@@ -473,7 +473,7 @@
+ }
+
+ static void
+-catch_child(int sig __unused)
++catch_child(int sig)
+ {
+ }
+
+@@ -2189,7 +2189,7 @@
+ */
+ void
+ #ifdef USE_KQUEUE
+-Job_CatchOutput(int flag __unused)
++Job_CatchOutput(int flag)
+ #else
+ Job_CatchOutput(int flag)
+ #endif
+--- src/usr.bin/make/parse.c
++++ src/usr.bin/make/parse.c
+@@ -2210,13 +2210,13 @@
+ }
+
+ static void
+-parse_include(char *file, int code __unused, int lineno __unused)
++parse_include(char *file, int code, int lineno)
+ {
+ xparse_include(file, 0);
+ }
+
+ static void
+-parse_sinclude(char *file, int code __unused, int lineno __unused)
++parse_sinclude(char *file, int code, int lineno)
+ {
+ xparse_include(file, 1);
+ }
+@@ -2230,7 +2230,7 @@
+ * a warning if the directive is malformed.
+ */
+ static void
+-parse_message(char *line, int iserror, int lineno __unused)
++parse_message(char *line, int iserror, int lineno)
+ {
+
+ if (!isspace((u_char)*line)) {
+@@ -2257,7 +2257,7 @@
+ * Parse an .undef directive.
+ */
+ static void
+-parse_undef(char *line, int code __unused, int lineno __unused)
++parse_undef(char *line, int code , int lineno)
+ {
+ char *cp;
+
+@@ -2279,7 +2279,7 @@
+ * Parse a .for directive.
+ */
+ static void
+-parse_for(char *line, int code __unused, int lineno)
++parse_for(char *line, int code, int lineno)
+ {
+
+ if (!For_For(line)) {
+@@ -2311,7 +2311,7 @@
+ * Parse endfor. This may only happen if there was no matching .for.
+ */
+ static void
+-parse_endfor(char *line __unused, int code __unused, int lineno __unused)
++parse_endfor(char *line, int code, int lineno)
+ {
+
+ Parse_Error(PARSE_FATAL, "for-less endfor");
+--- src/usr.bin/make/proc.h
++++ src/usr.bin/make/proc.h
+@@ -48,6 +48,6 @@
+ pid_t child_pid;
+ } ProcStuff;
+
+-void Proc_Exec(const ProcStuff *) __dead2;
++void Proc_Exec(const ProcStuff *);
+
+ #endif /* proc_h_458845848 */
+--- src/usr.bin/make/shell.c
++++ src/usr.bin/make/shell.c
+@@ -120,7 +120,7 @@
+ */
+ static struct Shells shells = TAILQ_HEAD_INITIALIZER(shells);
+
+-void ShellDump(const struct Shell *) __unused;
++void ShellDump(const struct Shell *);
+
+ /**
+ * Helper function for sorting the builtin list alphabetically.
+--- src/usr.bin/make/util.c
++++ src/usr.bin/make/util.c
+@@ -61,7 +61,7 @@
+ #include "targ.h"
+ #include "util.h"
+
+-static void enomem(void) __dead2;
++static void enomem(void);
+
+ /*-
+ * Debug --
+--- src/usr.bin/make/util.h
++++ src/usr.bin/make/util.h
+@@ -103,10 +103,10 @@
+ void Debug(const char *, ...);
+ void DebugM(const char *, ...);
+ void Error(const char *, ...);
+-void Fatal(const char *, ...) __dead2;
+-void Punt(const char *, ...) __dead2;
+-void DieHorribly(void) __dead2;
+-void Finish(int) __dead2;
++void Fatal(const char *, ...);
++void Punt(const char *, ...);
++void DieHorribly(void);
++void Finish(int);
+ char *estrdup(const char *);
+ void *emalloc(size_t);
+ void *erealloc(void *, size_t);
+--- src/usr.bin/make/var.c
++++ src/usr.bin/make/var.c
+@@ -248,7 +248,7 @@
+ * The trimmed word is added to the buffer.
+ */
+ static Boolean
+-VarHead(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
++VarHead(const char *word, Boolean addSpace, Buffer *buf, void *dummy)
+ {
+ char *slash;
+
+@@ -283,7 +283,7 @@
+ * The trimmed word is added to the buffer.
+ */
+ static Boolean
+-VarTail(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
++VarTail(const char *word, Boolean addSpace, Buffer *buf, void *dummy)
+ {
+ const char *slash;
+
+@@ -312,7 +312,7 @@
+ * The suffix from the word is placed in the buffer.
+ */
+ static Boolean
+-VarSuffix(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
++VarSuffix(const char *word, Boolean addSpace, Buffer *buf, void *dummy)
+ {
+ const char *dot;
+
+@@ -340,7 +340,7 @@
+ * The trimmed word is added to the buffer.
+ */
+ static Boolean
+-VarRoot(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
++VarRoot(const char *word, Boolean addSpace, Buffer *buf, void *dummy)
+ {
+ char *dot;
+
+--- src/usr.bin/yacc/main.c
++++ src/usr.bin/yacc/main.c
+@@ -114,7 +114,7 @@
+
+ volatile sig_atomic_t sigdie;
+
+-__dead2 void
++ void
+ done(k)
+ int k;
+ {
+@@ -128,7 +128,7 @@
+
+ static void
+ onintr(signo)
+- int signo __unused;
++ int signo;
+ {
+ sigdie = 1;
+ done(1);
+--- src/usr.sbin/mtree/compare.c
++++ src/usr.sbin/mtree/compare.c
+@@ -72,7 +72,7 @@
+ }
+
+ int
+-compare(char *name __unused, NODE *s, FTSENT *p)
++compare(char *name , NODE *s, FTSENT *p)
+ {
+ struct timeval tv[2];
+ uint32_t val;
Deleted: trunk/freebsd-buildutils/debian/patches/12_unused.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/12_unused.diff 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/patches/12_unused.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -1,28 +0,0 @@
-
- sed in debian/rules deletes "__unused" everywhere,
- fix consequences now
-
-diff -ur src/usr.bin/yacc/skeleton.c src/usr.bin/yacc/skeleton.c
---- src/usr.bin/yacc/skeleton.c
-+++ src/usr.bin/yacc/skeleton.c
-@@ -60,9 +60,6 @@
- {
- "#include <stdlib.h>",
- "#ifndef lint",
-- "#ifdef ",
-- " ",
-- "#endif",
- "static char const ",
- "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $\";",
- "#endif",
-diff -ur src/usr.bin/lex/flex.skl src/usr.bin/lex/flex.skl
---- src/usr.bin/lex/flex.skl
-+++ src/usr.bin/lex/flex.skl
-@@ -8,7 +8,6 @@
- #if defined(__FreeBSD__)
- #include <sys/cdefs.h>
- #else
--#define
- #endif
-
- #define FLEX_SCANNER
Deleted: trunk/freebsd-buildutils/debian/patches/13_bsd_sys.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/13_bsd_sys.diff 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/patches/13_bsd_sys.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -1,14 +0,0 @@
- do not add -Wno-pointer-sign,
- kfreebsd-6 still uses gcc-3.4
-
---- src/share/mk/bsd.sys.mk
-+++ src/share/mk/bsd.sys.mk
-@@ -55,7 +55,7 @@
- CWARNFLAGS += -Wno-uninitialized
- . endif
- . if !defined(WITH_GCC3)
--CWARNFLAGS += -Wno-pointer-sign
-+#CWARNFLAGS += -Wno-pointer-sign
- . endif
- . endif
-
Modified: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff 2010-04-10 14:29:22 UTC (rev 3011)
@@ -52,8 +52,8 @@
CFLAGS+= -I. -I${.CURDIR}
DPADD= ${LIBL} ${LIBSBUF}
--LDADD+= -ll -lsbuf
-+LDADD+= -ll
+-LDADD= -ll -lsbuf -lbsd
++LDADD= -ll -lbsd
CLEANFILES+= kernconf.c
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/debian/rules 2010-04-10 14:29:22 UTC (rev 3011)
@@ -15,10 +15,9 @@
SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
ORIGDIR=freebsd-buildutils-$(VERSION)
PMAKE=pmake
-CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE --include bsd/string.h --include bsd/random.h -I$(CURDIR)/build-tree/src/sys
+CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
MAKE_BUILD_FLAGS= CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
YACC=$(CURDIR)/build-tree/src/usr.bin/yacc/yacc
-export LDADD=-lbsd
package=freebsd-buildutils
@@ -36,11 +35,6 @@
mkdir build-tree
tar -C build-tree -xzf src.tar.gz
find build-tree -type d -name CVS | xargs rm -rf
- find build-tree -type f | (set -e ; while read i ; do sed -i $$i \
- -e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/sys/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
- -e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*/ /g" \
- -e "s/getline/bsd_&/g" \
- ; done)
set -e ; for i in \
build-tree/ports/Mk/bsd.port.mk \
build-tree/ports/Mk/bsd.port.subdir.mk \
Modified: trunk/freebsd-buildutils/fetch
===================================================================
--- trunk/freebsd-buildutils/fetch 2010-04-10 11:02:36 UTC (rev 3010)
+++ trunk/freebsd-buildutils/fetch 2010-04-10 14:29:22 UTC (rev 3011)
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex
-ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+ANONCVS=:pserver:anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
RELENG=RELENG_7_2_0_RELEASE
RPORTS=RELEASE_7_2_0
More information about the Glibc-bsd-commits
mailing list