Revert "mod_perl by xpapa." Build not working iso (apache config)

This reverts commit 158c3466a166c526f1ba5049b5867bb0b7947b6a.

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index fac3b0d15c13a1f38d2b438750a8da7affe91dc9..e3098177819ea88a41c8f29245f47b788576469b 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -161,9 +161,9 @@ sub genmenu {
 
 sub showhttpheaders
 {
-#      print "Pragma: no-cache\n";
-#      print "Cache-control: no-cache\n";
-#      print "Connection: close\n";
+       print "Pragma: no-cache\n";
+       print "Cache-control: no-cache\n";
+       print "Connection: close\n";
        print "Content-type: text/html\n\n";
 }
 

diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index 2d47c0588e386d75e207bd91c28c3fd5d628799d..e30f79b28a215d53ad5f3ca4704e8f0002a838ee 100644 (file)
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -49,4 +49,3 @@ LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
 LoadModule php5_module /usr/lib/apache/libphp5.so
-LoadModule perl_module /usr/lib/apache/mod_perl
\ No newline at end of file

diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index ebbd8d964038c2a757e0cc13c8bec8ea56d64b6f..5a39e3e7698c1cc84885d723af65676cc6d28698 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -12,10 +12,6 @@
     SSLCipherSuite ALL:!ADH:!EXPORT56:!eNULL:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP
     SSLCertificateFile /etc/httpd/server.crt
     SSLCertificateKeyFile /etc/httpd/server.key
-
-    PerlRequire /usr/lib/apache/startup.pl
-    PerlWarn On
-
     <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
@@ -31,10 +27,7 @@
     ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
     <Directory /srv/web/ipfire/cgi-bin>
         AllowOverride None
-        Options ExecCGI
-       SetHandler perl-script
-       PerlSendHeader On
-       PerlHandler ModPerl::Registry
+        Options None
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users

diff --git a/config/mod_perl/startup.pl b/config/mod_perl/startup.pl
deleted file mode 100755 (executable)
index a56251f..0000000
--- a/config/mod_perl/startup.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/perl -wT
-
-use ModPerl::Registry;
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-use CGI;
-use CGI::Carp 'fatalsToBrowser';
-use CGI qw(param);
-use CGI qw/:standard/;
-use File::Copy;
-use File::Temp qw/ tempfile tempdir /;
-use IO::Socket;
-use Locale::Country;
-use LWP::UserAgent;
-use Net::DNS;
-use Net::IPv4Addr qw( :all );
-use RRDs;
-use strict;
-use Time::Local;
-use warnings;
-
-print "alle Perl-Module wurden geladen.\n";
-

diff --git a/config/rootfiles/common/mod_perl b/config/rootfiles/common/mod_perl
deleted file mode 100644 (file)
index dc1e3a1..0000000
--- a/config/rootfiles/common/mod_perl
+++ /dev/null
@@ -1,428 +0,0 @@
-usr/lib/apache/startup.pl
-#usr/bin/mp2bug
-#usr/include/apache/mod_perl.h
-#usr/include/apache/modperl_apache_compat.h
-#usr/include/apache/modperl_apache_includes.h
-#usr/include/apache/modperl_apr_compat.h
-#usr/include/apache/modperl_apr_includes.h
-#usr/include/apache/modperl_apr_perlio.h
-#usr/include/apache/modperl_bucket.h
-#usr/include/apache/modperl_callback.h
-#usr/include/apache/modperl_cgi.h
-#usr/include/apache/modperl_cmd.h
-#usr/include/apache/modperl_common_includes.h
-#usr/include/apache/modperl_common_log.h
-#usr/include/apache/modperl_common_types.h
-#usr/include/apache/modperl_common_util.h
-#usr/include/apache/modperl_config.h
-#usr/include/apache/modperl_const.h
-#usr/include/apache/modperl_constants.h
-#usr/include/apache/modperl_debug.h
-#usr/include/apache/modperl_directives.h
-#usr/include/apache/modperl_env.h
-#usr/include/apache/modperl_error.h
-#usr/include/apache/modperl_filter.h
-#usr/include/apache/modperl_flags.h
-#usr/include/apache/modperl_global.h
-#usr/include/apache/modperl_gtop.h
-#usr/include/apache/modperl_handler.h
-#usr/include/apache/modperl_hooks.h
-#usr/include/apache/modperl_interp.h
-#usr/include/apache/modperl_io.h
-#usr/include/apache/modperl_io_apache.h
-#usr/include/apache/modperl_largefiles.h
-#usr/include/apache/modperl_log.h
-#usr/include/apache/modperl_mgv.h
-#usr/include/apache/modperl_module.h
-#usr/include/apache/modperl_options.h
-#usr/include/apache/modperl_pcw.h
-#usr/include/apache/modperl_perl.h
-#usr/include/apache/modperl_perl_global.h
-#usr/include/apache/modperl_perl_includes.h
-#usr/include/apache/modperl_perl_pp.h
-#usr/include/apache/modperl_perl_unembed.h
-#usr/include/apache/modperl_svptr_table.h
-#usr/include/apache/modperl_sys.h
-#usr/include/apache/modperl_time.h
-#usr/include/apache/modperl_tipool.h
-#usr/include/apache/modperl_trace.h
-#usr/include/apache/modperl_types.h
-#usr/include/apache/modperl_util.h
-#usr/include/apache/modperl_xs_sv_convert.h
-#usr/include/apache/modperl_xs_typedefs.h
-#usr/include/apache/modperl_xs_util.h
-usr/lib/apache/mod_perl.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Base64.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Brigade.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Bucket.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/BucketAlloc.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/BucketType.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Const.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Date.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Error.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Finfo.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/IpSubnet.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/OS.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/PerlIO.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Pool.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/SockAddr.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Socket.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Status.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/String.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Table.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/ThreadMutex.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/ThreadRWLock.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/URI.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/UUID.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/Util.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/APR/XSLoader.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/Test.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/Test5005compat.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestBuild.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestClient.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestCommon.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestCommonPost.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfig.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfigC.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfigPHP.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfigParrot.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfigParse.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestConfigPerl.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestHandler.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestHarness.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestHarnessPHP.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestMB.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestMM.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestPerlDB.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestReport.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestReportPerl.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestRequest.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestRun.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestRunPHP.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestRunParrot.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestRunPerl.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestSSLCA.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestServer.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestSmoke.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestSmokePerl.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestSort.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestTrace.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache/TestUtil.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Access.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Build.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/BuildConfig.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/CmdParms.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Command.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Connection.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/ConnectionUtil.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Const.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Directive.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Filter.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/FilterRec.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/HookRun.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Log.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/MPM.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Module.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/ParseSource.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/PerlSections
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/PerlSections.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/PerlSections/Dump.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Process.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/RequestIO.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/RequestRec.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/RequestUtil.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Resource.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Response.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/ServerRec.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/ServerUtil.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/SizeLimit.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/SourceTables.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Status.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/SubProcess.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/SubRequest.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/URI.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/Util.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/XSLoader.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/compat.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Apache2/porting.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Bundle
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Bundle/Apache2.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/Bundle/ApacheTest.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/BuildMM.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/BuildOptions.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/CScan.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Code.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Config.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Const.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/FunctionMap.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Global.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/MM.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Manifest.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/MapUtil.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/MethodLookup.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/ParseSource.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/PerlRun.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/PerlRunPrefork.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Registry.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/RegistryBB.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/RegistryCooker.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/RegistryLoader.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/RegistryPrefork.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/StructureMap.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/TestReport.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/TestRun.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/TypeMap.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/Util.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ModPerl/WrapXS.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/APR.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/APR.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Base64
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Base64/Base64.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Base64/Base64.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Brigade
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Brigade/Brigade.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Brigade/Brigade.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Bucket
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Bucket/Bucket.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Bucket/Bucket.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketAlloc
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketAlloc/BucketAlloc.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketAlloc/BucketAlloc.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketType
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketType/BucketType.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/BucketType/BucketType.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Const
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Const/Const.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Const/Const.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Date
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Date/Date.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Date/Date.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Error
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Error/Error.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Error/Error.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Finfo
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Finfo/Finfo.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Finfo/Finfo.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/IpSubnet
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/IpSubnet/IpSubnet.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/IpSubnet/IpSubnet.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/OS
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/OS/OS.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/OS/OS.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/PerlIO
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/PerlIO/PerlIO.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/PerlIO/PerlIO.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Pool
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Pool/Pool.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Pool/Pool.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/SockAddr
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/SockAddr/SockAddr.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/SockAddr/SockAddr.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Socket
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Socket/Socket.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Socket/Socket.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Status
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Status/Status.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Status/Status.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/String
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/String/String.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/String/String.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Table
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Table/Table.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Table/Table.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadMutex
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadMutex/ThreadMutex.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadMutex/ThreadMutex.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadRWLock
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadRWLock/ThreadRWLock.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/ThreadRWLock/ThreadRWLock.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/URI
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/URI/URI.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/URI/URI.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/UUID
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/UUID/UUID.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/UUID/UUID.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Util
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Util/Util.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/APR/Util/Util.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Access
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Access/Access.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Access/Access.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Build
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Build/autosplit.ix
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/CmdParms
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/CmdParms/CmdParms.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/CmdParms/CmdParms.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Command
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Command/Command.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Command/Command.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Connection
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Connection/Connection.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Connection/Connection.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ConnectionUtil
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ConnectionUtil/ConnectionUtil.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ConnectionUtil/ConnectionUtil.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Const
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Const/Const.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Const/Const.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Directive
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Directive/Directive.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Directive/Directive.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Filter
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Filter/Filter.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Filter/Filter.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/FilterRec
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/FilterRec/FilterRec.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/FilterRec/FilterRec.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/HookRun
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/HookRun/HookRun.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/HookRun/HookRun.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Log
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Log/Log.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Log/Log.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/MPM
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/MPM/MPM.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/MPM/MPM.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Module
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Module/Module.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Module/Module.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Process
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Process/Process.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Process/Process.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestIO
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestIO/RequestIO.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestIO/RequestIO.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestRec
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestRec/RequestRec.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestRec/RequestRec.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestUtil
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestUtil/RequestUtil.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/RequestUtil/RequestUtil.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Response
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Response/Response.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Response/Response.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerRec
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerRec/ServerRec.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerRec/ServerRec.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerUtil
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerUtil/ServerUtil.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/ServerUtil/ServerUtil.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubProcess
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubProcess/SubProcess.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubProcess/SubProcess.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubRequest
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubRequest/SubRequest.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/SubRequest/SubRequest.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/URI
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/URI/URI.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/URI/URI.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Util
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Util/Util.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/Util/Util.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Apache2/typemap
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Const
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Const/Const.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Const/Const.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Global
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Global/Global.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Global/Global.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Util
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Util/Util.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/ModPerl/Util/Util.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/mod_perl2
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/mod_perl2/.packlist
-usr/lib/perl5/site_perl/5.8.8/i586-linux/mod_perl2.pm
-#usr/share/man/man3/APR.3
-#usr/share/man/man3/APR::Base64.3
-#usr/share/man/man3/APR::Brigade.3
-#usr/share/man/man3/APR::Bucket.3
-#usr/share/man/man3/APR::BucketAlloc.3
-#usr/share/man/man3/APR::BucketType.3
-#usr/share/man/man3/APR::Const.3
-#usr/share/man/man3/APR::Date.3
-#usr/share/man/man3/APR::Error.3
-#usr/share/man/man3/APR::Finfo.3
-#usr/share/man/man3/APR::IpSubnet.3
-#usr/share/man/man3/APR::OS.3
-#usr/share/man/man3/APR::PerlIO.3
-#usr/share/man/man3/APR::Pool.3
-#usr/share/man/man3/APR::SockAddr.3
-#usr/share/man/man3/APR::Socket.3
-#usr/share/man/man3/APR::Status.3
-#usr/share/man/man3/APR::String.3
-#usr/share/man/man3/APR::Table.3
-#usr/share/man/man3/APR::ThreadMutex.3
-#usr/share/man/man3/APR::ThreadRWLock.3
-#usr/share/man/man3/APR::URI.3
-#usr/share/man/man3/APR::UUID.3
-#usr/share/man/man3/APR::Util.3
-#usr/share/man/man3/Apache2::Access.3
-#usr/share/man/man3/Apache2::Build.3
-#usr/share/man/man3/Apache2::CmdParms.3
-#usr/share/man/man3/Apache2::Command.3
-#usr/share/man/man3/Apache2::Connection.3
-#usr/share/man/man3/Apache2::ConnectionUtil.3
-#usr/share/man/man3/Apache2::Const.3
-#usr/share/man/man3/Apache2::Directive.3
-#usr/share/man/man3/Apache2::Filter.3
-#usr/share/man/man3/Apache2::FilterRec.3
-#usr/share/man/man3/Apache2::HookRun.3
-#usr/share/man/man3/Apache2::Log.3
-#usr/share/man/man3/Apache2::MPM.3
-#usr/share/man/man3/Apache2::Module.3
-#usr/share/man/man3/Apache2::PerlSections.3
-#usr/share/man/man3/Apache2::Process.3
-#usr/share/man/man3/Apache2::RequestIO.3
-#usr/share/man/man3/Apache2::RequestRec.3
-#usr/share/man/man3/Apache2::RequestUtil.3
-#usr/share/man/man3/Apache2::Resource.3
-#usr/share/man/man3/Apache2::Response.3
-#usr/share/man/man3/Apache2::ServerRec.3
-#usr/share/man/man3/Apache2::ServerUtil.3
-#usr/share/man/man3/Apache2::SizeLimit.3
-#usr/share/man/man3/Apache2::Status.3
-#usr/share/man/man3/Apache2::SubProcess.3
-#usr/share/man/man3/Apache2::SubRequest.3
-#usr/share/man/man3/Apache2::URI.3
-#usr/share/man/man3/Apache2::Util.3
-#usr/share/man/man3/Apache2::compat.3
-#usr/share/man/man3/Apache2::porting.3
-#usr/share/man/man3/Apache::Test.3
-#usr/share/man/man3/Apache::TestConfig.3
-#usr/share/man/man3/Apache::TestMB.3
-#usr/share/man/man3/Apache::TestMM.3
-#usr/share/man/man3/Apache::TestReport.3
-#usr/share/man/man3/Apache::TestRequest.3
-#usr/share/man/man3/Apache::TestRun.3
-#usr/share/man/man3/Apache::TestRunPHP.3
-#usr/share/man/man3/Apache::TestRunPerl.3
-#usr/share/man/man3/Apache::TestSmoke.3
-#usr/share/man/man3/Apache::TestTrace.3
-#usr/share/man/man3/Apache::TestUtil.3
-#usr/share/man/man3/Bundle::Apache2.3
-#usr/share/man/man3/Bundle::ApacheTest.3
-#usr/share/man/man3/ModPerl::BuildMM.3
-#usr/share/man/man3/ModPerl::CScan.3
-#usr/share/man/man3/ModPerl::Code.3
-#usr/share/man/man3/ModPerl::Config.3
-#usr/share/man/man3/ModPerl::Const.3
-#usr/share/man/man3/ModPerl::Global.3
-#usr/share/man/man3/ModPerl::MM.3
-#usr/share/man/man3/ModPerl::MethodLookup.3
-#usr/share/man/man3/ModPerl::PerlRun.3
-#usr/share/man/man3/ModPerl::PerlRunPrefork.3
-#usr/share/man/man3/ModPerl::Registry.3
-#usr/share/man/man3/ModPerl::RegistryBB.3
-#usr/share/man/man3/ModPerl::RegistryCooker.3
-#usr/share/man/man3/ModPerl::RegistryLoader.3
-#usr/share/man/man3/ModPerl::RegistryPrefork.3
-#usr/share/man/man3/ModPerl::Util.3
-#usr/share/man/man3/mod_perl2.3

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8f775882496489ec34e7e9a8ed5027e63192ffab..a9a2dd41d8ffa1589891e0a515c9627e86eaff3b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -184,7 +184,6 @@
 * mkinitcpio-0.5.9
 * mktemp-1.5
 * mldonkey-2.9.2
-* mod_perl-2.0.4
 * module-init-tools-3.2.2
 * mpc-0.12.1
 * mpd-0.13.1

diff --git a/lfs/mod_perl b/lfs/mod_perl
deleted file mode 100644 (file)
index 876acbf..0000000
--- a/lfs/mod_perl
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-# Edit by Michel Schaaf <xpapa@embcop.org>                                   #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.0.4
-
-THISAPP    = mod_perl-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://perl.apache.org/dist
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5                    = 1a05625ae6843085f985f5da8214502a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       echo "127.0.0.1 localhost" > /etc/hosts
-       cd $(DIR_APP) && perl Makefile.PL MP_APXS=/usr/sbin/apxs
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-       cp $(DIR_SRC)/config/mod_perl/startup.pl /usr/lib/apache/
-       @rm /etc/hosts
-       @rm -rf $(DIR_APP)
-       @rm -rf $(DIR_SRC)/apache* $(DIR_SRC)/mm-*
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 420ddab664997eadc64930de0177f6937eea1868..e9545799fe937debe1210d257579e1c506235f50 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -576,7 +576,6 @@ buildipfire() {
   ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
-  ipfiremake mod_perl
 }
 
 buildinstaller() {