pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Removed etcupdate from pkgsrc as it is includ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/be1f695a15a0
branches: trunk
changeset: 499241:be1f695a15a0
user: martti <martti%pkgsrc.org@localhost>
date: Fri Sep 16 07:40:22 2005 +0000
description:
Removed etcupdate from pkgsrc as it is included in NetBSD 1.6 and later.
diffstat:
sysutils/Makefile | 3 +-
sysutils/etcupdate/DESCR | 9 -
sysutils/etcupdate/Makefile | 28 -
sysutils/etcupdate/PLIST | 3 -
sysutils/etcupdate/files/etcupdate | 539 -----------------------------------
sysutils/etcupdate/files/etcupdate.8 | 315 --------------------
6 files changed, 1 insertions(+), 896 deletions(-)
diffs (truncated from 931 to 300 lines):
diff -r 7b774931f7b7 -r be1f695a15a0 sysutils/Makefile
--- a/sysutils/Makefile Fri Sep 16 06:10:15 2005 +0000
+++ b/sysutils/Makefile Fri Sep 16 07:40:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.305 2005/08/10 21:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.306 2005/09/16 07:40:22 martti Exp $
#
COMMENT= System utilities
@@ -55,7 +55,6 @@
SUBDIR+= e2fsprogs
SUBDIR+= easydiskpasswd
SUBDIR+= estd
-SUBDIR+= etcupdate
SUBDIR+= extipl
SUBDIR+= fakeroot
SUBDIR+= fam
diff -r 7b774931f7b7 -r be1f695a15a0 sysutils/etcupdate/DESCR
--- a/sysutils/etcupdate/DESCR Fri Sep 16 06:10:15 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-etcupdate helps you to update the configuration files in /etc after
-performing an operating system upgrade.
-
-The idea for this script (including code fragments, variable names etc.)
-came from the FreeBSD mergemaster (by Douglas Barton). Unlike the FreeBSD
-mergemaster, this does not use CVS version tags to compare if the files
-need to be updated. Files are compared with /usr/bin/cmp as this is more
-reliable and the only way if the version numbers are same even though the
-files are different.
diff -r 7b774931f7b7 -r be1f695a15a0 sysutils/etcupdate/Makefile
--- a/sysutils/etcupdate/Makefile Fri Sep 16 06:10:15 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:23 tv Exp $
-
-DISTNAME= etcupdate-20031112
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= martti%NetBSD.org@localhost
-HOMEPAGE= http://www.NetBSD.org/Documentation/current/
-COMMENT= Script to update the configuration and startup files in /etc
-
-ONLY_FOR_PLATFORM= NetBSD-*-*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-WRKSRC= ${WRKDIR}
-EXTRACT_ONLY= # defined
-NO_CHECKSUM= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-
-INSTALLATION_DIRS= bin man/man8
-
-do-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/etcupdate ${PREFIX}/bin/etcupdate
- ${INSTALL_MAN} ${FILESDIR}/etcupdate.8 ${PREFIX}/man/man8
-
-.include "../../mk/bsd.pkg.mk"
diff -r 7b774931f7b7 -r be1f695a15a0 sysutils/etcupdate/PLIST
--- a/sysutils/etcupdate/PLIST Fri Sep 16 06:10:15 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/20 09:53:54 martti Exp $
-bin/etcupdate
-man/man8/etcupdate.8
diff -r 7b774931f7b7 -r be1f695a15a0 sysutils/etcupdate/files/etcupdate
--- a/sysutils/etcupdate/files/etcupdate Fri Sep 16 06:10:15 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,539 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: etcupdate,v 1.23 2003/12/03 04:51:43 martti Exp $
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Martti Kuparinen.
-#
-# 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.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the NetBSD
-# Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-#
-#
-# This script helps you to update the configuration files in /etc
-# after an operating system upgrade. Instead of running "make distribution"
-# in /usr/src/etc (and losing your current configuration) you can easily
-# see the modifications and either install the new version or merge the
-# changes in to your current configuration files.
-#
-# This script was written by Martti Kuparinen <martti%NetBSD.org@localhost> and
-# improved by several other NetBSD users.
-#
-# The idea for this script (including code fragments, variable names etc.)
-# came from the FreeBSD mergemaster (by Douglas Barton).
-#
-PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}"
-
-# Default settings
-TEMPROOT="${TEMPROOT:=/tmp/temproot}"
-SRCDIR="${SRCDIR:=/usr/src/etc}"
-PAGER="${PAGER:=/usr/bin/more}"
-SWIDTH=`stty -a | awk '/columns/{w=$6}END{if(w==0){w=80}print w}'`
-WIDTH="${WIDTH:=${SWIDTH}}"
-VERBOSE=
-CONTINUE=
-BINARY=
-AUTOMATIC=
-LOCALSKIP=
-MACHINE="${MACHINE:=`uname -m`}"
-export MACHINE
-MACHINE_ARCH="${MACHINE_ARCH:=`uname -p`}"
-export MACHINE_ARCH
-
-# Settings for post-installation procedures
-NEED_MTREE=
-NEED_MAKEDEV=
-NEED_NEWALIASES=
-NEED_PWD_MKDB=
-
-usage() {
- cat << EOF
-
-Usage: `basename $0` [options]
-
-Options:
-
- -b srcdir Location of the extracted sets
- -p pager Which pager to use (default: /usr/bin/more)
- -s srcdir Location of the source files (default: /usr/src/etc)
- -t temproot Where to store temporary files (default: /tmp/temproot)
- -w width Screen width (default: 80)
-
- -a Automatically update unmodified files
- -l Automatically skip files with strictly local changes
- (this option has no effect on files lacking RCS Ids)
- -h This help text
- -v Be more verbose
-
-EOF
- exit 1
-}
-
-verbose() {
- # $* = message to display if in verbose mode
-
- [ ! -z "${VERBOSE}" ] && echo ${*}
-}
-
-yesno() {
- # $* = message to display
-
- echo -n "${*}? (y/[n]) "
- read ANSWER
- case "${ANSWER}" in
- y|Y)
- return 0
- ;;
- *)
- return 1
- ;;
- esac
-}
-
-install_dir() {
- # $1 = target directory
-
- if yesno "Create ${1}"; then
- verbose "Creating ${1}"
- mkdir -p "${1}" || exit 1
- NEED_MTREE=YES
- fi
-}
-
-install_file() {
- # $1 = target file
-
- # Install the new file
- verbose "Installing ${1}"
- cp -p "${TEMPROOT}${1}" "${1}" && rm -f "${TEMPROOT}${1}"
-
- # Check if this was a special file
- case "${1}" in
- /dev/MAKEDEV)
- NEED_MAKEDEV=YES
- ;;
- /dev/MAKEDEV.local)
- NEED_MAKEDEV=YES
- ;;
- /etc/mail/aliases)
- NEED_NEWALIASES=YES
- ;;
- /etc/master.passwd)
- NEED_PWD_MKDB=YES
- ;;
- esac
-}
-
-install_checksum() {
- # $1 = target file
-
- [ "${AUTOMATIC}" != "YES" ] && return
-
- D=`dirname "${1}"`
- mkdir -p "/var/etcupdate/${D}"
- md5 "${1}" > "/var/etcupdate/${1}"
-}
-
-diff_and_merge_file() {
- # $1 = target file
-
- if cmp -s "${TEMPROOT}${1}" "${1}"; then
- verbose "===> ${1} (ok)"
- rm -f "${TEMPROOT}${1}"
- install_checksum "${1}"
- return
- fi
-
- if [ "${AUTOMATIC}" = "YES" -a -f "/var/etcupdate/${1}" ] ; then
- SUM1=`md5 "${1}"`
- SUM2=`cat "/var/etcupdate/${1}"`
- if [ "${SUM1}" = "${SUM2}" ] ; then
- install_file "${1}"
- install_checksum "${1}"
- return
- fi
- fi
-
- if [ "${LOCALSKIP}" = "YES" ] ; then
- ID1=`ident -q "${TEMPROOT}${1}" | sed -n 2p`
- ID1="${ID1:-0}"
- ID2=`ident -q "${1}" | sed -n 2p`
- ID2="${ID2:-1}"
- if [ "${ID1}" = "${ID2}" ] ; then
- verbose "===> ${1} (ok:RCS)"
- rm -f "${TEMPROOT}${1}"
- return
- fi
- fi
-
- clear
- if [ ! -f "${1}" ]; then
- verbose "===> ${1} (missing)"
- DOES_EXIST=
- else
- verbose "===> ${1} (modified)"
- verbose ""
- DOES_EXIST=YES
- diff -u "${1}" "${TEMPROOT}${1}" | ${PAGER}
- fi
-
- STAY_HERE=YES
- ALREADY_MERGED=
-
- # Determine name for the backup file (/foo/._etcupdate.bar)
- D=`dirname "${TEMPROOT}${1}"`
- F=`basename "${TEMPROOT}${1}"`
- B="${D}/.etcupdate.${F}"
- F="${D}/${F}"
-
- while [ "x${STAY_HERE}" = "xYES" ]; do
-
- # Ask the user if (s)he wants to install the new
- # version or perform a more complicated manual work.
- echo ""
- echo -n "File: ${1}"
- if [ ! -f "${1}" ]; then
- echo -n " (missing)"
- else
- echo -n " (modified)"
- fi
- echo ""
Home |
Main Index |
Thread Index |
Old Index