[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:38:48 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/dd61890e0bbc
changeset: 375:dd61890e0bbc
user: ray at terran.dlink.ua
date: Fri Mar 02 17:06:04 2012 +0200
description:
Update to FreeBSD-HEAD @232391
diffstat:
head/Makefile | 4 ++--
head/Makefile.inc1 | 14 ++++++++------
head/ObsoleteFiles.inc | 25 ++++++++++++++++++++++++-
head/UPDATING | 17 ++++++++++++++++-
4 files changed, 50 insertions(+), 10 deletions(-)
diffs (144 lines):
diff -r ea1903d719a7 -r dd61890e0bbc head/Makefile
--- a/head/Makefile Fri Mar 02 17:04:50 2012 +0200
+++ b/head/Makefile Fri Mar 02 17:06:04 2012 +0200
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/Makefile 227771 2011-11-20 20:05:47Z gjb $
+# $FreeBSD: head/Makefile 231821 2012-02-16 14:08:14Z pluknet $
#
# The user-driven targets are:
#
@@ -24,7 +24,7 @@
# check-old-dirs - List obsolete directories.
# check-old-files - List obsolete files.
# check-old-libs - List obsolete libraries.
-# delete-old - Delete obsolete directories/files/libraries.
+# delete-old - Delete obsolete directories/files.
# delete-old-dirs - Delete obsolete directories.
# delete-old-files - Delete obsolete files.
# delete-old-libs - Delete obsolete libraries.
diff -r ea1903d719a7 -r dd61890e0bbc head/Makefile.inc1
--- a/head/Makefile.inc1 Fri Mar 02 17:04:50 2012 +0200
+++ b/head/Makefile.inc1 Fri Mar 02 17:06:04 2012 +0200
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/Makefile.inc1 230786 2012-01-30 20:19:28Z imp $
+# $FreeBSD: head/Makefile.inc1 232322 2012-02-29 22:58:51Z dim $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1125,6 +1125,10 @@
_share= share/syscons/scrnmaps
.endif
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
+_gcc_tools= gnu/usr.bin/cc/cc_tools
+.endif
+
.if ${MK_KERBEROS} != "no"
_kerberos5_tools= kerberos5/tools
.endif
@@ -1153,7 +1157,7 @@
${MAKE} DIRPRFX=${_tool}/ build-tools
.endfor
.for _tool in \
- gnu/usr.bin/cc/cc_tools \
+ ${_gcc_tools} \
${_kerberos5_tools}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
@@ -1183,14 +1187,12 @@
_binutils= gnu/usr.bin/binutils
.endif
-.if ${MK_CLANG} != "no"
-.if ${CC:T:Mclang} == "clang"
+.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
_clang= usr.bin/clang
_clang_libs= lib/clang
.endif
-.endif
-.if ${MK_GCC} != "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
_cc= gnu/usr.bin/cc
.endif
diff -r ea1903d719a7 -r dd61890e0bbc head/ObsoleteFiles.inc
--- a/head/ObsoleteFiles.inc Fri Mar 02 17:04:50 2012 +0200
+++ b/head/ObsoleteFiles.inc Fri Mar 02 17:06:04 2012 +0200
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/ObsoleteFiles.inc 230060 2012-01-13 15:40:49Z ed $
+# $FreeBSD: head/ObsoleteFiles.inc 232253 2012-02-28 14:35:36Z pluknet $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -38,6 +38,27 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20120225: libarchive 3.0.3
+OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
+ usr/share/man/man3/archive_read_support_compression_all.3.gz \
+ usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
+ usr/share/man/man3/archive_read_support_compression_compress.3.gz \
+ usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
+ usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
+ usr/share/man/man3/archive_read_support_compression_none.3.gz \
+ usr/share/man/man3/archive_read_support_compression_program.3.gz \
+ usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
+ usr/share/man/man3/archive_read_support_compression_xz.3.gz \
+ usr/share/man/man3/archive_write_set_callbacks.3.gz \
+ usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
+ usr/share/man/man3/archive_write_set_compression_compress.3.gz \
+ usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
+ usr/share/man/man3/archive_write_set_compression_none.3.gz \
+ usr/share/man/man3/archive_write_set_compression_program.3.gz
+OLD_LIBS+=usr/lib/libarchive.so.5
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_LIBS+=usr/lib32/libarchive.so.5
+.endif
# 20120113: removal of wtmpcvt(1)
OLD_FILES+=usr/bin/wtmpcvt
OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
@@ -707,6 +728,8 @@
.endif
# 20090718: the gdm pam.d file is no longer required.
OLD_FILES+=etc/pam.d/gdm
+# 20090714: net_add_domain(9) renamed to domain_add(9)
+OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
# 20090713: vimage container structs removed.
OLD_FILES+=usr/include/netinet/vinet.h
OLD_FILES+=usr/include/netinet6/vinet6.h
diff -r ea1903d719a7 -r dd61890e0bbc head/UPDATING
--- a/head/UPDATING Fri Mar 02 17:04:50 2012 +0200
+++ b/head/UPDATING Fri Mar 02 17:06:04 2012 +0200
@@ -22,6 +22,21 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20120229:
+ Now unix domain sockets behave "as expected" on nullfs(5). Previously
+ nullfs(5) did not pass through all behaviours to the underlying layer,
+ as a result if we bound to a socket on the lower layer we could connect
+ only to the lower path; if we bound to the upper layer we could connect
+ only to the upper path. The new behavior is one can connect to both the
+ lower and the upper paths regardless what layer path one binds to.
+
+20120211:
+ The getifaddrs upgrade path broken with 20111215 has been restored.
+ If you have upgraded in between 20111215 and 20120209 you need to
+ recompile libc again with your kernel. You still need to recompile
+ world to be able to configure CARP but this restriction already
+ comes from 20111215.
+
20120114:
The set_rcvar() function has been removed from /etc/rc.subr. All
base and ports rc.d scripts have been updated, so if you have a
@@ -1550,4 +1565,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: head/UPDATING 230122 2012-01-14 23:19:10Z dougb $
+$FreeBSD: head/UPDATING 232317 2012-02-29 21:38:31Z trociny $
More information about the Zrouter-src-freebsd
mailing list