Permalink
Browse files

Merge branch 'stable/10' of https://github.com/freebsd/freebsd into s…

…table/10
  • Loading branch information...
2 parents dd52c36 + fe09c80 commit d144c95125abba96dcd505646af55b2f02698d8e @kmoore134 kmoore134 committed Nov 18, 2013
Showing with 2,927 additions and 11,060 deletions.
  1. +6 −0 ObsoleteFiles.inc
  2. +1 −1 bin/df/df.1
  3. +2 −2 contrib/nvi/README
  4. +2 −2 contrib/nvi/common/main.c
  5. +2,302 −1,179 contrib/nvi/docs/USD.doc/vi.man/vi.1
  6. +27 −16 contrib/nvi/ex/ex_print.c
  7. +1 −1 contrib/nvi/ex/version.h
  8. +2 −1 contrib/nvi/vi/v_txt.c
  9. +3 −2 contrib/nvi/vi/vs_refresh.c
  10. +38 −54 contrib/smbfs/lib/smb/nls.c
  11. +0 −4 etc/defaults/periodic.conf
  12. +1 −17 etc/defaults/rc.conf
  13. +1 −1 etc/freebsd-update.conf
  14. +0 −11 etc/namedb/Makefile
  15. +0 −9 etc/namedb/master/Makefile
  16. +0 −11 etc/namedb/master/empty.db
  17. +0 −11 etc/namedb/master/localhost-forward.db
  18. +0 −13 etc/namedb/master/localhost-reverse.db
  19. +0 −360 etc/namedb/named.conf
  20. +0 −92 etc/namedb/named.root
  21. +0 −62 etc/periodic/daily/470.status-named
  22. +0 −1 etc/rc.d/Makefile
  23. +0 −301 etc/rc.d/named
  24. +1 −1 etc/rc.d/ntpdate
  25. +1 −1 etc/rc.d/rpcbind
  26. +0 −1 etc/rc.d/syslogd
  27. +1 −9 include/Makefile
  28. +0 −19 include/iconv.h
  29. +0 −5 lib/Makefile
  30. +0 −8 lib/libc/iconv/Symbol.map
  31. +1 −1 lib/libc/iconv/citrus_csmapper.h
  32. +0 −12 lib/libc/iconv/iconv.c
  33. +0 −9 lib/libiconv_compat/Makefile
  34. +0 −8 lib/libiconv_compat/stub.c
  35. +6 −0 lib/libsmb/Makefile
  36. +2 −1 release/release.sh
  37. +64 −7 share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
  38. +1 −1 share/i18n/csmapper/JIS/JISX0208@1990%UCS.src
  39. +2 −1,029 share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
  40. +2 −7,467 share/i18n/csmapper/JIS/UCS%JISX0208@1990.src
  41. +0 −2 share/i18n/csmapper/JIS/charset.pivot.JIS.src
  42. +8 −6 share/i18n/csmapper/JIS/mapper.dir.JIS.src
  43. +1 −1 share/i18n/esdb/EUC/EUC-JP.src
  44. +13 −7 share/man/man4/bpf.4
  45. +1 −10 share/man/man5/src.conf.5
  46. +0 −5 share/mk/bsd.own.mk
  47. +6 −6 sys/amd64/amd64/identcpu.c
  48. +4 −8 sys/crypto/aesni/aesencdec.h
  49. +20 −19 sys/crypto/aesni/aesni.h
  50. +71 −40 sys/crypto/aesni/aesni_wrap.c
  51. +52 −56 sys/dev/bxe/bxe.c
  52. +5 −2 sys/dev/bxe/bxe.h
  53. +33 −14 sys/dev/bxe/bxe_elink.c
  54. +8 −2 sys/dev/bxe/ecore_hsi.h
  55. +25 −13 sys/dev/bxe/ecore_init.h
  56. +1 −0 sys/dev/bxe/ecore_reg.h
  57. +56 −28 sys/dev/bxe/ecore_sp.c
  58. +6 −0 sys/dev/bxe/ecore_sp.h
  59. +1 −0 sys/dev/drm2/drm_crtc.c
  60. +1 −3 sys/dev/drm2/radeon/radeon_display.c
  61. +1 −0 sys/dev/drm2/radeon/radeon_gem.c
  62. +3 −0 sys/dev/ipmi/ipmi.c
  63. +1 −1 sys/i386/conf/XEN
  64. +6 −6 sys/i386/i386/identcpu.c
  65. +2 −0 sys/i386/i386/machdep.c
  66. +2 −0 sys/kern/subr_param.c
  67. +39 −2 sys/net/ieee8023ad_lacp.c
  68. +4 −1 sys/net/if_media.h
  69. +1 −0 sys/netinet6/icmp6.c
  70. +2 −2 sys/netsmb/smb_trantcp.c
  71. +11 −1 sys/ofed/drivers/net/mlx4/en_ethtool.c
  72. +43 −64 sys/ofed/drivers/net/mlx4/en_netdev.c
  73. +4 −4 sys/ofed/drivers/net/mlx4/mlx4_en.h
  74. +3 −3 sys/ofed/include/linux/bitops.h
  75. +3 −1 sys/sys/systm.h
  76. +3 −2 sys/vm/vm_object.c
  77. +6 −0 sys/x86/include/specialreg.h
  78. +0 −7 tools/build/mk/OptionalObsoleteFiles.inc
  79. +0 −2 tools/build/options/WITH_LIBICONV_COMPAT
  80. +1 −1 usr.bin/iscsictl/iscsictl.c
  81. +9 −2 usr.sbin/bsdinstall/scripts/docsinstall
  82. +2 −2 usr.sbin/ctld/ctl.conf.5
  83. +0 −5 usr.sbin/mount_smbfs/Makefile
  84. +2 −2 usr.sbin/pkg/pkg.c
View
@@ -38,6 +38,12 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131103: WITH_LIBICONV_COMPAT removal
+OLD_FILES+=usr/include/_libiconv_compat.h
+OLD_FILES+=usr/lib/libiconv.a
+OLD_FILES+=usr/lib/libiconv.so
+OLD_FILES+=usr/lib/libiconv.so.3
+OLD_FILES+=usr/lib/libiconv_p.a
# 20131030: /etc/keys moved to /usr/share/keys
OLD_DIRS+=etc/keys
OLD_DIRS+=etc/keys/pkg
View
@@ -198,7 +198,7 @@ If the value is outside, it will be set to the appropriate limit.
.Xr mount 8 ,
.Xr pstat 8 ,
.Xr quot 8 ,
-.Xr swapinfo 8 .
+.Xr swapinfo 8
.Sh STANDARDS
With the exception of most options,
the
View
@@ -1,6 +1,6 @@
-# $Id: README,v 9.0 2012/10/07 09:13:54 zy Exp $
+# $Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $
-This is version 2.1.1 (2012-10-07) of nex/nvi, a reimplementation of the ex/vi
+This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi
text editors originally distributed as part of the Fourth Berkeley
Software Distribution (4BSD), by the University of California, Berkeley.
@@ -11,9 +11,9 @@
#ifndef lint
static const char copyright[] =
-"%Z% Copyright (c) 1992, 1993, 1994\n\
+"@(#) Copyright (c) 1992, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n\
-%Z% Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
+@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
Keith Bostic. All rights reserved.\n";
#endif /* not lint */
Oops, something went wrong.

0 comments on commit d144c95

Please sign in to comment.