X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fvellumweb-build;h=8c8407f065b8d63655cff08d5de4a61a0b97bcfc;hp=b4987a7ea37afaea80c8f14fabfc07ca05b402c5;hb=93df9f0488349fb5e944f8f1a9f5b9ae172c50a5;hpb=11a13e3ec212d5ddf5c5761182a72a339295e263

diff --git a/bin/vellumweb-build b/bin/vellumweb-build
index b4987a7..8c8407f 100755
--- a/bin/vellumweb-build
+++ b/bin/vellumweb-build
@@ -4,14 +4,12 @@
 
 arch=$HOME/arch
 prefix=/usr/local/apache
-csacek_templatedir=$prefix/htdocs/csacek
 pkgs="
 	httpd=apache_1.3.26
-	openssl=openssl-0.9.6d
-	modssl=mod_ssl-2.8.9-1.3.26
-	php=php-4.2.1
+	openssl=openssl-0.9.6g
+	modssl=mod_ssl-2.8.10-1.3.26
+	php=php-4.2.3
 	modperl=mod_perl-1.27
-	csacek=csacek-2.1.9
 	"
 export CFLAGS="-ggdb3"
 
@@ -31,38 +29,6 @@ echo "$pkgs"|sed -n 's/=/ /p'|while read -r pkg pkgb;do
 	tar x${z}f $arch/$pkgb$pkgarchext;echo -n .
 done;echo
 
-uudecode -o - <<EOF | gzip -dc | (cd $csacek;patch -Ep1)
-begin 644 cstools.c-2.1.9-pc2degree.diff.gz
-M'XL("-TKQ3P"\`V-S=&]O;',N8RTR+C\$N.2UP8S)D96=R964N9&EF9@#3U=55
-M2"Y.3\$[-UC72,]2SU\$\N+LG/SRG62];-+\I,YPPNS5-P2TU24#!6,#2R,C2V
-M,C%4,#(P,.+2UM;&H9\$SI#15P;&@2,\$(J,?0RMC4RL0\$HL?!04'7T-1,QUQ!
-M&T(Y.'\`I\`(&^EH)W8JZ"ECZ8IY&<GU=<HE":5YR9GI>:HI"<D5BDH*6IH-3O
-MZ-CGZ.S<T.HRP=6UL]NSRV>.W]*IR_UGSEL].SBX+639]-!9<R=%12U(3&Q)
-M3\$YN;TYI2DWM6)C9F].3MV31Y/PI*U>M*"Z>7S)M<6GCC(E55=_T8I1BE'35
-MU14JU-758Y3R@Y5T8.X)<%;P22S)S#,"N4H7GZNV;CO6MZ2_8<VEBQ-67-Y^
-M[?K\$N5,?7WWPJ&OFGQ?/=DR????>R]>SWB[KW;N@^7C+TK;V^5<N-*WLO+&P
-M9U+'M"=/%TWNGO+WU?.U,^:\:UW\N_'-\M7[H*Y:M_[_]?=7KDY9^!7H*.T!
-M=\$#^5T2H>/M[ZEHH.\`<3C*J'CC\^\`J/J\1.7[ZZN3U^^]O1YX_?N_0?_MY^>
-M?0X._A+RZFOHBY^_HJ(.)B9>!\$;5X2,IUU-3CY[,/)US)N_<^0OY9R\=NUQ<
-=?*7DU-72\$S=O557IXXDJ7T=GD'L\`9^@I(,H"\`\`\`\`
-\`
-end
-EOF
-
-uudecode -o - <<EOF | gzip -dc | (cd $csacek;patch -Ep1)
-begin 600 guess.c-2.1.9-ignoreallcharsets.diff.gz
-M'XL(")B\$S#P"\`V=U97-S+F,M,BXQ+CDM:6=N;W)E86QL8VAA<G-E=',N9&EF
-M9@!MD%UKPC\`4AJ_37_'2@1]-HTT[F5:\$CL%@('A1[[8A-48-E;8TZ78Q]M\7
-MH]M@["KG')XW>4X88Q"Z\$+)D\8B/9N-#)[4>"5:WZD#RKL*CW\`()>)SR)+WE
-MB*,H]BBE_\;(NI.X;UK\$-I&DD[N43R^)+\`/C41)R#NK.!%GF@1#R5IQLB"Z@
-M3:N;:N#Z\$#Y>C#^<.T27JFGD#HX1?Z!YZ#"/WJ@](L>/\`]C:'"5,7<H*2L,/
-M_!"=EK:NV70ZF;\$8P=C1%AW\O+\`\`1Z\'=_]S]'H>](/^\$!\.)75G9"6LR\$.^
-M7JV6^>8I7RT+HZKX8DJVK2S*2_UIE62U4WLK=^Y%O9,V*;2IZY/>O!^5.)YG
-7W\M<':X[_W[+58V"S[TO%<%CGK\`!\`\`\`\`
-\`
-end
-EOF
-
 (
 set -ex
 
@@ -85,7 +51,8 @@ pushd $modssl
 popd
 
 pushd $php
-	./configure --with-mysql=/usr/local/mysql --with-apache=../$httpd \
+	./configure --with-apache=../$httpd \
+		--with-mysql`d=/usr/local/mysql && test -d $d && echo =$d` \
 		--enable-track-vars \
 		--enable-memory-limit=yes \
 		--enable-debug=no
@@ -97,17 +64,8 @@ pushd $modperl
 	perl Makefile.PL APACHE_SRC=../$httpd DO_HTTPD=1 USE_APACI=1 PREP_HTTPD=1 EVERYTHING=1 \
 			PERL_DEBUG=1
 	make
-	make install
-popd
-
-pushd $csacek
-	./configure --with-target=Apache \
-		--with-templatedir=$csacek_templatedir
-	make mod_csacek.c
-	cp -p mod_csacek.c cs*.h ../$httpd/src/modules/extra/
-	rm -rf $csacek_templatedir
-	mkdir -p $csacek_templatedir
-	cp -a templates/ $csacek_templatedir/
+#	make test	# requires running httpd!
+	make install UNINST=1
 popd
 
 pushd $httpd
@@ -116,10 +74,10 @@ pushd $httpd
 			--activate-module=src/modules/php4/libphp4.a \
 			--activate-module=src/modules/perl/libperl.a \
 					--disable-rule=EXPAT \
-			--activate-module=src/modules/extra/mod_csacek.c \
 			--enable-module=so \
 			--enable-module=headers \
-			--enable-module=rewrite
+			--enable-module=rewrite \
+			--enable-module=auth_anon
 	make
 	make install
 popd