[Glibc-bsd-commits] r3960 - in trunk/freebsd-buildutils/debian: . local local/include local/include/asm local/include/bits local/include/linux local/include/machine local/include/sys patches
Robert Millan
rmh at alioth.debian.org
Sat Jan 7 19:35:18 UTC 2012
Author: rmh
Date: 2012-01-07 19:35:18 +0000 (Sat, 07 Jan 2012)
New Revision: 3960
Added:
trunk/freebsd-buildutils/debian/local/
trunk/freebsd-buildutils/debian/local/include/
trunk/freebsd-buildutils/debian/local/include/aio.h
trunk/freebsd-buildutils/debian/local/include/asm/
trunk/freebsd-buildutils/debian/local/include/asm/stat.h
trunk/freebsd-buildutils/debian/local/include/bits/
trunk/freebsd-buildutils/debian/local/include/bits/stat.h
trunk/freebsd-buildutils/debian/local/include/bits/utmp.h
trunk/freebsd-buildutils/debian/local/include/bits/utmpx.h
trunk/freebsd-buildutils/debian/local/include/linux/
trunk/freebsd-buildutils/debian/local/include/linux/icmp.h
trunk/freebsd-buildutils/debian/local/include/linux/sysctl.h
trunk/freebsd-buildutils/debian/local/include/machine/
trunk/freebsd-buildutils/debian/local/include/machine/endian.h
trunk/freebsd-buildutils/debian/local/include/netdb.h
trunk/freebsd-buildutils/debian/local/include/sys/
trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h
trunk/freebsd-buildutils/debian/local/include/sys/endian.h
trunk/freebsd-buildutils/debian/local/include/sys/stat.h
trunk/freebsd-buildutils/debian/local/include/sys/types.h
trunk/freebsd-buildutils/debian/local/include/unistd.h
trunk/freebsd-buildutils/debian/local/include/vis.h
Removed:
trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/00_upstream.diff
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/03_glibc.diff
trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff
trunk/freebsd-buildutils/debian/patches/21_endian.diff
trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
trunk/freebsd-buildutils/debian/patches/series
trunk/freebsd-buildutils/debian/rules
Log:
New upstream release
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/changelog 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,3 +1,9 @@
+freebsd-buildutils (9.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Sat, 07 Jan 2012 20:34:01 +0100
+
freebsd-buildutils (8.2-8) unstable; urgency=low
[ Matthias Klose ]
Added: trunk/freebsd-buildutils/debian/local/include/aio.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/aio.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/aio.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <aio.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/asm/stat.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/asm/stat.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/asm/stat.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <asm/stat.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/bits/stat.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/bits/stat.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/bits/stat.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/stat.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/bits/utmp.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/bits/utmp.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/bits/utmp.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/utmp.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/bits/utmpx.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/bits/utmpx.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/bits/utmpx.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <bits/utmpx.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/linux/icmp.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/linux/icmp.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/linux/icmp.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <linux/icmp.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/linux/sysctl.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/linux/sysctl.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/linux/sysctl.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <linux/sysctl.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/machine/endian.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/machine/endian.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/machine/endian.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,7 @@
+#ifndef _MACHINE_ENDIAN_H_
+#define _MACHINE_ENDIAN_H_
+#include_next <endian.h>
+#define _LITTLE_ENDIAN LITTLE_ENDIAN
+#define _BIG_ENDIAN BIG_ENDIAN
+#define _BYTE_ORDER BYTE_ORDER
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/netdb.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/netdb.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/netdb.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,3 @@
+#undef __unused
+#include_next <netdb.h>
+#define __unused __attribute__((__unused__))
Added: trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,9 @@
+#ifndef _SYS_CDEFS_H_
+#define _SYS_CDEFS_H_
+#include_next <sys/cdefs.h>
+#define __FBSDID(s)
+#define __dead2 __attribute__((__noreturn__))
+#define __unused __attribute__((__unused__))
+#define __printflike(fmtarg, firstvararg) \
+ __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/sys/endian.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/endian.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/sys/endian.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,4 @@
+#ifndef _SYS_ENDIAN_H_
+#define _SYS_ENDIAN_H_
+#include_next <machine/endian.h>
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/sys/stat.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/stat.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/sys/stat.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,7 @@
+#ifndef _SYS_STAT_H_
+#define _SYS_STAT_H_
+#include_next <sys/stat.h>
+#ifndef S_ISTXT
+#define S_ISTXT S_ISVTX
+#endif
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/sys/types.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/types.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/sys/types.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,7 @@
+#ifndef _SYS_TYPES_H_
+#define _SYS_TYPES_H_
+#include_next <sys/types.h>
+#include <sys/cdefs.h>
+#include <machine/endian.h>
+#include <stdint.h> /* uintXX_t */
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/unistd.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/unistd.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/unistd.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1,9 @@
+#ifndef _UNISTD_H_
+#define _UNISTD_H_
+#include_next <unistd.h>
+
+#define getopt(argc, argv, options) bsd_getopt(argc, argv, options)
+int bsd_getopt(int, char **, char *);
+extern int optreset;
+
+#endif
Added: trunk/freebsd-buildutils/debian/local/include/vis.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/vis.h (rev 0)
+++ trunk/freebsd-buildutils/debian/local/include/vis.h 2012-01-07 19:35:18 UTC (rev 3960)
@@ -0,0 +1 @@
+#include <bsd/vis.h>
Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,55 +1,21 @@
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -63,7 +63,9 @@
-
- #include <sys/param.h>
- #include <sys/stat.h>
-+#ifdef __FreeBSD__
- #include <sys/sysctl.h>
-+#endif
- #include <sys/time.h>
- #include <sys/queue.h>
- #include <sys/resource.h>
-@@ -914,6 +916,7 @@
+@@ -929,6 +929,7 @@
}
#endif
+#ifdef __FreeBSD__
/*
- * Prior to 7.0, FreeBSD/pc98 kernel used to set the
- * utsname.machine to "i386", and MACHINE was defined as
-@@ -933,6 +936,7 @@
- machine = "pc98";
- }
+ * Get the name of this type of MACHINE from utsname
+ * so we can share an executable for similar machines.
+@@ -952,6 +953,7 @@
+ machine_arch = "unknown";
+ #endif
}
+#endif
/*
- * Get the name of this type of MACHINE from utsname
---- a/src/usr.sbin/config/main.c
-+++ b/src/usr.sbin/config/main.c
-@@ -56,6 +56,9 @@
- #include <sysexits.h>
- #include <unistd.h>
- #include <dirent.h>
-+#ifndef _DIRENT_HAVE_D_NAMLEN
-+#include <string.h> /* strlen */
-+#endif
- #include "y.tab.h"
- #include "config.h"
- #include "configvers.h"
-@@ -618,7 +621,11 @@
- if ((dirp = opendir(p)) == NULL)
- err(EX_OSERR, "opendir %s", p);
- while ((dp = readdir(dirp)) != NULL) {
-+#ifdef _DIRENT_HAVE_D_NAMLEN
- i = dp->d_namlen - 2;
-+#else
-+ i = strlen (dp->d_name) - 2;
-+#endif
- /* Skip non-headers */
- if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
- continue;
+ * Set machine_cpu to the minumum supported CPU revision based
--- a/src/usr.sbin/mtree/compare.c
+++ b/src/usr.sbin/mtree/compare.c
@@ -176,21 +176,22 @@
@@ -62,17 +28,16 @@
* Catches nano-second differences, but doesn't display them.
*/
if ((s->flags & F_TIME) &&
-- ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtimespec.tv_sec) ||
-- (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtimespec.tv_nsec))) {
-+ ((s->ST_MTIM.tv_sec != p->fts_statp->ST_MTIM.tv_sec) ||
-+ (s->ST_MTIM.tv_nsec != p->fts_statp->ST_MTIM.tv_nsec))) {
+- ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtim.tv_sec) ||
+- (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) {
++ ((s->ST_MTIM.tv_sec != p->fts_statp->st_mtim.tv_sec) ||
++ (s->ST_MTIM.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) {
LABEL;
(void)printf("%smodification time expected %.24s ",
- tab, ctime(&s->st_mtimespec.tv_sec));
+ tab, ctime(&s->ST_MTIM.tv_sec));
(void)printf("found %.24s",
-- ctime(&p->fts_statp->st_mtimespec.tv_sec));
-+ ctime(&p->fts_statp->ST_MTIM.tv_sec));
+ ctime(&p->fts_statp->st_mtim.tv_sec));
if (uflag) {
- tv[0].tv_sec = s->st_mtimespec.tv_sec;
- tv[0].tv_usec = s->st_mtimespec.tv_nsec / 1000;
@@ -107,22 +72,7 @@
char *new_digest, buf[33];
--- a/src/usr.sbin/mtree/create.c
+++ b/src/usr.sbin/mtree/create.c
-@@ -211,10 +211,12 @@
- if (keys & F_SIZE)
- output(indent, &offset, "size=%jd",
- (intmax_t)p->fts_statp->st_size);
-+#ifdef ST_MTIM
- if (keys & F_TIME)
- output(indent, &offset, "time=%ld.%09ld",
-- (long)p->fts_statp->st_mtimespec.tv_sec,
-- p->fts_statp->st_mtimespec.tv_nsec);
-+ (long)p->fts_statp->ST_MTIM.tv_sec,
-+ p->fts_statp->ST_MTIM.tv_nsec);
-+#endif
- if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
- if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
- crc(fd, &val, &len))
-@@ -265,11 +267,13 @@
+@@ -265,11 +265,13 @@
if (keys & F_SLINK &&
(p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
output(indent, &offset, "link=%s", rlink(p->fts_accpath));
@@ -136,7 +86,7 @@
(void)putchar('\n');
}
-@@ -328,6 +332,7 @@
+@@ -328,6 +330,7 @@
maxuid = u[suid];
}
@@ -144,7 +94,7 @@
/*
* XXX
* note that the below will break when file flags
-@@ -341,6 +346,7 @@
+@@ -341,6 +344,7 @@
saveflags = sflags;
maxflags = f[FLAGS2IDX(sflags)];
}
@@ -152,7 +102,7 @@
}
}
/*
-@@ -384,11 +390,13 @@
+@@ -384,11 +388,13 @@
(void)printf(" mode=%#o", savemode);
if (keys & F_NLINK)
(void)printf(" nlink=1");
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -65,7 +65,7 @@
.PHONY: ${INSTALLINFODIRS}
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -161,9 +161,9 @@
+@@ -151,9 +151,9 @@
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -77,7 +77,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -178,9 +178,9 @@
+@@ -168,9 +168,9 @@
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -89,7 +89,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -197,16 +197,16 @@
+@@ -191,16 +191,16 @@
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${.TARGET} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
@@ -107,9 +107,9 @@
- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+ `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
.endif
- .if defined(CTFMERGE)
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -276,11 +276,11 @@
+ @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+ (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
+@@ -270,11 +270,11 @@
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -166,7 +166,7 @@
#
# BINMODE Binary mode. [555]
#
-@@ -56,7 +56,7 @@
+@@ -58,7 +58,7 @@
#
# SHAREOWN ASCII text file owner. [root]
#
@@ -175,7 +175,7 @@
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
-@@ -113,7 +113,7 @@
+@@ -124,7 +124,7 @@
# Binaries
BINOWN?= root
@@ -184,7 +184,7 @@
BINMODE?= 555
NOBINMODE?= 444
-@@ -139,7 +139,7 @@
+@@ -151,7 +151,7 @@
# Share files
SHAREDIR?= /usr/share
SHAREOWN?= root
@@ -192,7 +192,7 @@
+SHAREGRP?= root
SHAREMODE?= ${NOBINMODE}
- MANDIR?= ${SHAREDIR}/man/man
+ CONFDIR?= /etc
--- a/src/share/mk/sys.mk
+++ b/src/share/mk/sys.mk
@@ -1,8 +1,7 @@
@@ -203,5 +203,15 @@
-.FreeBSD ?= true
+unix ?= We run Debian, not UNIX.
- # If the special target .POSIX appears (without prerequisites or
- # commands) before the first noncomment line in the makefile, make shall
+ .if !defined(%POSIX)
+ #
+@@ -68,9 +67,6 @@
+ # C Type Format data is required for DTrace
+ CTFFLAGS ?= -L VERSION
+
+-CTFCONVERT ?= ctfconvert
+-CTFMERGE ?= ctfmerge
+-DTRACE ?= dtrace
+ .if defined(CFLAGS) && (${CFLAGS:M-g} != "")
+ CTFFLAGS += -g
+ .else
Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -9,188 +9,12 @@
printf("\n");
}
---- a/src/usr.bin/make/cond.c
-+++ b/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))
---- a/src/usr.bin/make/job.c
-+++ b/src/usr.bin/make/job.c
-@@ -478,7 +478,7 @@
- }
-
- static void
--catch_child(int sig __unused)
-+catch_child(int sig)
- {
- }
-
-@@ -2194,7 +2194,7 @@
- */
- void
- #ifdef USE_KQUEUE
--Job_CatchOutput(int flag __unused)
-+Job_CatchOutput(int flag)
- #else
- Job_CatchOutput(int flag)
- #endif
---- a/src/usr.bin/make/parse.c
-+++ b/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");
---- a/src/usr.bin/make/shell.c
-+++ b/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.
---- a/src/usr.bin/make/var.c
-+++ b/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;
-
---- a/src/usr.bin/yacc/main.c
-+++ b/src/usr.bin/yacc/main.c
-@@ -128,7 +128,7 @@
-
- static void
- onintr(signo)
-- int signo __unused;
-+ int signo;
- {
- sigdie = 1;
- done(1);
---- a/src/usr.sbin/mtree/compare.c
-+++ b/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;
---- a/src/usr.sbin/btxld/elfh.h
-+++ b/src/usr.sbin/btxld/elfh.h
-@@ -26,7 +26,7 @@
- * $FreeBSD$
- */
-
--#include <sys/elf32.h>
-+#include "elf32.h"
-
- struct elfh {
- Elf32_Ehdr e; /* ELF header */
--- a/src/usr.sbin/mtree/Makefile
+++ b/src/usr.sbin/mtree/Makefile
-@@ -10,8 +10,4 @@
+@@ -8,8 +8,4 @@
+ SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
+ SRCS+= specspec.c
- WARNS?= 4
-
-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
-DPADD= ${LIBMD}
-LDADD= -lmd
Deleted: trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/07_brandelf.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/07_brandelf.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,318 +0,0 @@
----
- src/usr.bin/brandelf/brandelf.c | 2
- src/usr.bin/brandelf/elf_common.h | 299 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 300 insertions(+), 1 deletion(-)
-
---- a/src/usr.bin/brandelf/brandelf.c
-+++ b/src/usr.bin/brandelf/brandelf.c
-@@ -31,7 +31,7 @@
- __FBSDID("$FreeBSD$");
-
- #include <sys/types.h>
--#include <sys/elf_common.h>
-+#include "elf_common.h"
- #include <sys/errno.h>
- #include <err.h>
- #include <fcntl.h>
---- /dev/null
-+++ b/src/usr.bin/brandelf/elf_common.h
-@@ -0,0 +1,299 @@
-+/*-
-+ * Copyright (c) 1998 John D. Polstra.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.15 2004/05/05 02:38:54 marcel Exp $
-+ */
-+
-+#ifndef _SYS_ELF_COMMON_H_
-+#define _SYS_ELF_COMMON_H_ 1
-+
-+/*
-+ * ELF definitions that are independent of architecture or word size.
-+ */
-+
-+/*
-+ * Note header. The ".note" section contains an array of notes. Each
-+ * begins with this header, aligned to a word boundary. Immediately
-+ * following the note header is n_namesz bytes of name, padded to the
-+ * next word boundary. Then comes n_descsz bytes of descriptor, again
-+ * padded to a word boundary. The values of n_namesz and n_descsz do
-+ * not include the padding.
-+ */
-+
-+typedef struct {
-+ u_int32_t n_namesz; /* Length of name. */
-+ u_int32_t n_descsz; /* Length of descriptor. */
-+ u_int32_t n_type; /* Type of this note. */
-+} Elf_Note;
-+
-+/* Indexes into the e_ident array. Keep synced with
-+ http://www.sco.com/developer/gabi/ch4.eheader.html */
-+#define EI_MAG0 0 /* Magic number, byte 0. */
-+#define EI_MAG1 1 /* Magic number, byte 1. */
-+#define EI_MAG2 2 /* Magic number, byte 2. */
-+#define EI_MAG3 3 /* Magic number, byte 3. */
-+#define EI_CLASS 4 /* Class of machine. */
-+#define EI_DATA 5 /* Data format. */
-+#define EI_VERSION 6 /* ELF format version. */
-+#define EI_OSABI 7 /* Operating system / ABI identification */
-+#define EI_ABIVERSION 8 /* ABI version */
-+#define OLD_EI_BRAND 8 /* Start of architecture identification. */
-+#define EI_PAD 9 /* Start of padding (per SVR4 ABI). */
-+#define EI_NIDENT 16 /* Size of e_ident array. */
-+
-+/* Values for the magic number bytes. */
-+#define ELFMAG0 0x7f
-+#define ELFMAG1 'E'
-+#define ELFMAG2 'L'
-+#define ELFMAG3 'F'
-+#define ELFMAG "\177ELF" /* magic string */
-+#define SELFMAG 4 /* magic string size */
-+
-+/* Values for e_ident[EI_VERSION] and e_version. */
-+#define EV_NONE 0
-+#define EV_CURRENT 1
-+
-+/* Values for e_ident[EI_CLASS]. */
-+#define ELFCLASSNONE 0 /* Unknown class. */
-+#define ELFCLASS32 1 /* 32-bit architecture. */
-+#define ELFCLASS64 2 /* 64-bit architecture. */
-+
-+/* Values for e_ident[EI_DATA]. */
-+#define ELFDATANONE 0 /* Unknown data format. */
-+#define ELFDATA2LSB 1 /* 2's complement little-endian. */
-+#define ELFDATA2MSB 2 /* 2's complement big-endian. */
-+
-+/* Values for e_ident[EI_OSABI]. */
-+#define ELFOSABI_SYSV 0 /* UNIX System V ABI */
-+#define ELFOSABI_NONE ELFOSABI_SYSV /* symbol used in old spec */
-+#define ELFOSABI_HPUX 1 /* HP-UX operating system */
-+#define ELFOSABI_NETBSD 2 /* NetBSD */
-+#define ELFOSABI_LINUX 3 /* GNU/Linux */
-+#define ELFOSABI_HURD 4 /* GNU/Hurd */
-+#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */
-+#define ELFOSABI_SOLARIS 6 /* Solaris */
-+#define ELFOSABI_MONTEREY 7 /* Monterey */
-+#define ELFOSABI_IRIX 8 /* IRIX */
-+#define ELFOSABI_FREEBSD 9 /* FreeBSD */
-+#define ELFOSABI_TRU64 10 /* TRU64 UNIX */
-+#define ELFOSABI_MODESTO 11 /* Novell Modesto */
-+#define ELFOSABI_OPENBSD 12 /* OpenBSD */
-+#define ELFOSABI_ARM 97 /* ARM */
-+#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
-+
-+/* e_ident */
-+#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \
-+ (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \
-+ (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \
-+ (ehdr).e_ident[EI_MAG3] == ELFMAG3)
-+
-+/* Values for e_type. */
-+#define ET_NONE 0 /* Unknown type. */
-+#define ET_REL 1 /* Relocatable. */
-+#define ET_EXEC 2 /* Executable. */
-+#define ET_DYN 3 /* Shared object. */
-+#define ET_CORE 4 /* Core file. */
-+
-+/* Values for e_machine. */
-+#define EM_NONE 0 /* Unknown machine. */
-+#define EM_M32 1 /* AT&T WE32100. */
-+#define EM_SPARC 2 /* Sun SPARC. */
-+#define EM_386 3 /* Intel i386. */
-+#define EM_68K 4 /* Motorola 68000. */
-+#define EM_88K 5 /* Motorola 88000. */
-+#define EM_486 6 /* Intel i486. */
-+#define EM_860 7 /* Intel i860. */
-+#define EM_MIPS 8 /* MIPS R3000 Big-Endian only */
-+
-+/* Extensions. This list is not complete. */
-+#define EM_S370 9 /* IBM System/370 */
-+#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ /* Depreciated */
-+#define EM_PARISC 15 /* HPPA */
-+#define EM_SPARC32PLUS 18 /* SPARC v8plus */
-+#define EM_PPC 20 /* PowerPC 32-bit */
-+#define EM_PPC64 21 /* PowerPC 64-bit */
-+#define EM_ARM 40 /* ARM */
-+#define EM_SPARCV9 43 /* SPARC v9 64-bit */
-+#define EM_IA_64 50 /* Intel IA-64 Processor */
-+#define EM_X86_64 62 /* Advanced Micro Devices x86-64 */
-+#define EM_ALPHA 0x9026 /* Alpha (written in the absence of an ABI */
-+
-+/* Special section indexes. */
-+#define SHN_UNDEF 0 /* Undefined, missing, irrelevant. */
-+#define SHN_LORESERVE 0xff00 /* First of reserved range. */
-+#define SHN_LOPROC 0xff00 /* First processor-specific. */
-+#define SHN_HIPROC 0xff1f /* Last processor-specific. */
-+#define SHN_ABS 0xfff1 /* Absolute values. */
-+#define SHN_COMMON 0xfff2 /* Common data. */
-+#define SHN_HIRESERVE 0xffff /* Last of reserved range. */
-+
-+/* sh_type */
-+#define SHT_NULL 0 /* inactive */
-+#define SHT_PROGBITS 1 /* program defined information */
-+#define SHT_SYMTAB 2 /* symbol table section */
-+#define SHT_STRTAB 3 /* string table section */
-+#define SHT_RELA 4 /* relocation section with addends */
-+#define SHT_HASH 5 /* symbol hash table section */
-+#define SHT_DYNAMIC 6 /* dynamic section */
-+#define SHT_NOTE 7 /* note section */
-+#define SHT_NOBITS 8 /* no space section */
-+#define SHT_REL 9 /* relocation section - no addends */
-+#define SHT_SHLIB 10 /* reserved - purpose unknown */
-+#define SHT_DYNSYM 11 /* dynamic symbol table section */
-+#define SHT_NUM 12 /* number of section types */
-+#define SHT_LOOS 0x60000000 /* First of OS specific semantics */
-+#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */
-+#define SHT_LOPROC 0x70000000 /* reserved range for processor */
-+#define SHT_HIPROC 0x7fffffff /* specific section header types */
-+#define SHT_LOUSER 0x80000000 /* reserved range for application */
-+#define SHT_HIUSER 0xffffffff /* specific indexes */
-+
-+/* Flags for sh_flags. */
-+#define SHF_WRITE 0x1 /* Section contains writable data. */
-+#define SHF_ALLOC 0x2 /* Section occupies memory. */
-+#define SHF_EXECINSTR 0x4 /* Section contains instructions. */
-+#define SHF_TLS 0x400 /* Section contains TLS data. */
-+#define SHF_MASKPROC 0xf0000000 /* Reserved for processor-specific. */
-+
-+/* Values for p_type. */
-+#define PT_NULL 0 /* Unused entry. */
-+#define PT_LOAD 1 /* Loadable segment. */
-+#define PT_DYNAMIC 2 /* Dynamic linking information segment. */
-+#define PT_INTERP 3 /* Pathname of interpreter. */
-+#define PT_NOTE 4 /* Auxiliary information. */
-+#define PT_SHLIB 5 /* Reserved (not used). */
-+#define PT_PHDR 6 /* Location of program header itself. */
-+#define PT_TLS 7 /* Thread local storage segment */
-+
-+#define PT_COUNT 8 /* Number of defined p_type values. */
-+
-+#define PT_LOOS 0x60000000 /* OS-specific */
-+#define PT_HIOS 0x6fffffff /* OS-specific */
-+#define PT_LOPROC 0x70000000 /* First processor-specific type. */
-+#define PT_HIPROC 0x7fffffff /* Last processor-specific type. */
-+
-+/* Values for p_flags. */
-+#define PF_X 0x1 /* Executable. */
-+#define PF_W 0x2 /* Writable. */
-+#define PF_R 0x4 /* Readable. */
-+
-+/* Values for d_tag. */
-+#define DT_NULL 0 /* Terminating entry. */
-+#define DT_NEEDED 1 /* String table offset of a needed shared
-+ library. */
-+#define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */
-+#define DT_PLTGOT 3 /* Processor-dependent address. */
-+#define DT_HASH 4 /* Address of symbol hash table. */
-+#define DT_STRTAB 5 /* Address of string table. */
-+#define DT_SYMTAB 6 /* Address of symbol table. */
-+#define DT_RELA 7 /* Address of ElfNN_Rela relocations. */
-+#define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */
-+#define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */
-+#define DT_STRSZ 10 /* Size of string table. */
-+#define DT_SYMENT 11 /* Size of each symbol table entry. */
-+#define DT_INIT 12 /* Address of initialization function. */
-+#define DT_FINI 13 /* Address of finalization function. */
-+#define DT_SONAME 14 /* String table offset of shared object
-+ name. */
-+#define DT_RPATH 15 /* String table offset of library path. [sup] */
-+#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. [sup] */
-+#define DT_REL 17 /* Address of ElfNN_Rel relocations. */
-+#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */
-+#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */
-+#define DT_PLTREL 20 /* Type of relocation used for PLT. */
-+#define DT_DEBUG 21 /* Reserved (not used). */
-+#define DT_TEXTREL 22 /* Indicates there may be relocations in
-+ non-writable segments. [sup] */
-+#define DT_JMPREL 23 /* Address of PLT relocations. */
-+#define DT_BIND_NOW 24 /* [sup] */
-+#define DT_INIT_ARRAY 25 /* Address of the array of pointers to
-+ initialization functions */
-+#define DT_FINI_ARRAY 26 /* Address of the array of pointers to
-+ termination functions */
-+#define DT_INIT_ARRAYSZ 27 /* Size in bytes of the array of
-+ initialization functions. */
-+#define DT_FINI_ARRAYSZ 28 /* Size in bytes of the array of
-+ terminationfunctions. */
-+#define DT_RUNPATH 29 /* String table offset of a null-terminated
-+ library search path string. */
-+#define DT_FLAGS 30 /* Object specific flag values. */
-+#define DT_ENCODING 32 /* Values greater than or equal to DT_ENCODING
-+ and less than DT_LOOS follow the rules for
-+ the interpretation of the d_un union
-+ as follows: even == 'd_ptr', even == 'd_val'
-+ or none */
-+#define DT_PREINIT_ARRAY 32 /* Address of the array of pointers to
-+ pre-initialization functions. */
-+#define DT_PREINIT_ARRAYSZ 33 /* Size in bytes of the array of
-+ pre-initialization functions. */
-+
-+#define DT_COUNT 33 /* Number of defined d_tag values. */
-+
-+#define DT_LOOS 0x6000000d /* First OS-specific */
-+#define DT_HIOS 0x6fff0000 /* Last OS-specific */
-+#define DT_LOPROC 0x70000000 /* First processor-specific type. */
-+#define DT_HIPROC 0x7fffffff /* Last processor-specific type. */
-+
-+/* Values for DT_FLAGS */
-+#define DF_ORIGIN 0x0001 /* Indicates that the object being loaded may
-+ make reference to the $ORIGIN substitution
-+ string */
-+#define DF_SYMBOLIC 0x0002 /* Indicates "symbolic" linking. */
-+#define DF_TEXTREL 0x0004 /* Indicates there may be relocations in
-+ non-writable segments. */
-+#define DF_BIND_NOW 0x0008 /* Indicates that the dynamic linker should
-+ process all relocations for the object
-+ containing this entry before transferring
-+ control to the program. */
-+#define DF_STATIC_TLS 0x0010 /* Indicates that the shared object or
-+ executable contains code using a static
-+ thread-local storage scheme. */
-+
-+/* Values for n_type. Used in core files. */
-+#define NT_PRSTATUS 1 /* Process status. */
-+#define NT_FPREGSET 2 /* Floating point registers. */
-+#define NT_PRPSINFO 3 /* Process state info. */
-+
-+/* Symbol Binding - ELFNN_ST_BIND - st_info */
-+#define STB_LOCAL 0 /* Local symbol */
-+#define STB_GLOBAL 1 /* Global symbol */
-+#define STB_WEAK 2 /* like global - lower precedence */
-+#define STB_LOPROC 13 /* reserved range for processor */
-+#define STB_HIPROC 15 /* specific symbol bindings */
-+
-+/* Symbol type - ELFNN_ST_TYPE - st_info */
-+#define STT_NOTYPE 0 /* Unspecified type. */
-+#define STT_OBJECT 1 /* Data object. */
-+#define STT_FUNC 2 /* Function. */
-+#define STT_SECTION 3 /* Section. */
-+#define STT_FILE 4 /* Source file. */
-+#define STT_TLS 6 /* TLS object. */
-+#define STT_LOPROC 13 /* reserved range for processor */
-+#define STT_HIPROC 15 /* specific symbol types */
-+
-+/* Special symbol table indexes. */
-+#define STN_UNDEF 0 /* Undefined symbol index. */
-+
-+#endif /* !_SYS_ELF_COMMON_H_ */
Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -23,7 +23,7 @@
* Arch_ParseArchive --
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -250,6 +250,9 @@
+@@ -247,6 +247,9 @@
{
char *fname, *fnamesave; /* makefile to read */
FILE *stream;
@@ -33,45 +33,6 @@
char *name, path[MAXPATHLEN];
char *MAKEFILE;
int setMAKEFILE;
---- a/src/usr.sbin/config/main.c
-+++ b/src/usr.sbin/config/main.c
-@@ -71,6 +71,10 @@
- #define FALSE (0)
- #endif
-
-+#ifndef MAXPATHLEN
-+# define MAXPATHLEN 4096
-+#endif
-+
- #define CDIR "../compile/"
-
- char * PREFIX;
---- a/src/usr.sbin/config/mkmakefile.c
-+++ b/src/usr.sbin/config/mkmakefile.c
-@@ -65,6 +65,10 @@
- wd = word; \
- }
-
-+#ifndef MAXPATHLEN
-+# define MAXPATHLEN 4096
-+#endif
-+
- static char *tail(char *);
- static void do_clean(FILE *);
- static void do_rules(FILE *);
---- a/src/usr.sbin/config/mkoptions.c
-+++ b/src/usr.sbin/config/mkoptions.c
-@@ -48,6 +48,10 @@
- #include "config.h"
- #include "y.tab.h"
-
-+#ifndef MAXPATHLEN
-+# define MAXPATHLEN 4096
-+#endif
-+
- static struct users {
- int u_default;
- int u_min;
--- a/src/usr.sbin/mtree/create.c
+++ b/src/usr.sbin/mtree/create.c
@@ -67,6 +67,10 @@
Modified: trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -6,7 +6,7 @@
--- a/ports/Mk/bsd.port.mk
+++ b/ports/Mk/bsd.port.mk
-@@ -3487,7 +3487,7 @@
+@@ -3400,7 +3400,7 @@
.if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
@if [ -f "${AUDITFILE}" ]; then \
audit_created=`${_EXTRACT_AUDITFILE} | \
@@ -15,7 +15,7 @@
audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \
if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \
-@@ -3591,7 +3591,7 @@
+@@ -3504,7 +3504,7 @@
@cd ${_DISTDIR};\
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
@@ -24,7 +24,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
force_fetch=false; \
filebasename=$${file##*/}; \
-@@ -4732,7 +4732,7 @@
+@@ -4601,7 +4601,7 @@
@(cd ${_DISTDIR}; \
${_MASTER_SITES_ENV} ; \
for _file in ${DISTFILES}; do \
@@ -33,7 +33,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4769,7 +4769,7 @@
+@@ -4638,7 +4638,7 @@
@(cd ${_DISTDIR}; \
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
@@ -42,25 +42,25 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4805,7 +4805,7 @@
+@@ -4674,7 +4674,7 @@
@(cd ${_DISTDIR}; \
${_MASTER_SITES_ENV}; \
for _file in ${DISTFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
+ fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -4836,7 +4836,7 @@
+ if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
+@@ -4706,7 +4706,7 @@
@(cd ${_DISTDIR}; \
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
+ fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -5222,7 +5222,7 @@
+ if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
+@@ -5091,7 +5091,7 @@
.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
@for i in ${LIB_DEPENDS}; do \
lib=$${i%%:*}; \
@@ -69,7 +69,7 @@
dir=$${i#*:}; \
target=$${i##*:}; \
if ${TEST} $$dir = $$target; then \
-@@ -5486,7 +5486,7 @@
+@@ -5355,7 +5355,7 @@
.endif
BUILD-DEPENDS-LIST= \
@@ -78,7 +78,7 @@
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
-@@ -5767,7 +5767,7 @@
+@@ -5643,7 +5643,7 @@
done
@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
@@ -87,7 +87,7 @@
${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
done
.endfor
-@@ -5822,7 +5822,7 @@
+@@ -5698,7 +5698,7 @@
add-plist-docs:
.if defined(PORTDOCS) && !defined(NOPORTDOCS)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -96,7 +96,7 @@
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
fi
.for x in ${PORTDOCS}
-@@ -5845,7 +5845,7 @@
+@@ -5721,7 +5721,7 @@
add-plist-examples:
.if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -105,7 +105,7 @@
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
fi
.for x in ${PORTEXAMPLES}
-@@ -5869,7 +5869,7 @@
+@@ -5745,7 +5745,7 @@
add-plist-data:
.if defined(PORTDATA) && !defined(NOPORTDATA)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
Modified: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,23 +1,41 @@
----
- src/usr.bin/make/main.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -950,11 +950,11 @@
+@@ -932,7 +932,10 @@
+ }
+ #endif
+
+-#ifdef __FreeBSD__
++#ifndef MACHINE_ARCH
++#define MACHINE_ARCH "unknown"
++#endif
++
+ /*
+ * Get the name of this type of MACHINE from utsname
+ * so we can share an executable for similar machines.
+@@ -942,21 +945,21 @@
* run-time.
*/
- if (machine == NULL) {
-- static struct utsname utsname;
--
-- if (uname(&utsname) == -1)
-- err(2, "uname");
-- machine = utsname.machine;
-+#ifdef MACHINE_ARCH
+ if ((machine = getenv("MACHINE")) == NULL) {
++// __FreeBSD_kernel__
++#ifdef __FreeBSD__
+ static struct utsname utsname;
+
+ if (uname(&utsname) == -1)
+ err(2, "uname");
+ machine = utsname.machine;
++#else
+ machine = MACHINE_ARCH;
-+#else
-+ machine = "unknown";
+#endif
}
if ((machine_arch = getenv("MACHINE_ARCH")) == NULL) {
+-#ifdef MACHINE_ARCH
+ machine_arch = MACHINE_ARCH;
+-#else
+- machine_arch = "unknown";
+-#endif
+ }
+-#endif
+
+ /*
+ * Set machine_cpu to the minumum supported CPU revision based
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -4,7 +4,7 @@
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -169,7 +169,7 @@
+@@ -186,7 +186,7 @@
STRIP?= -s
.endif
Modified: trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -12,7 +12,7 @@
@echo 'make started.'
- cc -D__dead2="" -D__unused="" -Darc4random=random -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
- cc *.o -o pmake
-+ cc $(shell pkg-config --cflags libbsd-overlay) -DDEFSHELLNAME=\"sh\" -I. -c *.c
++ cc -D_GNU_SOURCE=1 -isystem ../../../../debian/local/include -DDEFSHELLNAME=\"sh\" -I. -c *.c -g
+ cc *.o -lbsd -o pmake
@echo 'make completed.'
Modified: trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -59,16 +59,15 @@
MOUNT_DEVFS?= ${MOUNT} -t devfs devfs
# XXX: this is a work-around for an obscure bug where
# mount -t nullfs returns zero status on errors within
-@@ -67,53 +67,36 @@
+@@ -67,27 +67,27 @@
OBJCOPY?= /usr/bin/objcopy
OBJDUMP?= /usr/bin/objdump
PASTE?= /usr/bin/paste
-PAX?= /bin/pax
+PAX?= /usr/bin/pax
PRINTF?= /usr/bin/printf
--PW?= /usr/sbin/pw
+ PW?= /usr/sbin/pw
-REALPATH?= /bin/realpath
-+
+REALPATH?= /bin/readlink -f
RM?= /bin/rm
RMDIR?= /bin/rmdir
@@ -79,10 +78,9 @@
SORT?= /usr/bin/sort
STRIP_CMD?= /usr/bin/strip
# Command to run commands as privileged user
--# Example: "/usr/local/bin/sudo sh -c" to use "sudo" instead of "su"
+ # Example: "/usr/local/bin/sudo sh -c" to use "sudo" instead of "su"
-SU_CMD?= /usr/bin/su root -c
-SYSCTL?= /sbin/sysctl
-+# Example: "/bin/sudo sh -c" to use "sudo" instead of "su"
+SU_CMD?= /bin/su root -c
+SYSCTL?= /bin/sysctl
TAIL?= /usr/bin/tail
@@ -91,40 +89,11 @@
TRUE?= true # Shell builtin
UMOUNT?= /sbin/umount
-UNAME?= /usr/bin/uname
--UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself
--UNZIP_CMD?= ${LOCALBASE}/bin/unzip
+UNAME?= /bin/uname
-+
-+UNZIP_CMD?= /usr/bin/unzip
+ UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself
+ UNZIP_CMD?= ${LOCALBASE}/bin/unzip
WHICH?= /usr/bin/which
- XARGS?= /usr/bin/xargs
--XMKMF?= ${LOCALBASE}/bin/xmkmf -a
-+XMKMF?= /usr/bin/xmkmf -a
- YACC?= /usr/bin/yacc
-
- XZ?= -Mmax
--.if exists(/usr/bin/xz)
- XZ_CMD?= /usr/bin/xz ${XZ}
--.else
--XZ_CMD?= ${LOCALBASE}/bin/xz ${XZ}
--.endif
--
--.if exists(/sbin/md5)
--MD5?= /sbin/md5
--.else
--MD5?= md5
--.endif
--.if exists(/sbin/sha256)
--SHA256?= /sbin/sha256
--.elif exists(${LOCALBASE}/sbin/sha256)
--SHA256?= ${LOCALBASE}/sbin/sha256
--.else
--SHA256?= NO
--.endif
-
- # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
- # or "true" if the make flag -s is given. Use ECHO_CMD where you mean
-@@ -123,18 +106,4 @@
+@@ -113,18 +113,4 @@
# Used to print all the '===>' style prompts - override this to turn them off.
ECHO_MSG?= ${ECHO_CMD}
@@ -143,3 +112,25 @@
-.endif
-
.endif
+--- a/ports/Mk/bsd.port.mk
++++ b/ports/Mk/bsd.port.mk
+@@ -1121,7 +1121,7 @@
+ # tree we are and thus can't go relative. They can, of course, be overridden
+ # by individual Makefiles or local system make configuration.
+ PORTSDIR?= /usr/ports
+-LOCALBASE?= /usr/local
++LOCALBASE?= /usr
+ X11BASE?= ${LOCALBASE}
+ LINUXBASE?= /compat/linux
+ DISTDIR?= ${PORTSDIR}/distfiles
+--- a/src/usr.bin/make/Makefile
++++ b/src/usr.bin/make/Makefile
+@@ -39,7 +39,7 @@
+ # not the trailing '\0', via the -l flag in emitc and some editing
+ # (only for directive_hash).
+
+-LOCALBASE ?= /usr/local
++LOCALBASE ?= /usr
+ MPH ?= ${LOCALBASE}/bin/mph
+ EMITC ?= ${LOCALBASE}/bin/emitc
+
Modified: trunk/freebsd-buildutils/debian/patches/21_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/21_endian.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/21_endian.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -7,25 +7,17 @@
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -68,6 +68,7 @@
- #endif
- #include <sys/time.h>
- #include <bsd/sys/queue.h>
-+#include <bsd/sys/endian.h>
- #include <bsd/err.h>
- #include <sys/resource.h>
- #include <sys/utsname.h>
-@@ -865,6 +866,7 @@
+@@ -873,6 +873,7 @@
+ const char *machine;
const char *machine_arch;
- const char *machine_multiarch;
const char *machine_cpu;
+ int machine_endian_little;
Boolean outOfDate = TRUE; /* FALSE if all targets up to date */
const char *p;
const char *pathp;
-@@ -1021,6 +1023,16 @@
+@@ -1002,6 +1003,16 @@
+ Var_SetGlobal("MACHINE", machine);
Var_SetGlobal("MACHINE_ARCH", machine_arch);
- Var_SetGlobal("MACHINE_MULTIARCH", machine_multiarch);
Var_SetGlobal("MACHINE_CPU", machine_cpu);
+ if (!Var_Exists("TARGET_BIG_ENDIAN", VAR_GLOBAL) && !Var_Exists("TARGET_LITTLE_ENDIAN", VAR_GLOBAL)) {
+ /*
Modified: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,5 +1,5 @@
---- freebsd-buildutils-8.2.orig/src/usr.bin/make/Makefile
-+++ freebsd-buildutils-8.2/src/usr.bin/make/Makefile
+--- a/src/usr.bin/make/Makefile
++++ b/src/usr.bin/make/Makefile
@@ -4,6 +4,7 @@
PROG= make
@@ -8,13 +8,49 @@
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
---- freebsd-buildutils-8.2.orig/src/usr.sbin/mtree/Makefile
-+++ freebsd-buildutils-8.2/src/usr.sbin/mtree/Makefile
-@@ -7,6 +7,7 @@ PROG= mtree
+--- a/src/usr.sbin/mtree/Makefile
++++ b/src/usr.sbin/mtree/Makefile
+@@ -7,5 +7,6 @@
MAN= mtree.8 mtree.5
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c
+LDADD+= -lbsd
- WARNS?= 4
+ .include <bsd.prog.mk>
+--- a/src/usr.bin/brandelf/Makefile
++++ b/src/usr.bin/brandelf/Makefile
+@@ -1,5 +1,6 @@
+ # $FreeBSD$
+ PROG= brandelf
++LDADD= -lbsd
+
+ .include <bsd.prog.mk>
+--- a/src/usr.bin/cksum/Makefile
++++ b/src/usr.bin/cksum/Makefile
+@@ -3,6 +3,7 @@
+
+ PROG= cksum
+ SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c
++LDADD+= -lbsd
+ SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum
+ MLINKS= cksum.1 sum.1
+
+--- a/src/usr.bin/file2c/Makefile
++++ b/src/usr.bin/file2c/Makefile
+@@ -1,4 +1,5 @@
+ # $FreeBSD$
+
+ PROG= file2c
++LDADD+= -lbsd
+ .include <bsd.prog.mk>
+--- a/src/usr.bin/yacc/Makefile
++++ b/src/usr.bin/yacc/Makefile
+@@ -4,6 +4,7 @@
+ PROG= yacc
+ SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
+ skeleton.c symtab.c verbose.c warshall.c
++LDADD+= -lbsd
+ SCRIPTS=yyfix.sh
+ MAN= yacc.1 yyfix.1
+ SIMLINKS= ${BINDIR}/yacc ${BINDIR}/byacc
Deleted: trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/23_mkdep_undef.diff 2012-01-07 19:35:18 UTC (rev 3960)
@@ -1,15 +0,0 @@
---- a/src/share/mk/bsd.dep.mk
-+++ b/src/share/mk/bsd.dep.mk
-@@ -130,9 +130,9 @@
- MKDEP_CXXFLAGS= ${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BID]*}
- MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BID]*}
- .else
--MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*}
--MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*}
--MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${OBJCFLAGS:M-Wno-import*}
-+MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*}
-+MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*}
-+MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BIDU]*} ${OBJCFLAGS:M-Wno-import*}
- .endif
-
- DPSRCS+= ${SRCS}
Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/patches/series 2012-01-07 19:35:18 UTC (rev 3960)
@@ -4,16 +4,13 @@
03_glibc.diff
04_lex_disable_unused.diff
05_disable_hardlinks.diff
-07_brandelf.diff
08_maxpathlen.diff
09_ports_path.diff
10_non_kfreebsd.diff
15_manpages_gzip.diff
16_bootstrap_pmake.diff
-17_multiarch.diff
+#17_multiarch.diff
18_fix_sysdir.diff
19_fix_cmd_pathnames.diff
-20_libbsd_overlay.diff
21_endian.diff
22_ld_as_needed.diff
-23_mkdep_undef.diff
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2012-01-07 13:24:31 UTC (rev 3959)
+++ trunk/freebsd-buildutils/debian/rules 2012-01-07 19:35:18 UTC (rev 3960)
@@ -43,7 +43,7 @@
-DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
-DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
-I$(CURDIR)/build-tree/src/sys \
- -D'__FBSDID(string)='
+ -D_GNU_SOURCE=1 -isystem $(CURDIR)/debian/local/include
# disabled due to #630907 (see also 20_libbsd_overlay.diff)
# $(shell pkg-config --cflags libbsd-overlay)
MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
More information about the Glibc-bsd-commits
mailing list