diff --git a/contrib/atf/FREEBSD-upgrade b/contrib/atf/FREEBSD-upgrade index e9d7a4cb7b4f..4959b1e95de1 100644 --- a/contrib/atf/FREEBSD-upgrade +++ b/contrib/atf/FREEBSD-upgrade @@ -1,47 +1,45 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of atf into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor branches and you are supposed to follow those: http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html The ATF source code is hosted on GitHub: https://github.com/jmmv/atf and is imported into the atf vendor branch (see base/vendor/atf/). To merge the vendor branch into head do something like this: cd .../base/head/contrib/atf svn merge --accept=postpone \ svn+ssh://svn.freebsd.org/base/vendor/atf/dist . svn remove --force $(cat FREEBSD-Xlist) and resolve any conflicts that may arise at this point. Once this is done, you must regenerate bconfig.h. The recommended way of doing so is by using the release files already imported into the vendor branch (which is a good justification for importing the verbatim sources in the first place so that this step is reproducible). You can use a set of commands similar to the following: mkdir /tmp/atf cd /tmp/atf .../vendor/atf/dist/configure \ --prefix=/ \ --exec-prefix=/usr \ --datarootdir=/usr/share cp bconfig.h .../base/head/contrib/atf/ Please do NOT run './configure' straight from the 'dist' directory of the vendor branch as you easily risk committing build products into the tree. Lastly, with the list of old and new files in this import, make sure to update the reachover Makefiles accordingly. Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and, if all looks good, you are ready to commit all the changes in one go. diff --git a/contrib/bsnmp/FREEBSD-Xlist b/contrib/bsnmp/FREEBSD-Xlist index 8a5166240e54..9b3f76007f38 100644 --- a/contrib/bsnmp/FREEBSD-Xlist +++ b/contrib/bsnmp/FREEBSD-Xlist @@ -1,16 +1,15 @@ -#$FreeBSD$ */Makefile.in */acinclude.m4 */aclocal.m4 */config */config/* */configure */configure.ac */gensnmpdef/Makefile.in */gensnmptree/Makefile.in */lib/Makefile.in */snmp_mibII/Makefile.in */snmp_mibII/tree.h */snmp_ntp/Makefile.in */snmpd/Makefile.in */snmpd/.gdbinit diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade index 4fb31fd9153c..6a18839db274 100644 --- a/contrib/bsnmp/FREEBSD-upgrade +++ b/contrib/bsnmp/FREEBSD-upgrade @@ -1,22 +1,20 @@ -$FreeBSD$ - This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon for ngATM. Be careful to feed changes back to the maintainer , because the code here is actually shared with other environments besides FreeBSD. Import should be done by: 1. unpack distribution into clean directory 2. remove all unneeded files 3. cvs import \ -m "Virgin import of bsnmpd X.Y" \ src/contrib/bsnmp BEGEMOT BSNMP_X_Y 4. resolve conflicts 5. check the makefile in lib/libbsnmp and usr.sbin/bsnmp harti diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist index 6c3c9b2fce5e..2ce9ec8902b9 100644 --- a/contrib/bzip2/FREEBSD-Xlist +++ b/contrib/bzip2/FREEBSD-Xlist @@ -1,26 +1,25 @@ -# $FreeBSD$ *Makefile* *README.XML.STUFF *bz-common.xsl *bz-fo.xsl *bz-html.xsl *bzdiff *bzdiff.1 *bzgrep *bzgrep.1 *bzip.css *bzip2.1.preformatted *bzip2.txt *bzmore *bzmore.1 *dlltest.* *entities.xml *format.pl *libbz2.dsp *makefile.msc *manual.html *manual.pdf *manual.ps *manual.xml *mk251.c *xmlproc.sh diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade index 48e788a329a4..15c037baa3e7 100644 --- a/contrib/bzip2/FREEBSD-upgrade +++ b/contrib/bzip2/FREEBSD-upgrade @@ -1,27 +1,25 @@ -$FreeBSD$ - Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html Imported by: cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ src/contrib/bzip2 BZIP2 v1_0_5 Notes: The following log shows details of trimming: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist cd bzip2-1.0.4 uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu gzip -9 sample1.ref sample2.ref sample3.ref uuencode sample1.ref.gz sample1.ref.gz > sample1.ref.gz.uu uuencode sample2.ref.gz sample2.ref.gz > sample2.ref.gz.uu uuencode sample3.ref.gz sample3.ref.gz > sample3.ref.gz.uu rm sample1.bz2 sample1.ref.gz sample2.bz2 sample2.ref.gz rm sample3.bz2 sample3.ref.gz obrien@FreeBSD.org 15 May 2005 diff --git a/contrib/diff/FREEBSD-Xlist b/contrib/diff/FREEBSD-Xlist index 64e22743e7af..d9b65bff1756 100644 --- a/contrib/diff/FREEBSD-Xlist +++ b/contrib/diff/FREEBSD-Xlist @@ -1,61 +1,59 @@ -# $FreeBSD$ - INSTALL Makefile.am Makefile.in aclocal.m4 bootstrap config.hin config/ configure configure.ac doc/Makefile.am doc/Makefile.in doc/diagmeet.note exgettext lib/Makefile.am lib/Makefile.in lib/alloca.c lib/alloca_.h lib/dirname.c lib/fnmatch.c lib/fnmatch_.h lib/fnmatch_loop.c lib/getopt.c lib/getopt1.c lib/getopt_int.h lib/gettimeofday.c lib/imaxtostr.c lib/inttostr.c lib/malloc.c lib/mkstemp.c lib/offtostr.c lib/posix/Makefile.in lib/realloc.c lib/regex.c lib/regex.h lib/setmode.c lib/stdbool_.h lib/strcasecmp.c lib/stripslash.c lib/strncasecmp.c lib/strtol.c lib/strtoll.c lib/strtoul.c lib/strtoull.c lib/tempname.c lib/time_r.c lib/time_r.h lib/umaxtostr.c lib/waitpid.c lib/xstrdup.c lib/xstrtol.c lib/xstrtoul.c lib/xstrtoumax.c m4/ man/Makefile.am man/Makefile.in ms/ po/ src/Makefile.am src/Makefile.in diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade index 61ad0c9435bf..6c9fad16eb89 100644 --- a/contrib/diff/FREEBSD-upgrade +++ b/contrib/diff/FREEBSD-upgrade @@ -1,6 +1,5 @@ -# $FreeBSD$ Import of GNU diff 2.8.7 Original source available as ftp://alpha.gnu.org/pub/gnu/diffutils/diffutils-2.8.7.tar.gz Removed files are listed in FREEBSD-Xlist. diff --git a/contrib/expat/FREEBSD-Xlist b/contrib/expat/FREEBSD-Xlist index c1f2a689fee4..82ceb055ae1e 100644 --- a/contrib/expat/FREEBSD-Xlist +++ b/contrib/expat/FREEBSD-Xlist @@ -1,22 +1,21 @@ -# $FreeBSD$ *.MPW *.cmake *.def *.dsp *.dsw *.m4 *.pc.in *.vcxproj* *config.h cmake CMake* Configure* amiga bcb5 configure conftools doc/valid-xhtml10.png expat.sln m4 vms win32 diff --git a/contrib/jemalloc/FREEBSD-Xlist b/contrib/jemalloc/FREEBSD-Xlist index d84d4b9302b6..31853070379f 100644 --- a/contrib/jemalloc/FREEBSD-Xlist +++ b/contrib/jemalloc/FREEBSD-Xlist @@ -1,60 +1,59 @@ -$FreeBSD$ .appveyor.yml .autom4te.cfg .cirrus.yml .git* .travis.yml FREEBSD-* INSTALL.md Makefile* README TUNING.md autogen.sh autom4te.cache/ bin/ build-aux/ config.* configure* doc/*.in doc/*.xml doc/*.xsl doc/*.html include/jemalloc/internal/atomic_msvc.h include/jemalloc/internal/jemalloc_internal_defs.h.in include/jemalloc/internal/jemalloc_preamble.h.in include/jemalloc/internal/private_namespace.sh include/jemalloc/internal/private_symbols_jet.awk include/jemalloc/internal/private_symbols.awk include/jemalloc/internal/private_symbols.sh include/jemalloc/internal/public_namespace.sh include/jemalloc/internal/public_symbols.txt include/jemalloc/internal/public_unnamespace.h include/jemalloc/internal/public_unnamespace.sh include/jemalloc/internal/size_classes.sh include/jemalloc/internal/smoothstep.sh include/jemalloc/internal/tsd_win.h include/jemalloc/jemalloc.h.in include/jemalloc/jemalloc.sh include/jemalloc/jemalloc_defs.h include/jemalloc/jemalloc_defs.h.in include/jemalloc/jemalloc_macros.h include/jemalloc/jemalloc_macros.h.in include/jemalloc/jemalloc_mangle_jet.h include/jemalloc/jemalloc_mangle.sh include/jemalloc/jemalloc_mangle.h include/jemalloc/jemalloc_protos_jet.h include/jemalloc/jemalloc_protos.h include/jemalloc/jemalloc_protos.h.in include/jemalloc/jemalloc_rename.h include/jemalloc/jemalloc_rename.sh include/jemalloc/jemalloc_typedefs.h.in include/msvc_compat/ install-sh jemalloc.pc* m4/ msvc/ run_tests.sh scripts/ src/jemalloc_cpp.cpp src/zone.c test/ diff --git a/contrib/jemalloc/FREEBSD-upgrade b/contrib/jemalloc/FREEBSD-upgrade index 666790bdff13..d3173b9d1f36 100755 --- a/contrib/jemalloc/FREEBSD-upgrade +++ b/contrib/jemalloc/FREEBSD-upgrade @@ -1,190 +1,189 @@ #!/bin/sh -# $FreeBSD$ # # Usage: cd /usr/src/contrib/jemalloc # ./FREEBSD-upgrade [args] # # At least the following ports are required when importing jemalloc: # - devel/autoconf # - devel/git # - devel/gmake # - textproc/docbook-xsl # - textproc/libxslt # # The normal workflow for importing a new release is: # # cd /usr/src/contrib/jemalloc # # Merge local changes that were made since the previous import: # # ./FREEBSD-upgrade merge-changes # ./FREEBSD-upgrade rediff # # Extract latest jemalloc release. # # ./FREEBSD-upgrade extract # # Fix patch conflicts as necessary, then regenerate diffs to update line # offsets: # # ./FREEBSD-upgrade rediff # ./FREEBSD-upgrade extract # # Do multiple buildworld/installworld rounds. If problems arise and patches # are needed, edit the code in ${work} as necessary, then: # # ./FREEBSD-upgrade rediff # ./FREEBSD-upgrade extract # # The rediff/extract order is important because rediff saves the local # changes, then extract blows away the work tree and re-creates it with the # diffs applied. # # Finally, to clean up: # # ./FREEBSD-upgrade clean set -e set -x if [ ! -x "FREEBSD-upgrade" ] ; then echo "Run from within src/contrib/jemalloc/" >&2 exit 1 fi if [ "x${JEMALLOC_REPO}" = "x" ] ; then JEMALLOC_REPO=https://github.com/jemalloc/jemalloc.git fi src=`pwd` jemalloc_tmp="jemalloc.tmp" tmpdir="${src}/../${jemalloc_tmp}" bare_repo="${tmpdir}/jemalloc_bare.git" work="jemalloc_work.git" work_repo="${tmpdir}/${work}" namespace_repo="${tmpdir}/jemalloc_namespace.git" changes="${src}/FREEBSD-changes" do_fetch() { local rev=$1 if [ ! -d "${bare_repo}" ] ; then mkdir -p "${bare_repo}" git clone --bare ${JEMALLOC_REPO} ${bare_repo} fi ( cd ${bare_repo} git fetch origin ${rev} ) } do_extract_helper() { local rev=$1 local repo=$2 do_fetch ${rev} rm -rf ${repo} git clone ${bare_repo} ${repo} ( cd ${repo} if [ "x${rev}" != "x" ] ; then # Use optional rev argument to check out a revision other than HEAD on # master. git checkout ${rev} fi ) } do_autogen() { ./autogen.sh --enable-xmalloc --enable-utrace \ --with-malloc-conf=abort_conf:false \ --with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \ --with-lg-page-sizes=12,13,14,16 } do_extract_diff() { local rev=$1 local repo=$2 do_extract_helper ${rev} ${repo} ( cd ${repo} # Apply diffs before generating files. patch -p1 < "${src}/FREEBSD-diffs" find . -name '*.orig' -delete # Generate files. do_autogen gmake dist ) } do_extract_namespace() { local rev=$1 local repo=$2 do_extract_helper ${rev} ${repo} ( cd ${repo} # Generate files. do_autogen gmake include/jemalloc/internal/private_namespace.h ) } do_extract() { local rev=$1 do_fetch ${rev} do_extract_diff ${rev} ${work_repo} do_extract_namespace ${rev} ${namespace_repo} } do_diff() { ( cd ${work_repo} find . -name '*.orig' -delete find . -name '*.rej' -delete git add -A git diff --cached ) > FREEBSD-diffs } command=$1 shift case "${command}" in merge-changes) # Merge local changes that were made since the previous import. rev=`cat VERSION |tr 'g' ' ' |awk '{print $2}'` # Extract code corresponding to most recent import. do_extract ${rev} # Compute local differences to the upstream+patches and apply them. ( cd ${tmpdir} diff -ru -X ${src}/FREEBSD-Xlist ${work} ../jemalloc > ${changes} || true ) ( cd ${work_repo} patch -p1 < ${changes} || true find . -name '*.orig' -delete ) # Update diff. do_diff ;; extract) # Extract upstream sources, apply patches, copy to contrib/jemalloc. rev=$1 do_extract ${rev} # Delete existing files so that cruft doesn't silently remain. rm -rf ChangeLog COPYING VERSION doc include src # Copy files over. tar cf - -C ${work_repo} -X FREEBSD-Xlist . |tar xvf - internal_dir="include/jemalloc/internal" grep -v ' isthreaded ' \ "${namespace_repo}/${internal_dir}/private_namespace.h" \ > "${internal_dir}/private_namespace.h" ;; rediff) # Regenerate diffs based on working tree. do_diff ;; clean) # Remove working tree and temporary files. rm -rf ${tmpdir} ${changes} ;; *) echo "Unsupported command: \"${command}\"" >&2 exit 1 ;; esac diff --git a/contrib/less/FREEBSD-upgrade b/contrib/less/FREEBSD-upgrade index 6d30dfd039c3..ddbd758da264 100644 --- a/contrib/less/FREEBSD-upgrade +++ b/contrib/less/FREEBSD-upgrade @@ -1,27 +1,25 @@ -$FreeBSD$ - 1. Download latest less(1) tarball. The homepage of less(1) is at: http://www.greenwoodsoftware.com/less/ 2. Checkout $FSVN/vendor/less/ into less/ 3. Extract new code to, say, less/lessv429 4. cd less/dist 5. svn list -R | grep -v '/$' | sort >../old 6. cd ../lessv429 7. find . -type f | cut -c 3- | sort >../new 8. tar cf - . | tar xf - -C ../dist 9. cd ../dist 10. comm -23 ../old ../new | xargs svn rm 11. comm -13 ../old ../new | xargs svn add 12. Check svn status output and make sure that all changes are appropriate. 13. Commit and tag the result. 14. Resolve any conflicts that happen in head/contrib/less. 15. Regenerate defines.h: ./configure --prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin \ --libexecdir=/usr/libexec --datarootdir=/usr/share 16. Manually merge changes into src/usr.bin/less/defines.h; adjust Makefile glue to reflect added/removed files. 17. Replace your src/contrib/less with the merged copy, and do a ``make universe'' to make sure that nothing was broken; 18. Commit the result. delphij@FreeBSD.org - May 08, 2009 diff --git a/contrib/libcxxrt/FREEBSD-upgrade b/contrib/libcxxrt/FREEBSD-upgrade index bdd74f308a4f..3b2f2cf9e79f 100644 --- a/contrib/libcxxrt/FREEBSD-upgrade +++ b/contrib/libcxxrt/FREEBSD-upgrade @@ -1,6 +1,4 @@ -$FreeBSD$ - This is the FreeBSD copy of libcxxrt. It contains the src directory from the upstream repository. When updating, copy *.{c,cc,h} from the upstream src/. diff --git a/contrib/ncurses/FREEBSD-Xlist b/contrib/ncurses/FREEBSD-Xlist index a0ee58e5a0ea..21d8ebe29844 100644 --- a/contrib/ncurses/FREEBSD-Xlist +++ b/contrib/ncurses/FREEBSD-Xlist @@ -1,9 +1,7 @@ -$FreeBSD$ - Ada95 c++ doc/html/Ada95.html doc/html/ada doc/html/index.html doc/html/man test diff --git a/contrib/ncurses/FREEBSD-upgrade b/contrib/ncurses/FREEBSD-upgrade index ffa4ccb7b56b..539f471edc18 100644 --- a/contrib/ncurses/FREEBSD-upgrade +++ b/contrib/ncurses/FREEBSD-upgrade @@ -1,51 +1,49 @@ -$FreeBSD$ - ncurses The release tarball can be found at GNU FTP sites. The beta version can be found at ftp://invisible-island.net/ncurses/ or ftp://dickey.his.com/ncurses/ For the import files and directories were pruned by: tar -X FREEBSD-Xlist -zxf ncurses-5.7.tar.gz check if there are any new bits that we don't want. The instructions for importing new release and merging to HEAD can be found at FreeBSD wiki: http://wiki.freebsd.org/SubversionPrimer/VendorImports The version tag can be obtained from contrib/ncurses/dist.mk. To make local changes to ncurses, simply patch and commit to the trunk branch (aka HEAD). Never make local changes on the vendor branch. All local changes should be submitted to Thomas Dickey for inclusion in the next vendor release. The author is very willing to help us. After importing, you have to update files in lib/ncurses. To configure ncurses, go to /usr/ports/devel/ncurses and make WITHOUT_TERMINFO=1 configure Update ncurses_cfg.h and necessary Makefile glues from ${WRKSRC}/build.nowidec. Directory for wide character support is ${WRKSRC}/build.widec You may have to update ncurses-specific glue in termcap.c (check if ncurses/tinfo/read_termcap.c has been changed since last import). Current local changes: ncurses/tinfo/comp_scan.c r50620: native termcap tweaking (cvs r1.2) ncurses/tinfo/lib_termcap.c r50620: native termcap tweaking (cvs r1.2) r50850: remove GCC_UNUSED for r50620 (cvs r1.4) ncurses/tinfo/read_termcap.c This is not used. We have our own src/lib/ncurses/termcap.c rafan@FreeBSD.org 15-Nov-2008 diff --git a/contrib/netbsd-tests/FREEBSD-upgrade b/contrib/netbsd-tests/FREEBSD-upgrade index edeba708cb18..3c396979a760 100644 --- a/contrib/netbsd-tests/FREEBSD-upgrade +++ b/contrib/netbsd-tests/FREEBSD-upgrade @@ -1,38 +1,36 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of the NetBSD test suite into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor branches and you are supposed to follow those: http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html The NetBSD test source code was originally obtained via NetBSD anoncvs as described in the NetBSD handbook: http://www.netbsd.org/docs/guide/en/chap-fetch.html#chap-fetch-cvs and is imported into the NetBSD/tests vendor branch (see base/vendor/NetBSD/tests/). The process used to bootstrap the vendor tree was similar to the following: /bin/sh export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot" cvs -z9 co -D "09/30/2014 20:45" -P src/tests mv src/tests/* tests/dist/. Please adjust the checkout date spec (the argument passed via -D) to match the desired checkout time. To merge the vendor branch into head do something like this: cd .../base/head/contrib/netbsd-tests svn merge --accept=postpone \ svn+ssh://svn.freebsd.org/base/vendor/NetBSD/tests/dist . find . -name Makefile\* | xargs svn rm --force and resolve any conflicts that may arise at this point. Lastly, with the list of old and new files in this import, make sure to update the reachover Makefiles accordingly. diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist index b69f5e4de371..f3c7a7c5da68 100644 --- a/contrib/netcat/FREEBSD-Xlist +++ b/contrib/netcat/FREEBSD-Xlist @@ -1,3 +1 @@ -$FreeBSD$ - Makefile diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade index 33f5ea2873d6..c57852c791f5 100644 --- a/contrib/netcat/FREEBSD-upgrade +++ b/contrib/netcat/FREEBSD-upgrade @@ -1,14 +1,12 @@ -$FreeBSD$ - Most of the instructions is outlined on FreeBSD wiki at: http://wiki.freebsd.org/SubversionPrimer/VendorImports nc(1) is very small and most of code are just copied as-is from OpenBSD. With a few exceptions: * --no-tcpopt: Local feature specific to FreeBSD. * -V: We use FIB to map what OpenBSD do for "rdomain" * -E, -e: These are mostly self contained IPsec extensions delphij@FreeBSD.org - Mar 23, 2010 diff --git a/contrib/openbsm/FREEBSD-upgrade b/contrib/openbsm/FREEBSD-upgrade index e1776753355e..f4a1fc05a597 100644 --- a/contrib/openbsm/FREEBSD-upgrade +++ b/contrib/openbsm/FREEBSD-upgrade @@ -1,56 +1,54 @@ Upgrade Instructions for OpenBSM -------------------------------- OpenBSM integrates into the FreeBSD source tree in several places: src/contrib/openbsm The OpenBSM distribution itself src/sys/bsm Modified versions of some bsm/ include files src/sys/security/audit Kernel audit framework, some OpenBSM-based files src/usr.sbin/*audit* Makefiles for various OpenBSM tools src/etc/Makefile Installation of /etc OpenBSM files src/lib/libbsm/* Build for OpenBSM library OpenBSM is normally built using an integrated autoconf/automake build system. For the purposes of tight integration with FreeBSD, we use an adapted BSD make (bmake) build system loosely based on the automake setup. We also rely on a static config.h generated when OpenBSM is imported, rather than re-configuring every build. This leads to a more reproduceable build environment, and avoids dependence on things not in the base tree (i.e., autoconf, automake, GNU make, etc). An upgrade of OpenBSM generally involves the following steps: - Vendor import of OpenBSM into src/contrib. - Run configure, commit src/contrib/openbsm/config/config.h. - Replication of src/contrib/openbsm/bsm changes into src/sys/bsm. - Possible updates to src/sys/security/audit, especially relating to audit_bsm_token.c. - Update any library, tool, or etc BSD Makefiles to add new files, defines, or other generally useful or necessary things. Certain files are present only in the vendor branch, and not in FreeBSD development branches: contrib/openbsm/bsm audit.h audit_internal.h audit_kevents.h audit_record.h This prevents confusion regarding whether the src/sys/bsm or contrib versions of the include files should be used in the build. Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1 Replacing the version string as required. Remove the "-n" argument once the import is tested in order to perform the actual import. Propagation of changes to src/sys/{bsm,security/audit} is something that requires careful coordination and attention to detail. These files are not on CVS vendor branches, but do have the same local vs. vendor merge issues. Remember that contrib/openbsm (and the rest of the system) will be built with the version of the bsm/ include files in src/sys/bsm, not the version in contrib/openbsm/bsm, so buildworld tests before committing are necessary, and the commits to various parts of the system must be made in close succession. - -$FreeBSD$ diff --git a/contrib/pjdfstest/FREEBSD-upgrade b/contrib/pjdfstest/FREEBSD-upgrade index eff295fbfdc0..de6d728191f2 100644 --- a/contrib/pjdfstest/FREEBSD-upgrade +++ b/contrib/pjdfstest/FREEBSD-upgrade @@ -1,25 +1,23 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of pjdfstest into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor branches and you are supposed to follow those: http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html The pjdfstest source code is hosted on GitHub: https://github.com/pjd/pjdfstest and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/). To merge the vendor branch into head do something like this: cd .../base/head/contrib/pjdfstest svn merge --accept=postpone \ svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist . and resolve any conflicts that may arise at this point. Lastly, with the list of old and new files in this import, make sure to update the reachover Makefiles accordingly. diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 5cf41f10b6ad..c45d0a96b91e 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -1,84 +1,82 @@ -$FreeBSD$ - sendmail 8.18.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following directories were renamed: sendmail -> src Imported using the instructions at: https://docs.freebsd.org/en/articles/committers-guide/#git-primer After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf by making a minor change and committing. To make local changes to sendmail, simply patch and commit to the head. Never make local changes in the vendor area (/vendor/sendmail/). All local changes should be submitted to the Sendmail Consortium for inclusion in the next vendor release. The following files make up the sendmail build/install/runtime infrastructure in FreeBSD: Makefile.inc1 bin/Makefile bin/rmail/Makefile contrib/sendmail/ etc/Makefile etc/defaults/make.conf (obsolete) etc/defaults/periodic.conf etc/defaults/rc.conf etc/mail/Makefile etc/mail/README etc/mail/access.sample etc/mail/aliases etc/mail/mailer.conf etc/mail/mailertable.sample etc/mail/virtusertable.sample etc/mtree/BSD.include.dist etc/mtree/BSD.sendmail.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist etc/periodic/daily/440.status-mailq etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc etc/sendmail/freebsd.submit.mc etc/sendmail/freefall.mc lib/Makefile lib/libmilter/Makefile lib/libsm/Makefile lib/libsmdb/Makefile lib/libsmutil/Makefile libexec/Makefile libexec/mail.local/Makefile libexec/smrsh/Makefile share/Makefile share/doc/smm/Makefile share/doc/smm/08.sendmailop/Makefile share/examples/etc/make.conf share/man/man5/make.conf.5 share/man/man5/periodic.conf.5 share/man/man5/rc.conf.5 share/man/man7/hier.7 share/man/man8/Makefile share/mk/bsd.libnames.mk share/sendmail/Makefile tools/build/mk/OptionalObsoleteFiles.inc usr.bin/Makefile usr.bin/vacation/Makefile usr.sbin/Makefile usr.sbin/editmap/Makefile usr.sbin/mailstats/Makefile usr.sbin/makemap/Makefile usr.sbin/praliases/Makefile usr.sbin/sendmail/Makefile usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org 31-January-2024 diff --git a/contrib/smbfs/FREEBSD-upgrade b/contrib/smbfs/FREEBSD-upgrade index 6fad7c6d729e..a1547eedf2a5 100644 --- a/contrib/smbfs/FREEBSD-upgrade +++ b/contrib/smbfs/FREEBSD-upgrade @@ -1,6 +1,4 @@ -$FreeBSD$ - The smbfs distribution was written with FreeBSD in mind, so the only change required before an import is: rm -rf kernel diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist index 49621ab36f0f..1f6a5fb26101 100644 --- a/contrib/tcsh/FREEBSD-Xlist +++ b/contrib/tcsh/FREEBSD-Xlist @@ -1,24 +1,23 @@ -$FreeBSD$ */BUGS */Imakefile */MAKEDIFFS */MAKESHAR */Makefile.ADMIN */Makefile.in */Makefile.std */Makefile.vms */config.guess */config.h.in */config.rpath */config.sub */configure */imake.config */install-sh */svn */config/a* */config/bs2000 */config/bsd */config/bsdreno */config/[c-z]* */tests */win32 diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade index 7bfdaf8a2091..2abb920e622a 100644 --- a/contrib/tcsh/FREEBSD-upgrade +++ b/contrib/tcsh/FREEBSD-upgrade @@ -1,13 +1,11 @@ -$FreeBSD$ - Christos Zoulas `tcsh' originals can be found at: ftp://ftp.astron.com/pub/tcsh/ The stripped down version was created using FREEBSD-Xlist during extraction: tar -X FREEBSD-Xlist -xzf tcsh-6.15.00.tar.gz Imported by: cvs import -m "Import of tcsh-6.15.00" \ src/contrib/tcsh ZOULAS tcsh_6_15