summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@gentoo.org>2005-11-23 20:07:57 +0000
committerGunnar Wrobel <wrobel@gentoo.org>2005-11-23 20:07:57 +0000
commitef0318c1eb969fefc557a1d965b99be0f4881fa2 (patch)
tree07bfba831a4b7d40d56678f4cd0f8692171b7966
parentFixed digests (diff)
downloadoverlay-ef0318c1eb969fefc557a1d965b99be0f4881fa2.tar.gz
overlay-ef0318c1eb969fefc557a1d965b99be0f4881fa2.tar.bz2
overlay-ef0318c1eb969fefc557a1d965b99be0f4881fa2.zip
Bumping to webapp-config-1.51
svn path=/; revision=548
-rw-r--r--Makefile2
-rw-r--r--app-admin/webapp-config/webapp-config-1.51.ebuild (renamed from app-admin/webapp-config/webapp-config-1.50.ebuild)0
-rw-r--r--eclass/webapp.eclass542
3 files changed, 1 insertions, 543 deletions
diff --git a/Makefile b/Makefile
index 73680df..74e5de5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EBUILDS=app-admin/webapp-config/webapp-config-1.50.package \
+EBUILDS=app-admin/webapp-config/webapp-config-1.51.package \
app-emacs/muse/muse-3.01.99.package \
app-emacs/muse/muse-3.02.02.package \
app-emacs/url-cvs/url-cvs-23.package \
diff --git a/app-admin/webapp-config/webapp-config-1.50.ebuild b/app-admin/webapp-config/webapp-config-1.51.ebuild
index 07c5e91..07c5e91 100644
--- a/app-admin/webapp-config/webapp-config-1.50.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.51.ebuild
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
deleted file mode 100644
index 4a236ff..0000000
--- a/eclass/webapp.eclass
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.30 2005/05/10 22:55:17 beu Exp $
-#
-# eclass/webapp.eclass
-# Eclass for installing applications to run under a web server
-#
-# Part of the implementation of GLEP #11
-#
-# Author(s) Stuart Herbert <stuart@gentoo.org>
-# Renat Lumpau <rl03@gentoo.org>
-# Gunnar Wrobel <php@gunnarwrobel.org>
-#
-# ------------------------------------------------------------------------
-#
-# The master copy of this eclass is held in our subversion repository.
-# http://svn.gnqs.org/projects/vhost-tools/browser/
-#
-# If you make changes to this file and don't tell us, chances are that
-# your changes will be overwritten the next time we release a new version
-# of webapp-config.
-#
-# ------------------------------------------------------------------------
-
-# the new version of w-c doesn't work with the old eclass
-# so we do some wrapper magic
-
-SLOT="${PV}"
-IUSE="vhosts"
-DEPEND="net-www/webapp-config"
-RDEPEND="${DEPEND}"
-
-EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm
-
-INSTALL_DIR="/${PN}"
-IS_UPGRADE=0
-IS_REPLACE=0
-
-INSTALL_CHECK_FILE="installed_by_webapp_eclass"
-
-ETC_CONFIG="/etc/vhosts/webapp-config"
-
-function webapp_config ()
-{
- ENVVAR=$(/usr/sbin/webapp-config --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!"
- eval ${ENVVAR}
-}
-
-# ------------------------------------------------------------------------
-# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
-#
-# Check whether a specified file exists within the image/ directory
-# or not.
-#
-# @param $1 - file to look for
-# @param $2 - prefix directory to use
-# @return 0 on success, never returns on an error
-# ------------------------------------------------------------------------
-
-function webapp_checkfileexists ()
-{
- local my_prefix
-
- [ -n "${2}" ] && my_prefix="${2}/" || my_prefix=
-
- if [ ! -e "${my_prefix}${1}" ]; then
- msg="ebuild fault: file '${1}' not found"
- eerror "$msg"
- eerror "Please report this as a bug at http://bugs.gentoo.org/"
- die "$msg"
- fi
-}
-
-# ------------------------------------------------------------------------
-# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
-# ------------------------------------------------------------------------
-
-function webapp_check_installedat
-{
- local my_output
-
- /usr/sbin/webapp-config --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null
-}
-
-# ------------------------------------------------------------------------
-# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
-#
-# ------------------------------------------------------------------------
-
-function webapp_strip_appdir ()
-{
- local my_stripped="${1}"
- echo "${1}" | sed -e "s|${MY_APPDIR}/||g;"
-}
-
-function webapp_strip_d ()
-{
- echo "${1}" | sed -e "s|${D}||g;"
-}
-
-function webapp_strip_cwd ()
-{
- local my_stripped="${1}"
- echo "${1}" | sed -e 's|/./|/|g;'
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# Identify a config file for a web-based application.
-#
-# @param $1 - config file
-# ------------------------------------------------------------------------
-
-function webapp_configfile ()
-{
- webapp_checkfileexists "${1}" "${D}"
-
- local MY_FILE="$(webapp_strip_appdir ${1})"
- MY_FILE="$(webapp_strip_cwd ${MY_FILE})"
-
- einfo "(config) ${MY_FILE}"
- echo "${MY_FILE}" >> ${D}/${WA_CONFIGLIST}
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# Install a script that will run after a virtual copy is created, and
-# before a virtual copy has been removed
-#
-# @param $1 - the script to run
-# ------------------------------------------------------------------------
-
-function webapp_hook_script ()
-{
- webapp_checkfileexists "${1}"
-
- einfo "(hook) ${1}"
- cp "${1}" "${D}/${MY_HOOKSCRIPTSDIR}/$(basename ${1})" || die "Unable to install ${1} into ${D}/${MY_HOOKSCRIPTSDIR}/"
- chmod 555 "${D}/${MY_HOOKSCRIPTSDIR}/$(basename ${1})"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# Install a text file containing post-installation instructions.
-#
-# @param $1 - language code (use 'en' for now)
-# @param $2 - the file to install
-# ------------------------------------------------------------------------
-
-function webapp_postinst_txt ()
-{
- webapp_checkfileexists "${2}"
-
- einfo "(info) ${2} (lang: ${1})"
- cp "${2}" "${D}/${MY_APPDIR}/postinst-${1}.txt"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# Install a text file containing post-upgrade instructions.
-#
-# @param $1 - language code (use 'en' for now)
-# @param $2 - the file to install
-# ------------------------------------------------------------------------
-
-function webapp_postupgrade_txt ()
-{
- webapp_checkfileexists "${2}"
-
- einfo "(info) ${2} (lang: ${1})"
- cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# Identify a file which must be owned by the webserver's user:group
-# settings.
-#
-# The ownership of the file is NOT set until the application is installed
-# using the webapp-config tool.
-#
-# @param $1 - file to be owned by the webserver user:group combo
-#
-# ------------------------------------------------------------------------
-
-function webapp_serverowned ()
-{
- webapp_checkfileexists "${1}" "$D"
- local MY_FILE="$(webapp_strip_appdir ${1})"
- MY_FILE="$(webapp_strip_cwd ${MY_FILE})"
-
- einfo "(server owned) ${MY_FILE}"
- echo "${MY_FILE}" >> "${D}/${WA_SOLIST}"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# @param $1 - the webserver to install the config file for
-# (one of apache1, apache2, cherokee)
-# @param $2 - the config file to install
-# @param $3 - new name for the config file (default is `basename $2`)
-# this is an optional parameter
-#
-# NOTE:
-# this function will automagically prepend $1 to the front of your
-# config file's name
-# ------------------------------------------------------------------------
-
-function webapp_server_configfile ()
-{
- webapp_checkfileexists "${2}"
-
- # sort out what the name will be of the config file
-
- local my_file
-
- if [ -z "${3}" ]; then
- my_file="${1}-$(basename ${2})"
- else
- my_file="${1}-${3}"
- fi
-
- # warning:
- #
- # do NOT change the naming convention used here without changing all
- # the other scripts that also rely upon these names
-
- einfo "(${1}) config file '${my_file}'"
- cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - FOR USE IN EBUILDS
-#
-# @param $1 - the db engine that the script is for
-# (one of: mysql|postgres)
-# @param $2 - the sql script to be installed
-# @param $3 - the older version of the app that this db script
-# will upgrade from
-# (do not pass this option if your SQL script only creates
-# a new db from scratch)
-# ------------------------------------------------------------------------
-
-function webapp_sqlscript ()
-{
- webapp_checkfileexists "${2}"
-
- # create the directory where this script will go
- #
- # scripts for specific database engines go into their own subdirectory
- # just to keep things readable on the filesystem
-
- if [ ! -d "${D}/${MY_SQLSCRIPTSDIR}/${1}" ]; then
- mkdir -p "${D}/${MY_SQLSCRIPTSDIR}/${1}" || die "unable to create directory ${D}/${MY_SQLSCRIPTSDIR}/${1}"
- fi
-
- # warning:
- #
- # do NOT change the naming convention used here without changing all
- # the other scripts that also rely upon these names
-
- # are we dealing with an 'upgrade'-type script?
- if [ -n "${3}" ]; then
- # yes we are
- einfo "(${1}) upgrade script from ${PN}-${PVR} to ${3}"
- cp "${2}" "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
- chmod 600 "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
- else
- # no, we are not
- einfo "(${1}) create script for ${PN}-${PVR}"
- cp "${2}" "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
- chmod 600 "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
- fi
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - call from inside your ebuild's src_install AFTER
-# everything else has run
-#
-# For now, we just make sure that root owns everything, and that there
-# are no setuid files.
-# ------------------------------------------------------------------------
-
-function webapp_src_install ()
-{
- chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
- chmod -R u-s "${D}/"
- chmod -R g-s "${D}/"
-
- keepdir "${MY_PERSISTDIR}"
- fowners "root:root" "${MY_PERSISTDIR}"
- fperms 755 "${MY_PERSISTDIR}"
-
- # to test whether or not the ebuild has correctly called this function
- # we add an empty file to the filesystem
- #
- # we used to just set a variable in the shell script, but we can
- # no longer rely on Portage calling both webapp_src_install() and
- # webapp_pkg_postinst() within the same shell process
-
- touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}"
-}
-
-# ------------------------------------------------------------------------
-# EXPORTED FUNCTION - call from inside your ebuild's pkg_config AFTER
-# everything else has run
-#
-# If 'vhosts' USE flag is not set, auto-install this app
-#
-# ------------------------------------------------------------------------
-
-function webapp_pkg_setup ()
-{
- # add sanity checks here
-
- if [ "${SLOT}+" != "${PV}+" ]; then
- die "ebuild sets SLOT, overrides webapp.eclass"
- fi
-
- # pull in the shared configuration file
-
- G_HOSTNAME="localhost"
- if has_version '>=net-www/webapp-config-1.50'; then
- webapp_config
- else
- . "${ETC_CONFIG}"
- fi
-
- # are we installing a webapp-config solution over the top of a
- # non-webapp-config solution?
-
- if ! use vhosts ; then
- local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
- local my_output
-
- if [ -d "${my_dir}" ] ; then
- einfo "You already have something installed in ${my_dir}"
- einfo "Are you trying to install over the top of something I cannot upgrade?"
-
- my_output="$(webapp_check_installedat)"
-
- if [ "$?" != "0" ]; then
-
- # okay, whatever is there, it isn't webapp-config-compatible
- ewarn
- ewarn "Whatever is in ${my_dir}, it's not"
- ewarn "compatible with webapp-config."
- ewarn
- ewarn "This ebuild may be overwriting important files."
- ewarn
- elif [ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]; then
- eerror "${my_dir} contains ${my_output}"
- eerror "I cannot upgrade that"
- die "Cannot upgrade contents of ${my_dir}"
- else
- einfo
- einfo "I can upgrade the contents of ${my_dir}"
- einfo
- fi
- fi
- fi
-}
-
-function webapp_getinstalltype ()
-{
- # or are we upgrading?
-
- if ! use vhosts ; then
- # we only run webapp-config if vhosts USE flag is not set
-
- local my_output
-
- my_output="$(webapp_check_installedat)"
-
- if [ "${?}" = "0" ] ; then
- # something is already installed there
- #
- # make sure it isn't the same version
-
- local my_pn="$(echo ${my_output} | awk '{ print $1 }')"
- local my_pvr="$(echo ${my_output} | awk '{ print $2 }')"
-
- REMOVE_PKG="${my_pn}-${my_pvr}"
-
- if [ "${my_pn}" == "${PN}" ]; then
- if [ "${my_pvr}" != "${PVR}" ]; then
- einfo "This is an upgrade"
- IS_UPGRADE=1
- else
- einfo "This is a re-installation"
- IS_REPLACE=1
- fi
- else
- einfo "${my_output} is installed there"
- fi
- else
- einfo "This is an installation"
- fi
- fi
-}
-
-function webapp_src_preinst ()
-{
- # create the directories that we need
-
- keepdir "${MY_HTDOCSDIR}"
- keepdir "${MY_HOSTROOTDIR}"
- keepdir "${MY_CGIBINDIR}"
- keepdir "${MY_ICONSDIR}"
- keepdir "${MY_ERRORSDIR}"
- keepdir "${MY_SQLSCRIPTSDIR}"
- keepdir "${MY_HOOKSCRIPTSDIR}"
- keepdir "${MY_SERVERCONFIGDIR}"
-}
-
-function webapp_pkg_postinst ()
-{
- if has_version '>=net-www/webapp-config-1.50'; then
- webapp_config
- else
- . "${ETC_CONFIG}"
- fi
-
- # sanity checks, to catch bugs in the ebuild
-
- if [ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then
- eerror
- eerror "This ebuild did not call webapp_src_install() at the end"
- eerror "of the src_install() function"
- eerror
- eerror "Please log a bug on http://bugs.gentoo.org"
- eerror
- eerror "You should use emerge -C to remove this package, as the"
- eerror "installation is incomplete"
- eerror
- die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org"
- fi
-
- # if 'vhosts' is not set in your USE flags, we install a copy of
- # this application in ${ROOT}/var/www/localhost/htdocs/${PN}/ for you
-
- if ! use vhosts ; then
- echo
- einfo "vhosts USE flag not set - auto-installing using webapp-config"
-
- webapp_getinstalltype
-
- G_HOSTNAME="localhost"
- local my_mode=-I
- if has_version '>=net-www/webapp-config-1.50'; then
- webapp_config
- else
- . "${ETC_CONFIG}"
- fi
-
- if [ "${IS_REPLACE}" = "1" ]; then
- einfo "${PN}-${PVR} is already installed - replacing"
- my_mode=-I
- elif [ "${IS_UPGRADE}" = "1" ]; then
- einfo "${REMOVE_PKG} is already installed - upgrading"
- my_mode=-U
- else
- einfo "${PN}-${PVR} is not installed - using install mode"
- fi
-
- my_cmd="/usr/sbin/webapp-config ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
- einfo "Running ${my_cmd}"
- ${my_cmd}
-
- # remove the old version
- #
- # why do we do this? well ...
- #
- # normally, emerge -u installs a new version and then removes the
- # old version. however, if the new version goes into a different
- # slot to the old version, then the old version gets left behind
- #
- # if USE=-vhosts, then we want to remove the old version, because
- # the user is relying on portage to do the magical thing for it
-
- if [ "${IS_UPGRADE}" = "1" ] ; then
- einfo "Removing old version ${REMOVE_PKG}"
-
- emerge -C "${REMOVE_PKG}"
- fi
- else
- # vhosts flag is on
- #
- # let's tell the administrator what to do next
-
- einfo
- einfo "The 'vhosts' USE flag is switched ON"
- einfo "This means that Portage will not automatically run webapp-config to"
- einfo "complete the installation."
- einfo
- einfo "To install ${PN}-${PVR} into a virtual host, run the following command:"
- einfo
- einfo " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
- einfo
- einfo "For more details, see the webapp-config(8) man page"
- fi
-
- return 0
-}
-
-function webapp_pkg_prerm ()
-{
- # remove any virtual installs that there are
-
- local my_output
- local x
-
- my_output="$(/usr/sbin/webapp-config --list-installs ${PN} ${PVR})"
-
- if [ "${?}" != "0" ]; then
- return
- fi
-
- for x in ${my_output} ; do
- [ -f ${x}/.webapp ] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp"
-
- if [ -z "${WEB_HOSTNAME}" -o -z "${WEB_INSTALLDIR}" ]; then
- ewarn "Don't forget to use webapp-config to remove the copy of"
- ewarn "${PN}-${PVR} installed in"
- ewarn
- ewarn " ${x}"
- ewarn
- else
- # we have enough information to remove the virtual copy ourself
-
- /usr/sbin/webapp-config -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR}
-
- # if the removal fails - we carry on anyway!
- fi
- done
-}