changeset
Import package vendor original spec for necessary manipulations.
Mon, 17 Sep 2012 19:01:16 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:01:16 +0200
- changeset 684
- f805be991d7f
- parent 683
- 5a93a7863039
- child 685
- d612d08c0455
Import package vendor original spec for necessary manipulations.
| apache/apache.base | file | annotate | diff | comparison | revisions | |
| apache/apache.conf | file | annotate | diff | comparison | revisions | |
| apache/apache.patch | file | annotate | diff | comparison | revisions | |
| apache/apache.sh | file | annotate | diff | comparison | revisions | |
| apache/apache.spec | file | annotate | diff | comparison | revisions | |
| apache/rc.apache | file | annotate | diff | comparison | revisions |
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/apache/apache.base Mon Sep 17 19:01:16 2012 +0200 1.3 @@ -0,0 +1,347 @@ 1.4 +## 1.5 +## apache.base -- Apache Base/Default Configuration 1.6 +## ______________________________________________________ 1.7 +## 1.8 +## PLEASE DO NOT EDIT THIS FILE!! ADJUST CONFIGURATION BY 1.9 +## OVERRIDING DIRECTIVES IN "apache.conf" INSTEAD, PLEASE! 1.10 +## ______________________________________________________ 1.11 +## 1.12 + 1.13 +# global server 1.14 +ServerRoot @l_prefix@ 1.15 +ServerAdmin root@@l_hostname@.@l_domainname@ 1.16 +ServerName @l_hostname@.@l_domainname@ 1.17 +ServerTokens os 1.18 +User @l_nusr@ 1.19 +Group @l_ngrp@ 1.20 + 1.21 +# runtime files 1.22 +LockFile @l_prefix@/var/apache/run/apache.lock 1.23 +<IfModule mpm_prefork_module> 1.24 + PidFile @l_prefix@/var/apache/run/apache.pid 1.25 + ScoreBoardFile @l_prefix@/var/apache/run/apache.sb 1.26 +</IfModule> 1.27 +<IfModule cgid_module> 1.28 + ScriptSock @l_prefix@/var/apache/run/apache.cgisock 1.29 +</IfModule> 1.30 + 1.31 +# server behaviour 1.32 +Timeout 300 1.33 +KeepAlive on 1.34 +MaxKeepAliveRequests 100 1.35 +KeepAliveTimeout 15 1.36 +<IfModule mpm_prefork_module> 1.37 + MinSpareServers 5 1.38 + MaxSpareServers 10 1.39 + StartServers 5 1.40 + MaxClients 150 1.41 + MaxRequestsPerChild 0 1.42 +</IfModule> 1.43 +<IfModule mpm_worker_module> 1.44 + MinSpareThreads 25 1.45 + MaxSpareThreads 75 1.46 + ThreadsPerChild 25 1.47 + StartServers 2 1.48 + ServerLimit 16 1.49 + MaxClients 150 1.50 + MaxRequestsPerChild 0 1.51 +</IfModule> 1.52 +HostnameLookups off 1.53 +UseCanonicalName on 1.54 + 1.55 +# access logging 1.56 +<IfModule log_config_module> 1.57 + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined 1.58 + <IfModule logio_module> 1.59 + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combined_io 1.60 + </IfModule> 1.61 + <IfModule ssl_module> 1.62 + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_ssl 1.63 + </IfModule> 1.64 + LogFormat "%h %l %u %t \"%r\" %>s %b" common 1.65 + LogFormat "%{Referer}i -> %U" referer 1.66 + LogFormat "%{User-agent}i" agent 1.67 + CustomLog @l_prefix@/var/apache/log/access.log common env=!ignore_global_access 1.68 +</IfModule> 1.69 + 1.70 +# error logging 1.71 +LogLevel warn 1.72 +ErrorLog @l_prefix@/var/apache/log/error.log 1.73 +ServerSignature on 1.74 + 1.75 +# script logging 1.76 +<IfModule cgi_module> 1.77 + ScriptLog @l_prefix@/var/apache/log/script.log 1.78 + ScriptLogBuffer 1024 1.79 + ScriptLogLength 10485760 1.80 +</IfModule> 1.81 + 1.82 +# secure root directory 1.83 +<Directory /> 1.84 + Options FollowSymLinks 1.85 + AllowOverride None 1.86 + Order deny,allow 1.87 + Deny from all 1.88 +</Directory> 1.89 + 1.90 +# configure global document root 1.91 +DocumentRoot @l_prefix@/share/apache/htdocs 1.92 +<IfModule alias_module> 1.93 + Alias /apache-htdocs @l_prefix@/share/apache/htdocs 1.94 +</IfModule> 1.95 +<Directory "@l_prefix@/share/apache/htdocs"> 1.96 + Options Indexes FollowSymLinks MultiViews 1.97 + AllowOverride none 1.98 + Order allow,deny 1.99 + Allow from all 1.100 +</Directory> 1.101 + 1.102 +# default directories and files 1.103 +<IfModule userdir_module> 1.104 + UserDir public_html 1.105 + UserDir disabled root 1.106 +</IfModule> 1.107 +<IfModule dir_module> 1.108 + DirectoryIndex index.html 1.109 +</IfModule> 1.110 + 1.111 +# local configuration files 1.112 +AccessFileName .htaccess 1.113 +<Files ~ "^\.ht"> 1.114 + Order allow,deny 1.115 + Deny from all 1.116 + Satisfy All 1.117 +</Files> 1.118 + 1.119 +# global Icons and CGI directory 1.120 +<IfModule alias_module> 1.121 + Alias /apache-icons @l_prefix@/share/apache/icons 1.122 + <Directory "@l_prefix@/share/apache/icons"> 1.123 + Options Indexes MultiViews 1.124 + AllowOverride None 1.125 + Order allow,deny 1.126 + Allow from all 1.127 + </Directory> 1.128 + AliasMatch ^/apache-manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ @l_prefix@/share/apache/manual$1 1.129 + <Directory "@l_prefix@/share/apache/manual"> 1.130 + Options Indexes 1.131 + AllowOverride None 1.132 + Order allow,deny 1.133 + Allow from all 1.134 + <Files *.html> 1.135 + SetHandler type-map 1.136 + </Files> 1.137 + SetEnvIf Request_URI ^/apache-manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1 1.138 + RedirectMatch 301 ^/apache-manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /apache-manual/$1$2 1.139 + LanguagePriority en de es fr ja ko pt-br ru 1.140 + ForceLanguagePriority Prefer Fallback 1.141 + </Directory> 1.142 + Alias /apache-error @l_prefix@/share/apache/error 1.143 + <Directory "@l_prefix@/share/apache/error"> 1.144 + Options IncludesNoExec 1.145 + AllowOverride None 1.146 + Order allow,deny 1.147 + Allow from all 1.148 + AddOutputFilter Includes html 1.149 + AddHandler type-map var 1.150 + LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr 1.151 + ForceLanguagePriority Prefer Fallback 1.152 + </Directory> 1.153 + ScriptAlias /openpkg-cgi "@l_prefix@/cgi" 1.154 + <Directory "@l_prefix@/cgi"> 1.155 + AllowOverride None 1.156 + Options None 1.157 + Order allow,deny 1.158 + Allow from all 1.159 + </Directory> 1.160 +</IfModule> 1.161 + 1.162 +# global server status information 1.163 +<IfModule status_module> 1.164 + ExtendedStatus on 1.165 + <Location /apache-server-status> 1.166 + SetHandler server-status 1.167 + Order deny,allow 1.168 + Deny from all 1.169 + Allow from 127.0.0.1 1.170 + </Location> 1.171 + <Location /apache-server-info> 1.172 + SetHandler server-info 1.173 + Order deny,allow 1.174 + Deny from all 1.175 + Allow from 127.0.0.1 1.176 + </Location> 1.177 +</IfModule> 1.178 + 1.179 +# automatic CGI and SSI recognition 1.180 +<IfModule mime_module> 1.181 + <IfModule cgi_module> 1.182 + AddHandler cgi-script .cgi 1.183 + </IfModule> 1.184 + <IfModule include_module> 1.185 + AddType text/html .shtml 1.186 + AddOutputFilter INCLUDES .shtml 1.187 + </IfModule> 1.188 +</IfModule> 1.189 + 1.190 +# multi-language error documents 1.191 +ErrorDocument 400 /apache-error/HTTP_BAD_REQUEST.html.var 1.192 +ErrorDocument 401 /apache-error/HTTP_UNAUTHORIZED.html.var 1.193 +ErrorDocument 403 /apache-error/HTTP_FORBIDDEN.html.var 1.194 +ErrorDocument 404 /apache-error/HTTP_NOT_FOUND.html.var 1.195 +ErrorDocument 405 /apache-error/HTTP_METHOD_NOT_ALLOWED.html.var 1.196 +ErrorDocument 408 /apache-error/HTTP_REQUEST_TIME_OUT.html.var 1.197 +ErrorDocument 410 /apache-error/HTTP_GONE.html.var 1.198 +ErrorDocument 411 /apache-error/HTTP_LENGTH_REQUIRED.html.var 1.199 +ErrorDocument 412 /apache-error/HTTP_PRECONDITION_FAILED.html.var 1.200 +ErrorDocument 413 /apache-error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var 1.201 +ErrorDocument 414 /apache-error/HTTP_REQUEST_URI_TOO_LARGE.html.var 1.202 +ErrorDocument 415 /apache-error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var 1.203 +ErrorDocument 500 /apache-error/HTTP_INTERNAL_SERVER_ERROR.html.var 1.204 +ErrorDocument 501 /apache-error/HTTP_NOT_IMPLEMENTED.html.var 1.205 +ErrorDocument 502 /apache-error/HTTP_BAD_GATEWAY.html.var 1.206 +ErrorDocument 503 /apache-error/HTTP_SERVICE_UNAVAILABLE.html.var 1.207 +ErrorDocument 506 /apache-error/HTTP_VARIANT_ALSO_VARIES.html.var 1.208 + 1.209 +# automatic directory indexing 1.210 +<IfModule autoindex_module> 1.211 + IndexOptions FancyIndexing HTMLTable VersionSort 1.212 + ReadmeName README 1.213 + HeaderName HEADER 1.214 + IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t 1.215 + DefaultIcon /apache-icons/unknown.gif 1.216 + AddIcon /apache-icons/back.gif .. 1.217 + AddIcon /apache-icons/dir.gif ^^DIRECTORY^^ 1.218 + AddIcon /apache-icons/blank.gif ^^BLANKICON^^ 1.219 + AddIcon /apache-icons/binary.gif .bin .exe 1.220 + AddIcon /apache-icons/binhex.gif .hqx 1.221 + AddIcon /apache-icons/tar.gif .tar 1.222 + AddIcon /apache-icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv 1.223 + AddIcon /apache-icons/compressed.gif .Z .z .tgz .gz .zip 1.224 + AddIcon /apache-icons/a.gif .ps .ai .eps 1.225 + AddIcon /apache-icons/layout.gif .html .shtml .htm .pdf 1.226 + AddIcon /apache-icons/text.gif .txt 1.227 + AddIcon /apache-icons/c.gif .c 1.228 + AddIcon /apache-icons/p.gif .pl .py 1.229 + AddIcon /apache-icons/f.gif .for 1.230 + AddIcon /apache-icons/dvi.gif .dvi 1.231 + AddIcon /apache-icons/uuencoded.gif .uu 1.232 + AddIcon /apache-icons/script.gif .conf .sh .shar .csh .ksh .tcl 1.233 + AddIcon /apache-icons/tex.gif .tex 1.234 + AddIcon /apache-icons/bomb.gif core 1.235 + AddIconByEncoding (CMP,/apache-icons/compressed.gif) x-compress x-gzip 1.236 + AddIconByType (TXT,/apache-icons/text.gif) text/* 1.237 + AddIconByType (IMG,/apache-icons/image2.gif) image/* 1.238 + AddIconByType (SND,/apache-icons/sound2.gif) audio/* 1.239 + AddIconByType (VID,/apache-icons/movie.gif) video/* 1.240 +</IfModule> 1.241 + 1.242 +# MIME types and content negotiation 1.243 +DefaultType text/plain 1.244 +<IfModule mime_module> 1.245 + TypesConfig @l_prefix@/etc/apache/mime.types 1.246 + AddType application/x-compress .Z 1.247 + AddType application/x-gzip .gz .tgz 1.248 + AddType application/x-tar .tar 1.249 + AddEncoding x-compress Z 1.250 + AddEncoding x-gzip gz tgz 1.251 + AddLanguage da .dk 1.252 + AddLanguage nl .nl 1.253 + AddLanguage en .en 1.254 + AddLanguage et .ee 1.255 + AddLanguage fr .fr 1.256 + AddLanguage de .de 1.257 + AddLanguage el .el 1.258 + AddLanguage he .he 1.259 + AddCharset ISO-8859-8 .iso8859-8 1.260 + AddLanguage it .it 1.261 + AddLanguage ja .ja 1.262 + AddCharset ISO-2022-JP .jis 1.263 + AddLanguage kr .kr 1.264 + AddCharset ISO-2022-KR .iso-kr 1.265 + AddLanguage no .no 1.266 + AddLanguage pl .po 1.267 + AddCharset ISO-8859-2 .iso-pl 1.268 + AddLanguage pt .pt 1.269 + AddLanguage pt-br .pt-br 1.270 + AddLanguage ltz .lu 1.271 + AddLanguage ca .ca 1.272 + AddLanguage es .es 1.273 + AddLanguage sv .se 1.274 + AddLanguage cz .cz 1.275 + AddLanguage ru .ru 1.276 + AddLanguage tw .tw 1.277 + AddCharset Big5 .Big5 .big5 1.278 + AddCharset WINDOWS-1251 .cp-1251 1.279 + AddCharset CP866 .cp866 1.280 + AddCharset ISO-8859-5 .iso-ru 1.281 + AddCharset KOI8-R .koi8-r 1.282 + AddCharset UCS-2 .ucs2 1.283 + AddCharset UCS-4 .ucs4 1.284 + AddCharset UTF-8 .utf8 1.285 +</IfModule> 1.286 +<IfModule negotiation_module> 1.287 + AddHandler type-map .var 1.288 + LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW 1.289 + ForceLanguagePriority Prefer Fallback 1.290 +</IfModule> 1.291 +<IfModule mime_magic_module> 1.292 + MIMEMagicFile @l_prefix@/etc/apache/mime.magic 1.293 +</IfModule> 1.294 + 1.295 +# SSL/TLS support 1.296 +<IfModule ssl_module> 1.297 + SSLRandomSeed startup builtin 1.298 + SSLRandomSeed connect builtin 1.299 + SSLMutex sem 1.300 + SSLCADNRequestFile @l_prefix@/etc/x509/public-ca.crt.pem 1.301 + SSLCACertificateFile @l_prefix@/etc/x509/public-ca.crt.pem 1.302 + SSLSessionCache shm:@l_prefix@/var/apache/run/apache.ssl_scache(512000) 1.303 + SSLSessionCacheTimeout 300 1.304 + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL 1.305 + <IfModule setenvif_module> 1.306 + SetEnvIf User-Agent ".*MSIE.*" \ 1.307 + nokeepalive ssl-unclean-shutdown \ 1.308 + downgrade-1.0 force-response-1.0 1.309 + </IfModule> 1.310 + <Files ~ "\.(cgi|shtml|pl|phtml|php?)$"> 1.311 + SSLOptions +StdEnvVars 1.312 + </Files> 1.313 + <Directory "@l_prefix@/cgi"> 1.314 + SSLOptions +StdEnvVars 1.315 + </Directory> 1.316 + AddType application/x-x509-ca-cert .crt 1.317 + AddType application/x-pkcs7-crl .crl 1.318 +</IfModule> 1.319 + 1.320 +# DAV support 1.321 +<IfModule dav_module> 1.322 + DavLockDB @l_prefix@/var/apache/run/apache.dav/lock 1.323 + BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully 1.324 + BrowserMatch "MS FrontPage" redirect-carefully 1.325 + BrowserMatch "^WebDrive" redirect-carefully 1.326 + BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully 1.327 + BrowserMatch "^gnome-vfs/1.0" redirect-carefully 1.328 + BrowserMatch "^XML Spy" redirect-carefully 1.329 + BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully 1.330 +</IfModule> 1.331 + 1.332 +# Cache support 1.333 +<IfModule disk_cache_module> 1.334 + CacheRoot @l_prefix@/var/apache/run/apache.cache 1.335 + CacheMaxFileSize 1000000 1.336 + CacheMinFileSize 1 1.337 + CacheDirLength 2 1.338 + CacheDirLevels 3 1.339 +</IfModule> 1.340 + 1.341 +# Compression support 1.342 +<IfModule deflate_module> 1.343 + DeflateCompressionLevel 1 1.344 + DeflateMemLevel 9 1.345 + DeflateWindowSize 15 1.346 + DeflateBufferSize 8096 1.347 + DeflateFilterNote Ratio deflate_ratio 1.348 + AddOutputFilterByType DEFLATE text/plain text/html text/xml application/javascript application/json text/css 1.349 +</IfModule> 1.350 +
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/apache/apache.conf Mon Sep 17 19:01:16 2012 +0200 2.3 @@ -0,0 +1,72 @@ 2.4 +## 2.5 +## apache.conf -- Apache Custom Configuration 2.6 +## 2.7 + 2.8 +# include Apache default/base configuration 2.9 +Include "@l_prefix@/etc/apache/apache.base" 2.10 + 2.11 +# include Apache add-on configurations 2.12 +# (mainly provided by other packages) 2.13 +Include "@l_prefix@/etc/apache/apache.d/*.conf" 2.14 + 2.15 +Listen 127.0.0.1:80 2.16 +NameVirtualHost 127.0.0.1:80 2.17 + 2.18 +<IfModule ssl_module> 2.19 +Listen 127.0.0.1:443 2.20 +</IfModule> 2.21 + 2.22 +<VirtualHost 127.0.0.1:80> 2.23 + ServerName @l_hostname@.@l_domainname@ 2.24 + ServerAlias localhost.@l_domainname@ 2.25 + ServerAdmin root@localhost.@l_domainname@ 2.26 + ServerSignature on 2.27 + 2.28 + DocumentRoot @l_prefix@/share/apache/htdocs 2.29 + <Directory @l_prefix@/share/apache/htdocs> 2.30 + Options Indexes FollowSymLinks MultiViews 2.31 + AllowOverride none 2.32 + Order allow,deny 2.33 + Allow from all 2.34 + </Directory> 2.35 + 2.36 + ScriptAlias /cgi-bin @l_prefix@/cgi 2.37 + <Directory @l_prefix@/cgi> 2.38 + Options Indexes FollowSymLinks MultiViews ExecCGI 2.39 + AllowOverride None 2.40 + Order allow,deny 2.41 + Allow from all 2.42 + </Directory> 2.43 +</VirtualHost> 2.44 + 2.45 +<IfModule ssl_module> 2.46 +<VirtualHost 127.0.0.1:443> 2.47 + ServerName @l_hostname@.@l_domainname@ 2.48 + ServerAlias localhost.@l_domainname@ 2.49 + ServerAdmin root@localhost.@l_domainname@ 2.50 + ServerSignature on 2.51 + 2.52 + DocumentRoot @l_prefix@/share/apache/htdocs 2.53 + <Directory @l_prefix@/share/apache/htdocs> 2.54 + Options Indexes FollowSymLinks MultiViews 2.55 + AllowOverride none 2.56 + Order allow,deny 2.57 + Allow from all 2.58 + </Directory> 2.59 + 2.60 + ScriptAlias /cgi-bin @l_prefix@/cgi 2.61 + <Directory @l_prefix@/cgi> 2.62 + Options Indexes FollowSymLinks MultiViews ExecCGI 2.63 + AllowOverride None 2.64 + Order allow,deny 2.65 + Allow from all 2.66 + </Directory> 2.67 + 2.68 + SSLEngine on 2.69 + SSLCADNRequestFile @l_prefix@/etc/x509/example-ca.crt.pem 2.70 + SSLCACertificateFile @l_prefix@/etc/x509/example-ca.crt.pem 2.71 + SSLCertificateFile @l_prefix@/etc/x509/example-server.crt.pem 2.72 + SSLCertificateKeyFile @l_prefix@/etc/x509/example-server.key.pem 2.73 +</VirtualHost> 2.74 +</IfModule> 2.75 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/apache/apache.patch Mon Sep 17 19:01:16 2012 +0200 3.3 @@ -0,0 +1,338 @@ 3.4 +Index: build/config_vars.sh.in 3.5 +--- build/config_vars.sh.in.orig 2008-02-05 00:00:07.000000000 +0100 3.6 ++++ build/config_vars.sh.in 2011-05-11 20:35:42.000000000 +0200 3.7 +@@ -35,7 +35,7 @@ 3.8 + APU_CONFIG=@APU_CONFIG@ 3.9 + fi 3.10 + 3.11 +-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`" 3.12 ++APR_LIBTOOL="@prefix@/share/apache/build/libtool" 3.13 + APR_INCLUDEDIR="`${APR_CONFIG} --includedir`" 3.14 + APU_INCLUDEDIR="`${APU_CONFIG} --includedir`" 3.15 + 3.16 +Index: config.layout 3.17 +--- config.layout.orig 2004-11-21 19:50:36.000000000 +0100 3.18 ++++ config.layout 2011-05-11 20:35:42.000000000 +0200 3.19 +@@ -50,7 +50,7 @@ 3.20 + iconsdir: ${datadir}/icons 3.21 + htdocsdir: ${datadir}/htdocs 3.22 + manualdir: ${datadir}/manual 3.23 +- cgidir: ${datadir}/cgi-bin 3.24 ++ cgidir: ${exec_prefix}/cgi 3.25 + includedir: ${prefix}/include+ 3.26 + localstatedir: ${prefix}/var+ 3.27 + runtimedir: ${localstatedir}/run 3.28 +Index: configure 3.29 +--- configure.orig 2011-05-08 08:52:50.000000000 +0200 3.30 ++++ configure 2011-05-11 20:35:43.000000000 +0200 3.31 +@@ -3605,6 +3605,11 @@ 3.32 + { (exit 1); exit 1; }; } 3.33 + fi 3.34 + 3.35 ++if test "x${USE_BUNDLED_APR}" != "x" ; then 3.36 ++ apr_found=reconfig 3.37 ++ apr_config=srclib/apr/apr-1-config 3.38 ++fi 3.39 ++ 3.40 + if test "$apr_found" = "reconfig"; then 3.41 + 3.42 + # save our work to this point; this allows the sub-package to use it 3.43 +@@ -3965,6 +3970,11 @@ 3.44 + { (exit 1); exit 1; }; } 3.45 + fi 3.46 + 3.47 ++if test "x${USE_BUNDLED_APR}" != "x" ; then 3.48 ++ apu_found=reconfig 3.49 ++ apu_config=srclib/apr-util/apu-1-config 3.50 ++fi 3.51 ++ 3.52 + # Catch some misconfigurations: 3.53 + case ${apr_found}.${apu_found} in 3.54 + reconfig.yes) 3.55 +Index: docs/conf/mime.types 3.56 +--- docs/conf/mime.types.orig 2011-05-03 22:13:58.000000000 +0200 3.57 ++++ docs/conf/mime.types 2011-05-11 20:37:13.000000000 +0200 3.58 +@@ -119,6 +119,7 @@ 3.59 + # application/media_control+xml 3.60 + application/mediaservercontrol+xml mscml 3.61 + application/metalink4+xml meta4 3.62 ++application/metalink+xml metalink 3.63 + application/mets+xml mets 3.64 + # application/mikey 3.65 + application/mods+xml mods 3.66 +Index: docs/docroot/index.html 3.67 +--- docs/docroot/index.html.orig 2004-11-20 21:16:24.000000000 +0100 3.68 ++++ docs/docroot/index.html 2011-05-11 20:35:43.000000000 +0200 3.69 +@@ -1 +1,7 @@ 3.70 +-<html><body><h1>It works!</h1></body></html> 3.71 +\ No newline at end of file 3.72 ++<html> 3.73 ++ <body> 3.74 ++ <h1>It works!</h1> 3.75 ++ It works! Your <a href="http://openpkg.org/">OpenPKG</a> based <a href="http://httpd.apache.org/">Apache</a> HTTP server was successfully installed and started.<br/> 3.76 ++ You now have to read the <a href="/apache-manual/">documentation</a> and configure it according to your local demands. 3.77 ++ </body> 3.78 ++</html> 3.79 +Index: modules/generators/mod_autoindex.c 3.80 +--- modules/generators/mod_autoindex.c.orig 2011-02-10 16:24:20.000000000 +0100 3.81 ++++ modules/generators/mod_autoindex.c 2011-05-11 20:35:43.000000000 +0200 3.82 +@@ -1574,17 +1574,17 @@ 3.83 + 3.84 + ++cols; 3.85 + } 3.86 +- ap_rputs("<th>", r); 3.87 ++ ap_rputs("<th align=\"left\">", r); 3.88 + emit_link(r, "Name", K_NAME, keyid, direction, 3.89 + colargs, static_columns); 3.90 + if (!(autoindex_opts & SUPPRESS_LAST_MOD)) { 3.91 +- ap_rputs("</th><th>", r); 3.92 ++ ap_rputs("</th><th align=\"right\">", r); 3.93 + emit_link(r, "Last modified", K_LAST_MOD, keyid, direction, 3.94 + colargs, static_columns); 3.95 + ++cols; 3.96 + } 3.97 + if (!(autoindex_opts & SUPPRESS_SIZE)) { 3.98 +- ap_rputs("</th><th>", r); 3.99 ++ ap_rputs("</th><th align=\"right\">", r); 3.100 + emit_link(r, "Size", K_SIZE, keyid, direction, 3.101 + colargs, static_columns); 3.102 + ++cols; 3.103 +@@ -1678,7 +1678,14 @@ 3.104 + } 3.105 + 3.106 + if (autoindex_opts & TABLE_INDEXING) { 3.107 +- ap_rputs("<tr>", r); 3.108 ++ char *class; 3.109 ++ if (strcmp(t2, "Parent Directory") == 0) 3.110 ++ class = "updir"; 3.111 ++ else if (ar[x]->isdir) 3.112 ++ class = "dir"; 3.113 ++ else 3.114 ++ class = "file"; 3.115 ++ ap_rvputs(r, "<tr class=\"", class, "\">", NULL); 3.116 + if (!(autoindex_opts & SUPPRESS_ICON)) { 3.117 + ap_rputs("<td valign=\"top\">", r); 3.118 + if (autoindex_opts & ICONS_ARE_LINKS) { 3.119 +@@ -1763,9 +1770,6 @@ 3.120 + desc_width), NULL); 3.121 + } 3.122 + } 3.123 +- else { 3.124 +- ap_rputs("</td><td> ", r); 3.125 +- } 3.126 + } 3.127 + ap_rputs("</td></tr>\n", r); 3.128 + } 3.129 +Index: server/Makefile.in 3.130 +--- server/Makefile.in.orig 2011-04-14 18:37:58.000000000 +0200 3.131 ++++ server/Makefile.in 2011-05-11 20:35:43.000000000 +0200 3.132 +@@ -56,7 +56,8 @@ 3.133 + tmp=export_files_unsorted.txt; \ 3.134 + rm -f $$tmp && touch $$tmp; \ 3.135 + for dir in $(EXPORT_DIRS); do \ 3.136 +- ls $$dir/*.h >> $$tmp; \ 3.137 ++ abs_dir=`cd $$dir && exec pwd`; \ 3.138 ++ ls $$abs_dir/*.h >> $$tmp; \ 3.139 + done; \ 3.140 + for dir in $(EXPORT_DIRS_APR); do \ 3.141 + (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \ 3.142 +Index: support/Makefile.in 3.143 +--- support/Makefile.in.orig 2011-04-16 21:09:47.000000000 +0200 3.144 ++++ support/Makefile.in 2011-05-11 20:35:43.000000000 +0200 3.145 +@@ -22,12 +22,6 @@ 3.146 + chmod 755 $(DESTDIR)$(sbindir)/$$i; \ 3.147 + fi ; \ 3.148 + done 3.149 +- @if test -f "$(builddir)/envvars-std"; then \ 3.150 +- cp -p envvars-std $(DESTDIR)$(sbindir); \ 3.151 +- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ 3.152 +- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ 3.153 +- fi ; \ 3.154 +- fi 3.155 + 3.156 + htpasswd_OBJECTS = htpasswd.lo 3.157 + htpasswd: $(htpasswd_OBJECTS) 3.158 +Index: support/apachectl.in 3.159 +--- support/apachectl.in.orig 2006-07-12 05:38:44.000000000 +0200 3.160 ++++ support/apachectl.in 2011-05-11 20:35:43.000000000 +0200 3.161 +@@ -43,11 +43,6 @@ 3.162 + # the path to your httpd binary, including options if necessary 3.163 + HTTPD='@exp_sbindir@/@progname@' 3.164 + # 3.165 +-# pick up any necessary environment variables 3.166 +-if test -f @exp_sbindir@/envvars; then 3.167 +- . @exp_sbindir@/envvars 3.168 +-fi 3.169 +-# 3.170 + # a command that outputs a formatted text version of the HTML at the 3.171 + # url given on the command line. Designed for lynx, however other 3.172 + # programs may work. 3.173 +Index: support/apxs.in 3.174 +--- support/apxs.in.orig 2010-05-10 22:02:56.000000000 +0200 3.175 ++++ support/apxs.in 2011-05-11 20:35:43.000000000 +0200 3.176 +@@ -80,6 +80,7 @@ 3.177 + # the "+" metacharacter at the format string to allow a list to be built by 3.178 + # subsequent occurrences of the same option. 3.179 + sub Getopts { 3.180 ++ no warnings 'deprecated'; 3.181 + my ($argumentative, @ARGV) = @_; 3.182 + my $errs = 0; 3.183 + local $_; 3.184 +@@ -189,9 +190,6 @@ 3.185 + my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); 3.186 + $httpd = eval qq("$httpd"); 3.187 + $httpd = eval qq("$httpd"); 3.188 +-my $envvars = get_vars("sbindir") . "/envvars"; 3.189 +-$envvars = eval qq("$envvars"); 3.190 +-$envvars = eval qq("$envvars"); 3.191 + 3.192 + #allow apxs to be run from the source tree, before installation 3.193 + if ($0 =~ m:support/apxs$:) { 3.194 +@@ -203,7 +201,7 @@ 3.195 + exit 1; 3.196 + } 3.197 + 3.198 +-unless (grep /mod_so/, `. $envvars && $httpd -l`) { 3.199 ++unless (grep /mod_so/, `$httpd -l`) { 3.200 + error("Sorry, no shared object support for Apache"); 3.201 + error("available under your platform. Make sure"); 3.202 + error("the Apache module mod_so is compiled into"); 3.203 +@@ -337,8 +335,7 @@ 3.204 + exit(1); 3.205 + } 3.206 + 3.207 +-my $libtool = `$apr_config --apr-libtool`; 3.208 +-chomp($libtool); 3.209 ++my $libtool = "$prefix/share/apache/build/libtool"; 3.210 + 3.211 + my $apr_includedir = `$apr_config --includes`; 3.212 + chomp($apr_includedir); 3.213 +Index: support/htdigest.c 3.214 +--- support/htdigest.c.orig 2010-09-22 03:35:42.000000000 +0200 3.215 ++++ support/htdigest.c 2011-05-11 20:35:43.000000000 +0200 3.216 +@@ -119,7 +119,7 @@ 3.217 + } 3.218 + 3.219 + 3.220 +-static void add_password(const char *user, const char *realm, apr_file_t *f) 3.221 ++static void add_password(const char *user, const char *realm, const char *pw0, apr_file_t *f) 3.222 + { 3.223 + char *pw; 3.224 + apr_md5_ctx_t context; 3.225 +@@ -130,6 +130,9 @@ 3.226 + unsigned int i; 3.227 + apr_size_t len = sizeof(pwin); 3.228 + 3.229 ++ if (pw0 != NULL) 3.230 ++ pw = pw0; 3.231 ++ else { 3.232 + if (apr_password_get("New password: ", pwin, &len) != APR_SUCCESS) { 3.233 + apr_file_printf(errfile, "password too long"); 3.234 + cleanup_tempfile_and_exit(5); 3.235 +@@ -141,6 +144,7 @@ 3.236 + cleanup_tempfile_and_exit(1); 3.237 + } 3.238 + pw = pwin; 3.239 ++ } 3.240 + apr_file_printf(f, "%s:%s:", user, realm); 3.241 + 3.242 + /* Do MD5 stuff */ 3.243 +@@ -161,7 +165,7 @@ 3.244 + 3.245 + static void usage(void) 3.246 + { 3.247 +- apr_file_printf(errfile, "Usage: htdigest [-c] passwordfile realm username\n"); 3.248 ++ apr_file_printf(errfile, "Usage: htdigest [-c] passwordfile realm username [password]\n"); 3.249 + apr_file_printf(errfile, "The -c flag creates a new file.\n"); 3.250 + exit(1); 3.251 + } 3.252 +@@ -188,6 +192,8 @@ 3.253 + char *dirname; 3.254 + char user[MAX_STRING_LEN]; 3.255 + char realm[MAX_STRING_LEN]; 3.256 ++ char *password = NULL; 3.257 ++ char passwordb[MAX_STRING_LEN]; 3.258 + char line[3 * MAX_STRING_LEN]; 3.259 + char l[3 * MAX_STRING_LEN]; 3.260 + char w[MAX_STRING_LEN]; 3.261 +@@ -209,9 +215,7 @@ 3.262 + #endif 3.263 + 3.264 + apr_signal(SIGINT, (void (*)(int)) interrupted); 3.265 +- if (argc == 5) { 3.266 +- if (strcmp(argv[1], "-c")) 3.267 +- usage(); 3.268 ++ if ((argc == 5 || argc == 6) && strcmp(argv[1], "-c") == 0) { 3.269 + rv = apr_file_open(&f, argv[2], APR_WRITE | APR_CREATE, 3.270 + APR_OS_DEFAULT, cntxt); 3.271 + if (rv != APR_SUCCESS) { 3.272 +@@ -222,15 +226,19 @@ 3.273 + apr_strerror(rv, errmsg, sizeof errmsg)); 3.274 + exit(1); 3.275 + } 3.276 ++ if (argc == 6) { 3.277 ++ apr_cpystrn(passwordb, argv[5], sizeof(passwordb)); 3.278 ++ password = passwordb; 3.279 ++ } 3.280 + apr_cpystrn(user, argv[4], sizeof(user)); 3.281 + apr_cpystrn(realm, argv[3], sizeof(realm)); 3.282 + apr_file_printf(errfile, "Adding password for %s in realm %s.\n", 3.283 + user, realm); 3.284 +- add_password(user, realm, f); 3.285 ++ add_password(user, realm, password, f); 3.286 + apr_file_close(f); 3.287 + exit(0); 3.288 + } 3.289 +- else if (argc != 4) 3.290 ++ else if (argc != 4 && argc != 5) 3.291 + usage(); 3.292 + 3.293 + if (apr_temp_dir_get((const char**)&dirname, cntxt) != APR_SUCCESS) { 3.294 +@@ -253,6 +261,10 @@ 3.295 + } 3.296 + apr_cpystrn(user, argv[3], sizeof(user)); 3.297 + apr_cpystrn(realm, argv[2], sizeof(realm)); 3.298 ++ if (argc == 5) { 3.299 ++ apr_cpystrn(passwordb, argv[4], sizeof(passwordb)); 3.300 ++ password = passwordb; 3.301 ++ } 3.302 + 3.303 + found = 0; 3.304 + while (!(get_line(line, sizeof(line), f))) { 3.305 +@@ -270,13 +282,13 @@ 3.306 + else { 3.307 + apr_file_printf(errfile, "Changing password for user %s in realm %s\n", 3.308 + user, realm); 3.309 +- add_password(user, realm, tfp); 3.310 ++ add_password(user, realm, password, tfp); 3.311 + found = 1; 3.312 + } 3.313 + } 3.314 + if (!found) { 3.315 + apr_file_printf(errfile, "Adding user %s in realm %s\n", user, realm); 3.316 +- add_password(user, realm, tfp); 3.317 ++ add_password(user, realm, password, tfp); 3.318 + } 3.319 + apr_file_close(f); 3.320 + 3.321 +Index: server/util_pcre.c 3.322 +--- server/util_pcre.c.orig 2005-11-10 16:20:05.000000000 +0100 3.323 ++++ server/util_pcre.c 2012-02-05 21:25:24.000000000 +0100 3.324 +@@ -128,6 +128,7 @@ 3.325 + const char *errorptr; 3.326 + int erroffset; 3.327 + int options = 0; 3.328 ++int nsub = 0; 3.329 + 3.330 + if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; 3.331 + if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE; 3.332 +@@ -137,7 +138,8 @@ 3.333 + 3.334 + if (preg->re_pcre == NULL) return AP_REG_INVARG; 3.335 + 3.336 +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); 3.337 ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT, &nsub); 3.338 ++preg->re_nsub = (apr_size_t)nsub; 3.339 + return 0; 3.340 + } 3.341 +
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/apache/apache.sh Mon Sep 17 19:01:16 2012 +0200 4.3 @@ -0,0 +1,11 @@ 4.4 +## 4.5 +## apache.sh -- Apache Shell Environment Script 4.6 +## 4.7 + 4.8 +# 4.9 +# Run-time paths 4.10 +# 4.11 + 4.12 +export PATH="@l_path@" 4.13 +export LD_LIBRARY_PATH="@l_ld_library_path@" 4.14 +
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/apache/apache.spec Mon Sep 17 19:01:16 2012 +0200 5.3 @@ -0,0 +1,342 @@ 5.4 +## 5.5 +## apache.spec -- OpenPKG RPM Package Specification 5.6 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 5.7 +## 5.8 +## Permission to use, copy, modify, and distribute this software for 5.9 +## any purpose with or without fee is hereby granted, provided that 5.10 +## the above copyright notice and this permission notice appear in all 5.11 +## copies. 5.12 +## 5.13 +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 5.14 +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 5.15 +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 5.16 +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR 5.17 +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 5.18 +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 5.19 +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 5.20 +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 5.21 +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 5.22 +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 5.23 +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 5.24 +## SUCH DAMAGE. 5.25 +## 5.26 + 5.27 +# package information 5.28 +Name: apache 5.29 +Summary: Apache HTTP Server 5.30 +URL: http://httpd.apache.org/ 5.31 +Vendor: Apache Software Foundation 5.32 +Packager: OpenPKG Foundation e.V. 5.33 +Distribution: OpenPKG Community 5.34 +Class: BASE 5.35 +Group: Web 5.36 +License: ASF 5.37 +Version: 2.2.22 5.38 +Release: 20120205 5.39 + 5.40 +# package options 5.41 +%option with_mpm_prefork yes 5.42 +%option with_mpm_worker no 5.43 +%option with_mpm_event no 5.44 +%option with_suexec yes 5.45 +%option with_suexec_caller %{l_nusr} 5.46 +%option with_suexec_userdir public_html 5.47 +%option with_mod_deflate no 5.48 +%option with_mod_ext_filter no 5.49 +%option with_mod_substitute no 5.50 +%option with_mod_ssl no 5.51 +%option with_mod_dav no 5.52 +%option with_mod_ldap no 5.53 +%option with_mod_dbd no 5.54 +%option with_mod_proxy no 5.55 +%option with_mod_cache no 5.56 +%option with_mod_diskcache no 5.57 +%option with_mod_memcache no 5.58 +%option with_mod_filecache no 5.59 +%option with_mod_authn_alias no 5.60 + 5.61 +# fixing implicit inter-module dependencies and correlations 5.62 +%if "%{with_mpm_prefork}" == "yes" 5.63 +%undefine with_mpm_worker 5.64 +%undefine with_mpm_event 5.65 +%endif 5.66 +%if "%{with_mpm_worker}" == "yes" 5.67 +%undefine with_mpm_prefork 5.68 +%undefine with_mpm_event 5.69 +%endif 5.70 +%if "%{with_mpm_event}" == "yes" 5.71 +%undefine with_mpm_prefork 5.72 +%undefine with_mpm_worker 5.73 +%endif 5.74 +%if "%{with_mod_memcache}" == "yes" || "%{with_mod_diskcache}" == "yes" 5.75 +%undefine with_mod_cache 5.76 +%define with_mod_cache yes 5.77 +%endif 5.78 + 5.79 +# list of sources 5.80 +Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 5.81 +Source1: rc.apache 5.82 +Source2: apache.base 5.83 +Source3: apache.conf 5.84 +Source4: apache.sh 5.85 +Patch0: apache.patch 5.86 + 5.87 +# build information 5.88 +BuildPreReq: OpenPKG, openpkg >= 20100101, perl, make 5.89 +PreReq: OpenPKG, openpkg >= 20100101, perl 5.90 +BuildPreReq: apr, pcre 5.91 +PreReq: apr, pcre 5.92 +%if "%{with_mpm_worker}" == "yes" || "%{with_mpm_event}" == "yes" || "%{with_mod_memcache}" == "yes" 5.93 +BuildPreReq: apr::with_threads = yes 5.94 +PreReq: apr::with_threads = yes 5.95 +%endif 5.96 +%if "%{with_mod_ldap}" == "yes" 5.97 +BuildPreReq: apr::with_ldap = yes 5.98 +PreReq: apr::with_ldap = yes 5.99 +%endif 5.100 +%if "%{with_mod_ssl}" == "yes" 5.101 +BuildPreReq: openssl >= 0.9.8 5.102 +PreReq: openssl >= 0.9.8 5.103 +PreReq: x509 5.104 +%endif 5.105 +%if "%{with_mod_deflate}" == "yes" 5.106 +BuildPreReq: zlib 5.107 +PreReq: zlib 5.108 +%endif 5.109 + 5.110 +%description 5.111 + The Apache Project is a collaborative software development effort 5.112 + aimed at creating a robust, commercial-grade, featureful, and 5.113 + freely-available source code implementation of an HTTP (Web) server. 5.114 + The project is jointly managed by a group of volunteers located 5.115 + around the world, using the Internet and the Web to communicate, 5.116 + plan, and develop the server and its related documentation. These 5.117 + volunteers are known as the Apache Group. In addition, hundreds 5.118 + of users have contributed ideas, code, and documentation to the 5.119 + project. 5.120 + 5.121 +%track 5.122 + prog apache = { 5.123 + version = %{version} 5.124 + url = http://www.apache.org/dist/httpd/ 5.125 + regex = httpd-(2\.\d*[02468]\.\d+)\.tar\.(bz2|gz) 5.126 + } 5.127 + 5.128 +%prep 5.129 + # unpack Apache distribution 5.130 + %setup -q -n httpd-%{version} 5.131 + %patch -p0 5.132 + %{l_shtool} subst \ 5.133 + -e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%t"});g' \ 5.134 + server/core.c 5.135 + 5.136 +%build 5.137 + # configure package 5.138 + ( echo "ac_cv_func_uuid_create=no" 5.139 + ) >config.cache 5.140 + export CC="%{l_cc}" 5.141 + export CFLAGS="%{l_cflags -O}" 5.142 + export CPPFLAGS="%{l_cppflags}" 5.143 + export LDFLAGS="%{l_ldflags}" 5.144 + export LIBS="" 5.145 + case "%{l_platform -t}" in 5.146 + *-sunos* ) LIBS="$LIBS -lrt" ;; 5.147 + esac 5.148 +%if "%{with_mod_ldap}" == "yes" 5.149 + LIBS="$LIBS -lssl -lcrypto" 5.150 +%endif 5.151 + ./configure \ 5.152 + --cache-file=./config.cache \ 5.153 + --enable-layout=GNU \ 5.154 + --prefix=%{l_prefix} \ 5.155 + --with-program-name=apache \ 5.156 + --sysconfdir=%{l_prefix}/etc/apache \ 5.157 + --libexecdir=%{l_prefix}/libexec/apache \ 5.158 + --includedir=%{l_prefix}/include/apache \ 5.159 + --datadir=%{l_prefix}/share/apache \ 5.160 + --localstatedir=%{l_prefix}/var/apache \ 5.161 + --with-apr=%{l_prefix}/bin/apr-1-config \ 5.162 + --with-apr-util=%{l_prefix}/bin/apu-1-config \ 5.163 + --with-pcre=%{l_prefix} \ 5.164 +%if "%{with_mpm_prefork}" == "yes" 5.165 + --with-mpm="prefork" \ 5.166 +%endif 5.167 +%if "%{with_mpm_worker}" == "yes" 5.168 + --with-mpm="worker" \ 5.169 +%endif 5.170 +%if "%{with_mpm_event}" == "yes" 5.171 + --with-mpm="event" \ 5.172 +%endif 5.173 +%if "%{with_mpm_worker}" == "yes" || "%{with_mpm_event}" == "yes" || "%{with_mod_memcache}" == "yes" 5.174 + --enable-threads \ 5.175 +%else 5.176 + --disable-threads \ 5.177 +%endif 5.178 +%if "%{with_suexec}" == "yes" 5.179 + --enable-suexec \ 5.180 + --with-suexec-bin=%{l_prefix}/sbin/suexec \ 5.181 + --with-suexec-caller=%{with_suexec_caller} \ 5.182 + --with-suexec-userdir=%{with_suexec_userdir} \ 5.183 + --with-suexec-logfile=%{l_prefix}/var/apache/log/suexec.log \ 5.184 +%endif 5.185 +%if "%{with_mod_deflate}" == "yes" 5.186 + --enable-deflate \ 5.187 + --with-z=%{l_prefix} \ 5.188 +%endif 5.189 +%if "%{with_mod_ext_filter}" == "yes" 5.190 + --enable-ext-filter \ 5.191 +%endif 5.192 +%if "%{with_mod_substitute}" == "yes" 5.193 + --enable-substitute \ 5.194 +%endif 5.195 +%if "%{with_mod_ssl}" == "yes" 5.196 + --enable-ssl \ 5.197 + --with-ssl=%{l_prefix} \ 5.198 +%endif 5.199 +%if "%{with_mod_dav}" == "yes" 5.200 + --enable-dav \ 5.201 + --enable-dav-fs \ 5.202 + --enable-dav-lock \ 5.203 +%endif 5.204 +%if "%{with_mod_ldap}" == "yes" 5.205 + --enable-ldap \ 5.206 + --enable-authnz-ldap \ 5.207 +%endif 5.208 +%if "%{with_mod_dbd}" == "yes" 5.209 + --enable-dbd \ 5.210 + --enable-authn-dbd \ 5.211 +%endif 5.212 +%if "%{with_mod_proxy}" == "yes" 5.213 + --enable-proxy \ 5.214 + --enable-proxy-connect \ 5.215 + --enable-proxy-http \ 5.216 + --enable-proxy-ftp \ 5.217 + --enable-proxy-ajp \ 5.218 + --enable-proxy-balancer \ 5.219 +%endif 5.220 +%if "%{with_mod_cache}" == "yes" 5.221 + --enable-cache \ 5.222 +%if "%{with_mod_diskcache}" == "yes" 5.223 + --enable-disk-cache \ 5.224 +%endif 5.225 +%if "%{with_mod_memcache}" == "yes" 5.226 + --enable-mem-cache \ 5.227 +%endif 5.228 +%endif 5.229 +%if "%{with_mod_filecache}" == "yes" 5.230 + --enable-file-cache \ 5.231 +%endif 5.232 +%if "%{with_mod_authn_alias}" == "yes" 5.233 + --enable-authn-alias \ 5.234 +%endif 5.235 + --enable-filter \ 5.236 + --enable-reqtimeout \ 5.237 + --enable-usertrack \ 5.238 + --enable-expires \ 5.239 + --enable-so \ 5.240 + --enable-speling \ 5.241 + --enable-rewrite \ 5.242 + --enable-headers \ 5.243 + --enable-info \ 5.244 + --enable-mime-magic \ 5.245 + --enable-vhost-alias \ 5.246 + --enable-auth-digest \ 5.247 + --enable-auth-dbm \ 5.248 + --enable-authz-dbm \ 5.249 + --enable-authz-owner \ 5.250 + --enable-unique-id \ 5.251 + --enable-logio \ 5.252 + --disable-shared 5.253 + 5.254 + # build package 5.255 + %{l_make} %{l_mflags} 5.256 + 5.257 +%install 5.258 + # install package 5.259 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 5.260 + 5.261 + # create additional directories 5.262 + %{l_shtool} mkdir -f -p -m 755 \ 5.263 + $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ 5.264 + $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \ 5.265 + $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.dav \ 5.266 + $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.cache 5.267 + 5.268 + # adjust GNU libtool configuration for apxs(1) runtime 5.269 + %{l_shtool} install -c -m 755 \ 5.270 + -e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \ 5.271 + %{l_prefix}/share/apr/build-1/libtool \ 5.272 + $RPM_BUILD_ROOT%{l_prefix}/share/apache/build/libtool 5.273 + 5.274 + # install shell environment script 5.275 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 5.276 + -e 's;@l_path@;%{l_build_path};' \ 5.277 + -e 's;@l_ld_library_path@;%{l_build_ldlp};' \ 5.278 + %{SOURCE apache.sh} \ 5.279 + $RPM_BUILD_ROOT%{l_prefix}/etc/apache/ 5.280 + 5.281 + # create default configuration 5.282 + l_hostname=`%{l_shtool} echo -e %h` 5.283 + l_domainname=`%{l_shtool} echo -e %d | cut -c2-` 5.284 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 5.285 + -e "s;@l_hostname@;$l_hostname;g" \ 5.286 + -e "s;@l_domainname@;$l_domainname;g" \ 5.287 + %{SOURCE apache.base} \ 5.288 + %{SOURCE apache.conf} \ 5.289 + $RPM_BUILD_ROOT%{l_prefix}/etc/apache/ 5.290 + mv $RPM_BUILD_ROOT%{l_prefix}/etc/apache/magic \ 5.291 + $RPM_BUILD_ROOT%{l_prefix}/etc/apache/mime.magic 5.292 + 5.293 + # install run-command script 5.294 + %{l_shtool} install -c -m 755 %{l_value -s -a} \ 5.295 + -e 's;@with_mod_filecache@;%{with_mod_filecache};g' \ 5.296 + %{SOURCE rc.apache} \ 5.297 + $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ 5.298 + 5.299 + # strip down installation 5.300 + find $RPM_BUILD_ROOT%{l_prefix}/share/apache -name "*.orig" -print | xargs rm -f 5.301 + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/apache/htdocs/apache_pb* 5.302 + rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original} 5.303 + rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/apache 5.304 + rm -f $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi 5.305 + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true 5.306 + strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true 5.307 + ( cd $RPM_BUILD_ROOT%{l_prefix}/share/apache/manual 5.308 + find . -name "*.xml" -print | xargs rm -f 5.309 + find . -name "*.xml.*" -print | xargs rm -f 5.310 + find . -name "*.xsl" -print | xargs rm -f 5.311 + rm -rf style/xsl 5.312 + rm -rf style/latex 5.313 + ) || exit $? 5.314 + 5.315 + # determine installation files 5.316 + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 5.317 + %{l_files_std} \ 5.318 +%if "%{with_suexec}" == "yes" 5.319 + '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \ 5.320 +%endif 5.321 + '%config %{l_prefix}/etc/apache/*' \ 5.322 + '%config %attr(444,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/apache/apache.base' \ 5.323 + '%dir %attr(750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/run/apache.dav' \ 5.324 + '%dir %attr(750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/run/apache.cache' 5.325 + 5.326 +%files -f files 5.327 + 5.328 +%clean 5.329 + 5.330 +%post 5.331 + # after upgrade, restart service 5.332 + [ $1 -eq 2 ] || exit 0 5.333 + eval `%{l_rc} apache status 2>/dev/null` 5.334 + [ ".$apache_active" = .yes ] && %{l_rc} apache restart 5.335 + exit 0 5.336 + 5.337 +%preun 5.338 + # before erase, stop service and remove log files 5.339 + [ $1 -eq 0 ] || exit 0 5.340 + %{l_rc} apache stop 2>/dev/null 5.341 + rm -f $RPM_INSTALL_PREFIX/var/apache/log/* >/dev/null 2>&1 || true 5.342 + rm -f $RPM_INSTALL_PREFIX/var/apache/run/*/* >/dev/null 2>&1 || true 5.343 + rm -f $RPM_INSTALL_PREFIX/var/apache/run/* >/dev/null 2>&1 || true 5.344 + exit 0 5.345 +
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/apache/rc.apache Mon Sep 17 19:01:16 2012 +0200 6.3 @@ -0,0 +1,101 @@ 6.4 +#!@l_prefix@/bin/openpkg rc 6.5 +## 6.6 +## rc.apache -- Run-Commands 6.7 +## 6.8 + 6.9 +%config 6.10 + apache_enable="$openpkg_rc_def" 6.11 + apache_flags="" 6.12 + apache_log_files="@l_prefix@/var/apache/log/access.log" 6.13 + apache_log_rotsteps="10" 6.14 + apache_log_rotminsize="10M" 6.15 + apache_log_rotcomplevel="9" 6.16 + apache_log_rotprolog="true" 6.17 + apache_log_rotepilog="true" 6.18 + apache_err_files="@l_prefix@/var/apache/log/error.log" 6.19 + apache_err_rotsteps="10" 6.20 + apache_err_rotminsize="1M" 6.21 + apache_err_rotcomplevel="9" 6.22 + apache_err_rotprolog="true" 6.23 + apache_err_rotepilog="true" 6.24 + apache_cgi_files="@l_prefix@/var/apache/log/script.log" 6.25 + apache_cgi_rotsteps="10" 6.26 + apache_cgi_rotminsize="1M" 6.27 + apache_cgi_rotcomplevel="9" 6.28 + apache_cgi_rotprolog="true" 6.29 + apache_cgi_rotepilog="true" 6.30 + apache_cachesize="10M" 6.31 + 6.32 +%common 6.33 + apache_pidfile="@l_prefix@/var/apache/run/apache.pid" 6.34 + apache_cachedir="@l_prefix@/var/apache/run/apache.cache" 6.35 + apache_signal () { 6.36 + [ -f $apache_pidfile ] && kill -$1 `cat $apache_pidfile` 6.37 + } 6.38 + 6.39 +%status -u @l_susr@ -o 6.40 + apache_usable="no" 6.41 + apache_active="no" 6.42 + @l_prefix@/sbin/apache -t 2>/dev/null && apache_usable="yes" 6.43 + rcService apache enable yes && \ 6.44 + apache_signal 0 && apache_active="yes" 6.45 + echo "apache_enable=\"$apache_enable\"" 6.46 + echo "apache_usable=\"$apache_usable\"" 6.47 + echo "apache_active=\"$apache_active\"" 6.48 + 6.49 +%start -u @l_susr@ 6.50 + rcService apache enable yes || exit 0 6.51 + rcService apache active yes && exit 0 6.52 + ( cd @l_prefix@/var/apache/run 6.53 + [ -e @l_prefix@/etc/apache/apache.sh ] && 6.54 + . @l_prefix@/etc/apache/apache.sh 6.55 + @l_prefix@/sbin/apache ${apache_flags} 6.56 + ) || exit $? 6.57 + 6.58 +%stop -u @l_susr@ 6.59 + rcService apache enable yes || exit 0 6.60 + rcService apache active no && exit 0 6.61 + @l_prefix@/sbin/apache -k stop 6.62 + sleep 2 6.63 + 6.64 +%restart -u @l_susr@ 6.65 + rcService apache enable yes || exit 0 6.66 + rcService apache active no && exit 0 6.67 + rc apache stop start 6.68 + 6.69 +%reload -u @l_susr@ 6.70 + rcService apache enable yes || exit 0 6.71 + rcService apache active no && exit 0 6.72 + @l_prefix@/sbin/apache -k graceful 6.73 + 6.74 +%daily -u @l_susr@ 6.75 + rcService apache enable yes || exit 0 6.76 + rcTmp -i 6.77 + hintfile=`rcTmp -f -n hint` 6.78 + shtool rotate -f \ 6.79 + -n ${apache_log_rotsteps} -s ${apache_log_rotminsize} -d \ 6.80 + -z ${apache_log_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \ 6.81 + -P "$apache_log_rotprolog" \ 6.82 + -E "$apache_log_rotepilog; echo 1 >$hintfile" \ 6.83 + ${apache_log_files} 6.84 + shtool rotate -f \ 6.85 + -n ${apache_err_rotsteps} -s ${apache_err_rotminsize} -d \ 6.86 + -z ${apache_err_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \ 6.87 + -P "$apache_err_rotprolog" \ 6.88 + -E "$apache_err_rotepilog; echo 1 >$hintfile" \ 6.89 + ${apache_err_files} 6.90 + shtool rotate -f \ 6.91 + -n ${apache_cgi_rotsteps} -s ${apache_cgi_rotminsize} -d \ 6.92 + -z ${apache_cgi_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \ 6.93 + -P "$apache_cgi_rotprolog" \ 6.94 + -E "$apache_cgi_rotepilog; echo 1 >$hintfile" \ 6.95 + ${apache_cgi_files} 6.96 + if [ ".@with_mod_filecache@" = .yes ]; then 6.97 + @l_prefix@/sbin/htcacheclean \ 6.98 + -n -t -l "$apache_cachesize" -p "$apache_cachedir" 6.99 + fi 6.100 + if [ -s $hintfile ]; then 6.101 + @l_prefix@/sbin/apache -k graceful 6.102 + fi 6.103 + rcTmp -k 6.104 +
