Remove svn:mergeinfo from the releng/10.0 branch.After branch creation from stable/10, the stable/10 branch mergeinfowas moved to the root of the branch.Since there have not been any merges from stable/10 to releng/10.0yet, we do not need to track any of the existing mergeinfo here.Merges to releng/10.0 should now be done to the root of the branch.For future branches during the release cycle, unless otherwise noted,this change will be done as part of the stable/ and releng/ branchcreation.Discussed with: peterApproved by: re (implicit)Sponsored by: The FreeBSD Foundation
- Copy stable/10 (r259064) to releng/10.0 as part of the 10.0-RELEASE cycle.- Update __FreeBSD_version [1]- Set branch name to -RC1[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so start releng/10.0 at '100' so the branch is started with a value ending in zero.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Merge r257888, r258049 from head: - Use system libiconv, instead of trying to dlopen() it. - Just disable recoding support in libsmb if built WITHOUT_ICONV.PR: 183153Approved by: re (kib)
Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Bump the version of all non-symbol-versioned shared libraries inpreparation for 8.0-RELEASE. Add the previous version of thoselibraries to ObsoleteFiles.inc and bump __FreeBSD_Version.Reviewed by: kibApproved by: re (rwatson)
Bump library versions in preparation for 7.0.Ok'd by: kan
NO_MAN is not needed here.
Add missing shared library interdependencies.
Bump the shared library version number of all libraries that have notbeen bumped since RELENG_5.Reviewed by: ruApproved by: re (not needed for commit check but in principle...)
Start the dreaded NOFOO -> NO_FOO conversion.OK'ed by: core
-O2 compile isn't quite ready for WARNS=2 yet.
libsmb is now WARNS 2 clean on 64-bit platforms.
style.Makefile(5)
Zap now-unused SHLIB_MINOR
Supply SMB_CFG_FILE in CFLAGS. The newly imported smbfs-1.4.2allows us to supply our own value for this, overriding thedefault /usr/local/etc/nsmb.conf, which is not appropriate forbase system configuration files.
Add bmake glue for src/contrib/smbfs and connect userland smbfssupport to the build.The MFC reminder below is subject to <re@FreeBSD.org> approvalprior to 4.5-RELEASE.Reviewed by: bp, fjoeMFC: 1 week