diff --git a/Tools/scripts/README b/Tools/scripts/README index af5771794569..079a78a29b58 100644 --- a/Tools/scripts/README +++ b/Tools/scripts/README @@ -1,134 +1,133 @@ $FreeBSD$ NOTE: These scripts need work and are *NOT* safe to use unless you know what they do. Use at your own risk. Patches would be great, but it is preferred they pass through the maintainer of each particular script. MOVEDlint.awk - checks MOVED for common errors LEGALlint - checks LEGAL for common errors ardiff - compare two archives easily addport - replacement for easy-import bad-pkgdescrs.sh - locate identical pkg descriptions bump_revision.pl - Small script to bump the PORTREVISION variable of ports which are depending on a port with a changed shared lib version. checkcats.py - verify that master categories in all ports are correct and report any problems. Beware that the full check takes quite some time. checknewvers - checks for availability for a newest version of distfiles on MASTER_SITES (ftp only). checksum - allows checking of ports to see if their checksums match, and if they don't, give a diff against the older version to help discover why the checksum didn't match. chkorigin.sh - checks all ports in the tree for a wrong PKGORIGIN. Run this tool after every repocopy. doportlint - run portlint on every port and return the results distclean - compare md5 sums of distfiles in ports/distfiles with currently installed ports collection in ports/* and prompt to remove unmatched entries getpatch - downloads patch attachments from a Bug Tracking Systems getpatch.sh - downloads patch attachments from a Bug Tracking Systems (plain shell script) gnomedepends - Analyse pkg/PLIST and give an advice as to which GNOME ports should be listes in {RUN,LIB}_DEPENDS for this port mark_safe.pl - utility to set subsets of ports to MAKE_JOBS_(UN)SAFE=yes -mfh - Merge from head to a given branch neededlibs.sh - Extract direct library dependencies from binaries. portsearch - A utility for searching the ports tree. It allows more detailed search criteria than ``make search key='' and accepts all perl(1) regular expressions. search_lib_depends_and_bump.sh - Give it a port that has changed and it will bump all ports having a LIB_DEPENDS on this port splitpatch.pl - A small script to convert multi-file patches to several appropriately named single-file patches. tindex - script used to build INDEXes for supported FreeBSD branches, which are the source of the 'make fetchindex' INDEXes, and the build failure reports on ports@FreeBSD.org update-patches - generates updated patches. ---------------------------------------------------------------------- gnomedepends is a script, which analyses pkg/PLIST and gives an advice as to which GNOME ports should be listes in {RUN,LIB}_DEPENDS for the port to ensure correct removal of GNOME shared directories. Usage is simple: % cd /usr/ports/CATEGORY/PORT % gnomedepends.py According to the contents of PLIST the port depends on the following GNOME port(s): /usr/ports/audio/gnomeaudio, for directories: share/gnome/sounds /usr/ports/sysutils/gnomecontrolcenter, for directories: share/gnome/apps /usr/ports/x11/gnomecore, for directories: share/gnome/apps/Games /usr/ports/x11/gnomelibs, for directories: etc/sound/events etc/sound share/gnome/games share/gnome/pixmaps share/gnome The example above means that you need to have ${PORTSDIR}/audio/gnomeaudio, ${PORTSDIR}/sysutils/gnomecontrolcenter, ${PORTSDIR}/x11/gnomecore and ${PORTSDIR}/x11/gnomelibs listed in {RUN,LIB}_DEPENDS for this port. Please be warned, that the this only means that the ports listed by the script required for correct removal of GNOME shared directories, not for the port functionality, so actual {RUN,LIB}_DEPENDS may have more entries. ---------------------------------------------------------------------- portsearch - A utility for searching the ports tree. portsearch is a utility to for searching of the ports tree. It permits much more detailed searches to be performed than ``make search key='' by allowing you to specify which field(s) to search. It also supports all valid perl(1) regular expressions for pattern matching. portsearch displays matching ports in the same format as ``make search'' and also displays the number of matching ports found. The following command line options are supported: -h Prints a multi-line help message and exits -n name Search for name in the name field -p path Search for path in the path field -i info Search for info in the comments field -m maint Search for maint in the Maintainer field -x index Search for index in the category field -b b_deps Search for b_deps in the build-depends field -r r_deps Search for r_deps in the run-depends field -d deps Search for deps in the both the build and run dependency fields. This option behaves differently to the other op- tions, see the EXAMPLES section -f file Use the index file instead of /usr/ports/INDEX All searches are case-insensitive See the file README.portsearch for further information. ---------------------------------------------------------------------- The update-patches script looks for files in $WRKSRC (if unset, this defaults to the work/ subdirectory of the current directory) which have a matching .orig file. It also looks in $PATCHDIR (if unset, this defaults to the files/ subdirectory of the current directory) for patches that correspond to the first set. If the changes in an existing patch do not reflect the changes in the files in $WRKSRC, the script renames the existing patch by adding the suffix .orig and generates a new patch in its place. If no patch existed, the new one is created with a name that contains the path and filename of the file being patched, except that "/" separators and "." characters are replaced by underscores: for example, a new patch to $WRKSRC/foo/bar.c would be created as $PATCHDIR/patch-foo_bar_c. If you save a .orig backup of a file, but don't change the file, update-patches will generate an empty patch. diff --git a/Tools/scripts/mfh b/Tools/scripts/mfh deleted file mode 100755 index 85427a48fe7e..000000000000 --- a/Tools/scripts/mfh +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/sh -# -# mfh - Merge from head to a given branch -# -# Usage: mfh [] [] -# is optional and defaults to latest branch -# If supplying multiple revnumbers, put them in chronological order -# (111111 111112 111113) -# -# Copyright 2013 Baptiste Daroussin -# 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. -# -# MAINTAINER= portmgr@FreeBSD.org - -set -eu - -LF=$(printf '\nX') -LF=${LF%X} -IFS="${LF}" - -# defaults from here --------------------------- - -: ${svnserver:="svn+ssh://repo.FreeBSD.org"} -: ${EDITOR:=vi} - -# implementation from here --------------------- - -err() { - echo "$@" >&2 - exit 1 -} - -ask() { - question=${1} - - answer=x - while [ "${answer}" != "y" -a "${answer}" != "n" ] ; do - printf "%s [y/n] " "${question}" - read -r answer - done - - [ "${answer}" = "y" ] && return 0 - return 1 -} - -# -- find svn and diff coloring command -- - -if [ -n "$(command -v svn 2>/dev/null)" ]; then - svn=svn -elif [ -n "$(command -v svnlite 2>/dev/null)" ]; then - svn=svnlite -else - err "Neither svn(1) nor svnlite(1) found. Please install devel/subversion." -fi - -latest_branch=$("${svn}" ls ${svnserver}/ports/branches/|sed -ne '/^2.*Q./s|/$||p'|tail -1) - -[ $# -lt 1 ] && err "$(basename "$0") requires at least 1 arguments: [] [...]" -branch=$1 - -if [ -n "$(command -v ydiff)" ] ; then cdiffcmd=ydiff -elif [ -n "$(command -v colordiff)" ] ; then cdiffcmd=colordiff -else cdiffcmd=cat -fi - -# I sure hope by 2030 we'll be doing something else. Yes, famous last words. -if expr -- "${branch}" : '20[12][0-9]Q[1-4]' > /dev/null; then - shift - if [ "${latest_branch}" != "${branch}" ]; then - ask "/!\\ The latest branch is ${latest_branch}, do you really want to commit to ${branch}?" || exit 1 - fi -else - branch=${latest_branch} -fi - -## -- parse revisions -- - -for rev in "$@" -do - rev=${rev##r} # remove a leading "r" - case ${rev} in - ''|*[!-0-9]*) err "revision \"${rev}\" should be a number" ;; - esac -done - -## -- set up tmpdir and auto-clean -- - -dir=$(mktemp -d /tmp/mfh.XXXXXX) -trap "rc=\$? ; echo '+ rm -rf \"${dir}\"' ; rm -rf \"\${dir}\" ; trap - EXIT ; exit \$rc" EXIT INT QUIT TERM -cd "${dir}" - -## -- check out, merge, generate commit log -- - -printf "MFH:" > commit.txt -for rev in "$@" -do - rev=${rev##r} - printf " r%s" "${rev}" >> commit.txt -done -echo >> commit.txt - -# iterate over revisions to assemble dirlist (for checkout) -# and accumulate log messages -dirlist="" -for rev in "$@" -do - rev=${rev##r} - for f in $("${svn}" diff --summarize -c "r${rev}" "${svnserver}/ports/head"); do - # ignore top-level filenames without slash - case ${f} in - */*) ;; - *) continue ;; - esac - f=${f#*/ports/head/} - # strip down f to the first two components (CATEGORY/PORTNAME), - # so that if the MFH only addresses files/, we still get the - # full port to review, and, for instance, bump PORTREVISION - # separately if the patch was broken out from a larger lump. - while :; do - case ${f} in - */*/*) f=${f%/*} ;; - *) break ;; - esac - done - dirlist="${dirlist}${f}${LF}" - done - "${svn}" log "-r${rev##-}" ${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \ - | sed '$d' >> commit.txt -done -dirlist=$(printf '%s' "${dirlist}" | sort -u | sed "s}^}${branch}/}") - -"${svn}" co --quiet --depth=empty ${svnserver}/ports/branches/"${branch}" -"${svn}" up --parents --set-depth=infinity $dirlist -"${svn}" up --quiet "${branch}" -for rev in "$@" -do - rev=${rev##r} - "${svn}" merge -c "r${rev}" ^/head/ "${branch}" -done -"${svn}" up --quiet "${branch}" - -## -- present final result to user -- -svnstat=$("${svn}" status "${branch}") -if [ -z "${svnstat}" ] ; then - err "The MFH came up empty - already merged? Wrong revision given?" -fi - -echo -printf '%s\n' "${svnstat}" -"${svn}" diff "${branch}" | $cdiffcmd -printf '\nSee the status/diff above: all the merge work was done on %s.\n' "${dir}/${branch}" -ask "Do you want to commit? (no = start a shell)" || ( - echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script." - cd "${branch}" - pwd - su -m $(id -un) || : - ask "Do you want to commit now? (no = clean up and abort)" || err "User-requested abort." -) -echo >> commit.txt - -## -- edit pre-assembled log message and commit -- -${EDITOR} commit.txt -while ! "${svn}" ci -F commit.txt "${branch}"; do - if ! ask "Commit failed. Re-edit message and try again?"; then - save_log="$(mktemp -t mfh)" - cp -f commit.txt "${save_log}" - echo "Saving commit log to ${save_log}" - break - fi - ${EDITOR} commit.txt -done - -# the trap will clean up for us -exit 0 diff --git a/Tools/scripts/psvn b/Tools/scripts/psvn deleted file mode 100755 index 74368cdbd452..000000000000 --- a/Tools/scripts/psvn +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -eu -# -# psvn - Wrapper to set Subversion properties automatically -# -# Copyright (c) 2012 Beat Gaetzi -# Copyright (c) 2012,2014 Matthias Andree -# 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 -# -# $FreeBSD$ -# -# MAINTAINER= mandree@FreeBSD.org -# beat@ has implicit approval to change this script. -# - -# -# The psvn wrapper checkes from replaced, conflicting, missing or -# untracked files. When committing it adds the needed Subversion -# properties and removes unneeded ones. -# There is also adds a check subcommand which just executes the -# checks. -# - -PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:${PATH} -export PATH - -SVN="$(which svn)" -LF="$(printf '\nX')" -LF="${LF%X}" - -VERSION=$("${SVN}" --version --quiet | sed -e 's,^\(.*\)\.\(.*\)\..*,\1\2,') -if [ ${VERSION} -lt 17 ] ; -then - echo "===> Please consider upgrading to Subversion 1.7 (or newer)" -fi - -checkstatus () { - local IFS _error _file _status _statusline - - _error=0 - eval "set -- $@" - IFS="$LF" - set -- $("${SVN}" status -- "$@") - - for _statusline - do - _status="$(printf '%.7s' "${_statusline}")" - _file="${_statusline##????????}" - - case "${_status}" in - R*) - printf >&2 '===> Do not replace files as this may lose history: "%s"\n' "${_file}" - _error=1 - ;; - C*|?C*) - printf >&2 '===> Conflict detected: \"%s\"\n' "${_file}" - _error=1 - ;; - \~*) - printf >&2 '===> Versioned item \"%s\" obstructed.\n' "${_file}" - _error=1 - ;; - \?*) - printf >&2 '===> Untracked new file "%s". Consider svn adding or deleting it.\n' "${_file}" - _error=1 - ;; - \!*) - printf >&2 '===> Missing file "%s". Consider re-adding or svn deleting it.\n' "${_file}" - _error=1 - ;; - esac - done - - if [ ${_error} -ne 0 ] ; - then - exit 1 - fi -} - -setprop () { - local _file - - eval "set -- $1" - - for _file - do - if [ -d "${_file}" -o ! -e "${_file}" ] ; - then - continue - fi - printf >&2 '=> Adding svn keywords to "%s"\n' "${_file}" - case $(egrep -- '\$FreeBSD\$|\$[BDFSer]+:' "${_file}" >/dev/null || echo $?) in - "") # matched pattern - "${SVN}" -q -- propset svn:keywords "FreeBSD=%H" "${_file}" - "${SVN}" -q -- propdel fbsd:nokeywords "${_file}" - ;; - 1) # no match - "${SVN}" -q -- propset fbsd:nokeywords yes "${_file}" - "${SVN}" -q -- propdel svn:keywords "${_file}" - ;; - *) # egrep failed - exit 1 - ;; - esac - if [ "${_file##/*}" != "bsd.port.mk" ] ; then - "${SVN}" -q -- propset svn:eol-style native "${_file}" - fi - "${SVN}" -q -- propset svn:mime-type text/plain "${_file}" - "${SVN}" -q -- propdel cvs2svn:cvs-rev "${_file}" - done -} - -# taken from "Rich's sh (POSIX shell) tricks", -# a "Programming Guide[...]" at http://www.etalabs.net/sh_tricks.html -savearray() { - for i do - printf %s\\n "$i" | sed -e "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" - done - echo " " -} - -getfilequotedarray() { - local varname IFS - varname="$1" - shift - IFS="$LF" - set -- $("${SVN}" status -- "$@" | grep -v '^ ' | sed 's/^....... //') - eval "$varname=\$(savearray "\$@")" -} - -for opt ; do - case "${opt}" in - -*) continue ;; - esac - case "${opt}" in - check) - shift - if [ $# -gt 0 ] ; then - echo >&2 "===> Unsupported option before, or garbage after command" - exit 1 - fi - getfilequotedarray "files" "$@" - checkstatus "${files}" - exit 0 - ;; - ci|commit) - savedargs=$(savearray "$@") - shift - while getopts :qm:F: opt - do - case "$opt" in - q) ;; - m) ;; - F) ;; - \?) echo >&2 "===> Unsupported option -$OPTARG encountered. Abort." - exit 1 ;; - :) echo >&2 "===> Missing argument to option -$OPTARG. Abort." - exit 1 ;; - esac - done - shift $(($OPTIND - 1)) - - getfilequotedarray "files" "$@" - checkstatus "${files}" - setprop "${files}" - - eval "set -- $savedargs" - exec "${SVN}" "$@" - ;; - *) - exec "${SVN}" "$@" - ;; - esac -done