- Update to 2.0.61
- sync' startup script with www/apache22
This commit is contained in:
Clement Laforet
parent
fc5126bc4c
commit
21219460d9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=199198
5 changed files with 130 additions and 135 deletions
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= apache
|
||||
PORTVERSION= 2.0.59
|
||||
PORTVERSION= 2.0.61
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
|
||||
${MASTER_SITE_LOCAL:S/$/:powerlogo/}
|
||||
|
|
@ -50,7 +50,7 @@ SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
|
|||
USE_ICONV= yes
|
||||
USE_AUTOTOOLS= autoconf:259 libtool:15
|
||||
USE_PERL5= yes
|
||||
USE_RC_SUBR= yes
|
||||
USE_RC_SUBR= apache2.sh
|
||||
USE_APACHE= common20
|
||||
LIBTOOLFILES= configure
|
||||
USE_LDCONFIG= ${PREFIX}/lib/apache2
|
||||
|
|
@ -187,8 +187,6 @@ post-patch:
|
|||
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
|
||||
); done
|
||||
@${RM} -f ${WRKSRC}/docs/docroot/*.bak
|
||||
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
|
||||
${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
|
||||
@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
|
||||
@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
|
||||
@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
|
||||
|
|
@ -213,16 +211,7 @@ post-configure:
|
|||
pre-install:
|
||||
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
|
||||
|
||||
install-startup-script:
|
||||
.if !exists(${WRKDIR}/apache2.sh)
|
||||
@${MKDIR} ${WRKDIR}
|
||||
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
|
||||
${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
|
||||
.endif
|
||||
@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
|
||||
@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
|
||||
|
||||
post-install: install-startup-script
|
||||
post-install:
|
||||
@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
|
||||
@${MKDIR} ${PREFIX}/etc/apache2/Includes
|
||||
@${ECHO_CMD} ""
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (apache2/httpd-2.0.59.tar.bz2) = b0200a497d1c89daad680c676d32a6df
|
||||
SHA256 (apache2/httpd-2.0.59.tar.bz2) = bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
|
||||
SIZE (apache2/httpd-2.0.59.tar.bz2) = 4743549
|
||||
MD5 (apache2/httpd-2.0.61.tar.bz2) = 7d78bbaa17adc16ce4e0303a4fb87247
|
||||
SHA256 (apache2/httpd-2.0.61.tar.bz2) = c257d3a6c120a21a637b422cf9973be2fca9bee58ae70478f5235adb5fac8899
|
||||
SIZE (apache2/httpd-2.0.61.tar.bz2) = 4580339
|
||||
MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
|
||||
SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
|
||||
SIZE (apache2/powerlogo.gif) = 5279
|
||||
|
|
|
|||
|
|
@ -1,116 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
# PROVIDE: apache2
|
||||
# REQUIRE: NETWORKING SERVERS
|
||||
# BEFORE: LOGIN
|
||||
# KEYWORD: shutdown
|
||||
|
||||
#
|
||||
# Add the following lines to /etc/rc.conf to enable apache2:
|
||||
# apache2_enable (bool): Set to "NO" by default.
|
||||
# Set it to "YES" to enable apache2
|
||||
# apache2_profiles (string): Undefined by default. Define here your profiles.
|
||||
# apache2ssl_enable (bool): Set to "NO" by default.
|
||||
# Set it to "YES" to start apache with SSL
|
||||
# (if <IfDefined SSL> exists in httpd.conf)
|
||||
# apache2limits_enable (bool):Set to "NO" by default.
|
||||
# Set it to yes to run `limits $limits_args`
|
||||
# just before apache starts.
|
||||
# apache2_flags (str): Set to "" by default.
|
||||
# Extra flags passed to start command.
|
||||
# apache2limits_args (str): Default to "-e -C daemon"
|
||||
# Arguments of pre-start limits run.
|
||||
#
|
||||
|
||||
. %%RC_SUBR%%
|
||||
|
||||
name="apache2"
|
||||
rcvar=`set_rcvar`
|
||||
|
||||
start_precmd="apache2_precmd"
|
||||
restart_precmd="apache2_checkconfig"
|
||||
reload_precmd="apache2_checkconfig"
|
||||
command="%%PREFIX%%/sbin/httpd"
|
||||
_pidprefix="/var/run/httpd"
|
||||
pidfile="${_pidprefix}.pid"
|
||||
required_files=%%PREFIX%%/etc/apache2/httpd.conf
|
||||
|
||||
[ -z "${apache2_enable}" ] && apache2_enable="NO"
|
||||
[ -z "${apache2ssl_enable}" ] && apache2ssl_enable="NO"
|
||||
[ -z "${apache2_flags}" ] && apache2_flags=""
|
||||
[ -z "${apache2limits_enable}" ] && apache2limits_enable="NO"
|
||||
[ -z "${apache2limits_args}" ] && apache2limits_args="-e -C daemon"
|
||||
[ -z "${apache2_configfile}" ] && apache2_configfile=""
|
||||
|
||||
load_rc_config $name
|
||||
|
||||
if [ -n "${2}" ]; then
|
||||
profile=${2}
|
||||
if [ "x${apache2_profiles}" != "x" ]; then
|
||||
pidfile="${_pidprefix}.${profile}.pid"
|
||||
eval apache2_configfile=\${apache2_${profile}_configfile}
|
||||
[ "x${apache2_configfile}" = "x" ] && {
|
||||
echo "You must define a configuration file (apache2_${profile}_configfile)"
|
||||
exit 1
|
||||
}
|
||||
eval apache2_enable=\${apache2_${profile}_enable:-YES}
|
||||
eval apache2ssl_enable=\${apache2ssl_${profile}_enable:-NO}
|
||||
eval apache2_flags=\${apache2_${profile}_flags:-${apache2_flags}}
|
||||
eval apache2limits_enable=\${apache2limits_${profile}_enable:-${apache2limits_enable}}
|
||||
eval apache2limits_args=\${apache2limits_${profile}_args:-${apache2limits_args}}
|
||||
pidfile="${_pidprefix}.${profile}.pid"
|
||||
apache2_flags="-c \"PidFile ${pidfile}\" ${apache2_flags}"
|
||||
else
|
||||
echo "$0: extra argument ignored"
|
||||
fi
|
||||
else
|
||||
if [ "x${apache2_profiles}" != "x" -a "x${1}" != "xrestart" ]; then
|
||||
for profile in ${apache2_profiles}; do
|
||||
echo "===> apache2 profile: ${profile}"
|
||||
$0 $1 $profile
|
||||
retcode=$?
|
||||
if [ "$?" -ne 0 ]; then
|
||||
failed="${profile} ({$retcode}) ${failed}"
|
||||
else
|
||||
success="${profile} ${success}"
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
checkyesno apache2ssl_enable && \
|
||||
apache2_flags="-DSSL $apache2_flags"
|
||||
|
||||
[ "x${apache2_configfile}" != "x" ] && {
|
||||
apache2_flags="-f ${apache2_configfile} ${apache2_flags}"
|
||||
required_files=${apache2_configfile}
|
||||
}
|
||||
|
||||
apache2_checkconfig()
|
||||
{
|
||||
echo "Performing sanity check on apache2 configuration:"
|
||||
eval "${command} ${apache2_flags} -t"
|
||||
}
|
||||
|
||||
apache2_precmd()
|
||||
{
|
||||
if test -f %%PREFIX%%/sbin/envvars
|
||||
then
|
||||
. %%PREFIX%%/sbin/envvars
|
||||
fi
|
||||
if checkyesno apache2limits_enable
|
||||
then
|
||||
eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
sig_reload=SIGUSR1
|
||||
|
||||
extra_commands="reload"
|
||||
run_rc_command "$1"
|
||||
123
www/apache20/files/apache2.sh.in
Normal file
123
www/apache20/files/apache2.sh.in
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
# PROVIDE: apache2
|
||||
# REQUIRE: LOGIN cleanvar
|
||||
# KEYWORD: shutdown
|
||||
|
||||
#
|
||||
# Add the following lines to /etc/rc.conf to enable apache2:
|
||||
# apache2_enable (bool): Set to "NO" by default.
|
||||
# Set it to "YES" to enable apache2
|
||||
# apache2_profiles (str): Set to "" by default.
|
||||
# Define your profiles here.
|
||||
# apache2limits_enable (bool):Set to "NO" by default.
|
||||
# Set it to yes to run `limits $limits_args`
|
||||
# just before apache starts.
|
||||
# apache2_flags (str): Set to "" by default.
|
||||
# Extra flags passed to start command.
|
||||
# apache2limits_args (str): Default to "-e -C daemon"
|
||||
# Arguments of pre-start limits run.
|
||||
|
||||
. %%RC_SUBR%%
|
||||
|
||||
name="apache2"
|
||||
rcvar=`set_rcvar`
|
||||
|
||||
start_precmd="apache2_precmd"
|
||||
restart_precmd="apache2_checkconfig"
|
||||
reload_precmd="apache2_checkconfig"
|
||||
reload_cmd="apache2_graceful"
|
||||
graceful_cmd="apache2_graceful"
|
||||
configtest_cmd="apache2_checkconfig"
|
||||
command="%%PREFIX%%/sbin/httpd"
|
||||
_pidprefix="/var/run/httpd"
|
||||
pidfile="${_pidprefix}.pid"
|
||||
required_files=%%PREFIX%%/etc/apache2/httpd.conf
|
||||
|
||||
[ -z "$apache2_enable" ] && apache2_enable="NO"
|
||||
[ -z "$apache2_profiles" ] && apache2_profiles=""
|
||||
[ -z "$apache2_flags" ] && apache2_flags=""
|
||||
[ -z "$apache2limits_enable" ] && apache2limits_enable="NO"
|
||||
[ -z "$apache2limits_args" ] && apache2limits_args="-e -C daemon"
|
||||
|
||||
load_rc_config $name
|
||||
|
||||
if [ -n "$2" ]; then
|
||||
profile="$2"
|
||||
if [ "x${apache2_profiles}" != "x" ]; then
|
||||
pidfile="${_pidprefix}.${profile}.pid"
|
||||
eval apache2_configfile="\${apache2_${profile}_configfile:-}"
|
||||
if [ "x${apache2_configfile}" = "x" ]; then
|
||||
echo "You must define a configuration file (apache2_${profile}_configfile)"
|
||||
exit 1
|
||||
fi
|
||||
required_files="${apache2_configfile}"
|
||||
eval apache2_enable="\${apache2_${profile}_enable:-${apache2_enable}}"
|
||||
eval apache2_flags="\${apache2_${profile}_flags:-${apache2_flags}}"
|
||||
eval apache2_http_accept_enable="\${apache2_${profile}_http_accept_enable:-${apache2_http_accept_enable}}"
|
||||
eval apache2limits_enable="\${apache2limits_${profile}_enable:-${apache2limits_enable}}"
|
||||
eval apache2limits_args="\${apache2limits_${profile}_args:-${apache2limits_args}}"
|
||||
apache2_flags="-f ${apache2_configfile} -c \"PidFile ${pidfile}\" ${apache2_flags}"
|
||||
else
|
||||
echo "$0: extra argument ignored"
|
||||
fi
|
||||
else
|
||||
if [ "x${apache2_profiles}" != "x" -a "x$1" != "x" ]; then
|
||||
for profile in ${apache2_profiles}; do
|
||||
echo "===> apache2 profile: ${profile}"
|
||||
%%PREFIX%%/etc/rc.d/apache2%%RC_SUBR_SUFFIX%% $1 ${profile}
|
||||
retcode="$?"
|
||||
if [ "0${retcode}" -ne 0 ]; then
|
||||
failed="${profile} (${retcode}) ${failed:-}"
|
||||
else
|
||||
success="${profile} ${success:-}"
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
apache2_requirepidfile()
|
||||
{
|
||||
if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
|
||||
echo "${name} not running? (check $pidfile)."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
apache2_checkconfig()
|
||||
{
|
||||
echo "Performing sanity check on apache2 configuration:"
|
||||
eval ${command} ${apache2_flags} -t
|
||||
}
|
||||
|
||||
apache2_graceful() {
|
||||
apache2_requirepidfile
|
||||
|
||||
echo "Performing a graceful restart"
|
||||
eval ${command} ${apache2_flags} -k graceful
|
||||
}
|
||||
|
||||
apache2_precmd()
|
||||
{
|
||||
apache2_checkconfig
|
||||
|
||||
if test -f %%PREFIX%%/sbin/envvars
|
||||
then
|
||||
. %%PREFIX%%/sbin/envvars
|
||||
fi
|
||||
|
||||
if checkyesno apache2limits_enable
|
||||
then
|
||||
eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
extra_commands="reload graceful configtest"
|
||||
run_rc_command "$1"
|
||||
|
|
@ -12,7 +12,6 @@
|
|||
@unexec if cmp -s %D/etc/apache2/ssl.conf %D/%%EXAMPLESDIR%%/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
|
||||
%%EXAMPLESDIR%%/ssl-std.conf
|
||||
@exec [ -f %D/etc/apache2/ssl.conf ] || cp %D/%%EXAMPLESDIR%%/ssl-std.conf %D/etc/apache2/ssl.conf
|
||||
etc/rc.d/apache2.sh
|
||||
include/apache2/ap_compat.h
|
||||
include/apache2/ap_config.h
|
||||
include/apache2/ap_config_auto.h
|
||||
|
|
@ -293,6 +292,7 @@ share/apache2/build/special.mk
|
|||
%%ERROR%%@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
|
||||
%%ICONS%%@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
|
||||
%%ICONS%%www/icons-dist/README
|
||||
%%ICONS%%www/icons-dist/README.html
|
||||
%%ICONS%%www/icons-dist/a.gif
|
||||
%%ICONS%%www/icons-dist/a.png
|
||||
%%ICONS%%www/icons-dist/alert.black.gif
|
||||
|
|
@ -421,7 +421,6 @@ share/apache2/build/special.mk
|
|||
%%ICONS%%www/icons-dist/screw2.png
|
||||
%%ICONS%%www/icons-dist/script.gif
|
||||
%%ICONS%%www/icons-dist/script.png
|
||||
%%ICONS%%www/icons-dist/small/README.txt
|
||||
%%ICONS%%www/icons-dist/small/back.gif
|
||||
%%ICONS%%www/icons-dist/small/back.png
|
||||
%%ICONS%%www/icons-dist/small/binary.gif
|
||||
|
|
|
|||
Loading…
Reference in a new issue