Date: Tue, 16 May 2000 00:03:18 -0500 (CDT) From: hetzels@westbend.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18581: apache13-fp: change to FreeBSD FP4.0 Exts. Message-ID: <200005160503.AAA83134@wbiw01.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 18581
>Category: ports
>Synopsis: Change FP Exts from BSDI to FreeBSD
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 15 22:10:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Scot W. Hetzel
>Release: FreeBSD 4.0-20000307-CURRENT i386
>Organization:
West Bend Internet
>Environment:
>Description:
patch-fa doesn't patch change_server.sh file due it has been changed.
Microsoft has released a new version of the FP4.0 extentions. Along with
this release, they now support FrontPage Exts on FreeBSD (3.3-RELEASE).
fpsrvadm.exe is no longer compiled static with libdescrypt. This was the
only file that required the server to be built with libdescrypt. Unfortuately,
when I changed my links to libscrypt, fpsrvadm.exe created bad MD5 passwords.
Using htpasswd on the _vti_pvt/service.pwd file and entering a new password,
allowed the FP Client to log into the server.
ldd fpsrvadm.exe
libcrypt.so.2 => /usr/lib/libcrypt.so.2 (0x28223000)
libg++.so.4 => /usr/lib/compat/libg++.so.4 (0x28225000)
libstdc++.so.2 => /usr/lib/compat/libstdc++.so.2 (0x28262000)
libm.so.2 => /usr/lib/libm.so.2 (0x28299000)
libc.so.3 => /usr/lib/compat/libc.so.3 (0x282b4000)
ldd htpasswd
libcrypt.so.2 => /usr/lib/libcrypt.so.2 (0x28069000)
libc.so.4 => /usr/lib/libc.so.4 (0x2806b000)
fpsrvadm.exe does create the correct DES passwords, when libcrypt -> libdescrypt.
Due to this problem, apache13-fp still requires libcrypt -> libdescrypt.
>How-To-Repeat:
>Fix:
Changed Files:
Makefile
files/md5
patches/patch-fa
patches/patch-fb
pkg/PLIST
diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile
--- apache13-fp.orig/Makefile Sun Apr 9 19:04:19 2000
+++ apache13-fp/Makefile Mon May 15 23:24:18 2000
@@ -36,7 +36,7 @@
#PATCHFILES=
APACHE= ${DISTNAME}${EXTRACT_SUFX}
-FRONTPAGE= fp40.bsdi.tar.Z
+FRONTPAGE= fp40.freebsd.tar.z
EXTRACT_ONLY= ${APACHE}
diff -ruN apache13-fp.orig/files/md5 apache13-fp/files/md5
--- apache13-fp.orig/files/md5 Wed Mar 1 00:25:05 2000
+++ apache13-fp/files/md5 Mon May 15 20:45:25 2000
@@ -1,5 +1,4 @@
MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (fp40.bsdi.tar.Z) = 2fb460f64fe1853eb791654851be208b
+MD5 (fp40.freebsd.tar.z) = 1a4ff48973347a1d2e6036fb02b9d798
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
diff -ruN apache13-fp.orig/patches/patch-fa apache13-fp/patches/patch-fa
--- apache13-fp.orig/patches/patch-fa Wed Mar 1 00:25:09 2000
+++ apache13-fp/patches/patch-fa Mon May 15 21:22:34 2000
@@ -1,35 +1,26 @@
---- frontpage/version4.0/change_server.sh.orig Mon May 24 13:27:07 1999
-+++ frontpage/version4.0/change_server.sh Thu Feb 24 20:39:30 2000
-@@ -38,9 +38,11 @@
+--- frontpage/version4.0/change_server.sh.orig Mon May 1 11:03:32 2000
++++ frontpage/version4.0/change_server.sh Mon May 15 21:21:29 2000
+@@ -38,9 +38,12 @@
{
VERSION="4.0"
PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd"
- NEWHTTPDNEW="/usr/local/frontpage/version${VERSION}/apache-fp/httpd"
- NEWHTTPDCOMPAT="/usr/local/frontpage/version${VERSION}/apache-fp/httpd.Compat"
- DEFAULTHTTPD="/usr/local/apache/sbin/httpd"
-+ NEWHTTPDNEW="PREFIX/sbin/httpd"
++ AP_TARGET=`PREFIX/sbin/apxs -q TARGET`
++ NEWHTTPDNEW="PREFIX/sbin/${AP_TARGET}"
+ NEWMODFPNEW="PREFIX/libexec/apache/mod_frontpage.so"
+ NEWHTTPDCOMPAT="${NEWHTTPDNEW}"
+ NEWMODFPCOMAPT="${NEWMODFPNEW}"
-+ DEFAULTHTTPD="PREFIX/sbin/httpd"
++ DEFAULTHTTPD="PREFIX/sbin/${AP_TARGET}"
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
-@@ -60,6 +62,9 @@
- IRIX*) machine="sgi" ;;
- SunOS*5.*sun4*) machine="solaris" ;;
- SunOS*5.*i386*) machine="solarisx86" ;;
-+ FreeBSD* | \
-+ NetBSD* | \
-+ OpenBSD* | \
- BSD/OS*) machine="bsdi" ;;
- SCO_SV*) machine="sco5" ;;
- UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-@@ -214,6 +219,20 @@
+@@ -217,8 +220,22 @@
clear
-+ if ($strings $httpdfile | $fgrep "etc/apache/httpd.conf" > /dev/null)
++ if ($strings $httpdfile | $fgrep "etc/apache/${AP_TARGET}.conf" > /dev/null)
+ then
+ NEWHTTPD=$NEWHTTPDNEW
+ NEWMODFP=$NEWMODFPNEW
@@ -44,9 +35,12 @@
+ sed -e 's%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1`
+ else
- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null)
+- if ($strings $httpdfile | $fgrep "etc/httpd.conf" > /dev/null)
++ if ($strings $httpdfile | $fgrep "etc/${AP_TARGET}.conf" > /dev/null)
then
-@@ -232,7 +251,8 @@
+ NEWHTTPD=$NEWHTTPDNEW
+ echo "Selected server uses NEW directory structure:"
+@@ -235,7 +252,8 @@
sourceVersionNumber=`$NEWHTTPD -v | sed 's%^.*Apache/\([0-9\.]*\).*%\1%' | head -1`
sourceFPVersionNumber=`$strings $NEWHTTPD | $fgrep "FrontPage/" 2> /dev/null | sed -e '
s%^.*FrontPage/\([0-9\.]*\).*%\1%' | tail -1`
@@ -56,135 +50,3 @@
echo
echo "Currently running Apache/${targetVersionNumber} FrontPage/${nnl}"
if [ "${targetFPVersionNumber}" = "" ]
-@@ -496,10 +516,19 @@
- *pache*) getHttpDirective $configfile AccessConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- accessconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ accessconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- accessconffile="${configfiledir}access.conf"
-+ accessconffile="${configfiledir}conf/access.conf"
-+ if [ ! -f "$accessconffile" ]
-+ then
-+ configError2
-+ fi
- fi
-
- if [ ! -f "$accessconffile" ]
-@@ -1061,10 +1090,19 @@
- getHttpDirective $configfile ResourceConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
- echo "Getting DocumentRoot from $resconffile."
- getparam DocumentRoot $resconffile
-@@ -1081,10 +1119,19 @@
- resconffile=$param
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
- echo "Getting UserDir from $resconffile."
- getparam UserDir $resconffile
-@@ -1108,10 +1155,19 @@
- *) getHttpDirective $configfile ResourceConfig $port
- if [ "$param" != "" ]
- then
-- file=`basename $param`
-- resconffile="${configfiledir}${file}"
-+ if [ "$param" != "/dev/null" ]
-+ then
-+ file=`basename $param`
-+ resconffile="${configfiledir}${file}"
-+ else
-+ configError
-+ fi
- else
-- resconffile="${configfiledir}srm.conf"
-+ resconffile="${configfiledir}conf/srm.conf"
-+ if [ ! -f "$resconffile" ]
-+ then
-+ configError2
-+ fi
- fi
-
- if [ ! -f "$resconffile" ]
-@@ -1253,6 +1309,39 @@
- getHttpRootDirective $configfile $directive
- fi
-
-+}
-+
-+configError()
-+{
-+ echo
-+ echo "ERROR: ${configfile} invalid format"
-+ echo "Change ${configfile} as follows:"
-+ echo
-+ echo " ResourceConfig ${configfile}"
-+ echo " AccessConfig ${configfile}"
-+ echo
-+ $echo "hit enter to continue${nnl}"
-+ read continue
-+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please"
-+ echo
-+ exit 1
-+}
-+
-+configError2()
-+{
-+ echo
-+ echo "ERROR: ${configfile} invalid"
-+ echo
-+ echo "Change ${configfile} as follows:"
-+ echo
-+ echo " ResourceConfig ${configfiledir}srm.conf"
-+ echo " AccessConfig ${configfiledir}access.conf"
-+ echo
-+ $echo "hit enter to continue${nnl}"
-+ read continue
-+ echo "Ouch!!!!!!!!!!!!! Not so hard, gently please"
-+ echo
-+ exit 1
- }
-
- error()
diff -ruN apache13-fp.orig/patches/patch-fb apache13-fp/patches/patch-fb
--- apache13-fp.orig/patches/patch-fb Wed Mar 1 00:25:09 2000
+++ apache13-fp/patches/patch-fb Mon May 15 21:30:09 2000
@@ -1,25 +1,16 @@
---- frontpage/version4.0/fp_install.sh.orig Mon May 24 12:45:14 1999
-+++ frontpage/version4.0/fp_install.sh Thu Feb 24 20:22:48 2000
-@@ -48,7 +48,7 @@
+--- frontpage/version4.0/fp_install.sh.orig Mon May 1 11:03:32 2000
++++ frontpage/version4.0/fp_install.sh Mon May 15 21:26:42 2000
+@@ -48,7 +48,8 @@
{
VERSION="4.0"
PATH=".:/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb:/etc:/usr/bsd"
- INSTALLDIRDEFAULT="/usr/local/frontpage"
++ AP_TARGET=`PREFIX/sbin/apxs -q TARGET`
+ INSTALLDIRDEFAULT="PREFIX/frontpage"
case "`echo 'x\c'`" in
'x\c') echo="echo -n" nnl= ;; #BSD
-@@ -68,6 +68,9 @@
- IRIX*) machine="sgi" ;;
- SunOS*5.*sun4*) machine="solaris" ;;
- SunOS*5.*i386*) machine="solarisx86" ;;
-+ FreeBSD* | \
-+ NetBSD* | \
-+ OpenBSD* | \
- BSD/OS*) machine="bsdi" ;;
- SCO_SV*) machine="sco5" ;;
- UnixWare\ *\ *\ 7*\ i*) machine="uware7" ;;
-@@ -128,7 +131,7 @@
+@@ -129,7 +130,7 @@
checkuser()
{
#
@@ -28,7 +19,7 @@
#
whoami=`whoami 2>/dev/null` || whoami=`/usr/bin/id | sed -e ' s/).*//; s/^.*(//;'`
-@@ -321,27 +324,27 @@
+@@ -322,27 +323,27 @@
retval=0
@@ -73,7 +64,7 @@
if chmod "$prot" "$installdir"
then
echo "Directory $installdir chmoded to $prot."
-@@ -349,22 +352,22 @@
+@@ -350,22 +351,22 @@
echo "ERROR: Unable to chmod $installdir to $prot."
retval=1
fi
@@ -112,7 +103,7 @@
if [ "$installdir" != "/usr/local/frontpage" ]
then
-@@ -414,7 +417,7 @@
+@@ -415,7 +416,7 @@
vtfile="fp40.$machine.tar"
echo "Platform is $machine."
@@ -121,7 +112,7 @@
getextfilename $vtfilelocation $vtfile || return 1
-@@ -538,7 +541,7 @@
+@@ -539,7 +540,7 @@
upgrade="no"
echo "For details on how to upgrade servers manually, please see"
echo "the Server Extension Resource Kit (SERK), located in"
@@ -130,7 +121,7 @@
echo
return $retval
else
-@@ -655,10 +658,15 @@
+@@ -656,10 +657,15 @@
*pache*) getHttpDirective $configfile AccessConfig $port
if [ "$param" != "" ]
then
@@ -149,11 +140,11 @@
fi
if [ ! -f "$accessconffile" ]
-@@ -1105,18 +1113,29 @@
+@@ -1106,18 +1112,29 @@
webname="/"
-+ defconfigfile="PREFIX/etc/apache/httpd.conf"
++ defconfigfile="PREFIX/etc/apache/${AP_TARGET}.conf"
+
configfile=""
while ( [ "$configfile" = "" ] || [ ! -f $configfile ] )
@@ -182,7 +173,7 @@
done
getparam Port $configfile
-@@ -1131,6 +1150,39 @@
+@@ -1132,6 +1149,39 @@
getparam User $configfile
defwebowner=$param
@@ -222,7 +213,7 @@
weconfigfile="${installdir}/we${port}.cnf"
webowner=""
-@@ -1146,6 +1198,12 @@
+@@ -1147,6 +1197,12 @@
getparam Group $configfile
defgroup=$param
@@ -235,7 +226,7 @@
webgroup=""
until [ "$webgroup" != "" ]
do
-@@ -1157,6 +1215,8 @@
+@@ -1158,6 +1214,8 @@
webgroup=$defgroup
fi
done
@@ -244,7 +235,7 @@
until [ "$servertype" != "" ]
do
-@@ -1167,9 +1227,13 @@
+@@ -1168,9 +1226,13 @@
echo " 4. netscape-fasttrack"
echo " 5. netscape-enterprise"
echo " 6. stronghold"
@@ -259,7 +250,7 @@
case $servertypenum in
"1") servertype="ncsa" ;;
-@@ -1545,6 +1609,8 @@
+@@ -1546,6 +1608,8 @@
read admin
done
@@ -268,7 +259,7 @@
until [ "$servertype" != "" ]
do
echo
-@@ -1554,9 +1620,13 @@
+@@ -1555,9 +1619,13 @@
echo " 4. netscape-fasttrack"
echo " 5. netscape-enterprise"
echo " 6. stronghold"
@@ -283,7 +274,7 @@
case $servertypenum in
"1") servertype="ncsa" ;;
-@@ -2023,7 +2093,6 @@
+@@ -2024,7 +2092,6 @@
then
getHttpRootDirective $configfile $directive
fi
@@ -291,7 +282,7 @@
}
getnetscapedocroot()
-@@ -2216,7 +2285,7 @@
+@@ -2217,7 +2284,7 @@
initialize
step1
diff -ruN apache13-fp.orig/pkg/PLIST apache13-fp/pkg/PLIST
--- apache13-fp.orig/pkg/PLIST Mon Mar 20 19:20:00 2000
+++ apache13-fp/pkg/PLIST Mon May 15 23:12:51 2000
@@ -103,14 +103,16 @@
share/doc/apache/index.html.es-dist
share/doc/apache/index.html.fr-dist
share/doc/apache/index.html.it-dist
+share/doc/apache/index.html.ja.jis-dist
share/doc/apache/index.html.lu-dist
share/doc/apache/index.html.nl-dist
+share/doc/apache/index.html.po.iso-pl-dist
share/doc/apache/index.html.pt-dist
share/doc/apache/index.html.pt-br-dist
share/doc/apache/index.html.se-dist
@unexec rm -rf %B/index.html.??
-@unexec rm -rf %B/index.html.po.iso-pl-dist
-@unexec rm -rf %B/index.html.ja.jis-dist
+@unexec rm -rf %B/index.html.po.iso-pl
+@unexec rm -rf %B/index.html.ja.jis
@unexec rm -rf %B/index.html.pt-br
share/doc/apache/manual/LICENSE
share/doc/apache/manual/bind.html
@@ -414,7 +416,7 @@
frontpage/%%FP_REV%%/admin/topright.gif
frontpage/%%FP_REV%%/admin/uninstal.htm
frontpage/%%FP_REV%%/apache-fp/_vti_bin/fpexe
-frontpage/%%FP_REV%%/apache-fp/fp-patch-apache_1.3.3
+frontpage/%%FP_REV%%/apache-fp/fp-patch-apache_1.3.12
frontpage/%%FP_REV%%/apache-fp/fpexe.c
@unexec if [ -f %B/suidkey ] ; then rm -f %B/suidkey* ; fi
frontpage/%%FP_REV%%/bin/_vti_inf.htm
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200005160503.AAA83134>