diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/lighttpd | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/lighttpd')
-rw-r--r-- | abs/core-testing/lighttpd/PKGBUILD | 84 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/__changelog | 14 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/auth-inc.conf | 12 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/lighttpd.conf | 348 | ||||
-rwxr-xr-x | abs/core-testing/lighttpd/lighttpd.install | 7 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/lighttpd.logrotate.d | 5 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/lighttpd.rc.d | 38 | ||||
-rw-r--r-- | abs/core-testing/lighttpd/openssl-0.9.8m.patch | 11 |
8 files changed, 0 insertions, 519 deletions
diff --git a/abs/core-testing/lighttpd/PKGBUILD b/abs/core-testing/lighttpd/PKGBUILD deleted file mode 100644 index ed6d01e..0000000 --- a/abs/core-testing/lighttpd/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 17048 2008-10-24 16:27:19Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=lighttpd -pkgver=1.4.26 -pkgrel=16 -pkgdesc='A secure, fast, compliant and very flexible web-server' -license=('custom') -arch=('i686' 'x86_64') -url="http://www.lighttpd.net/" -depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap' 'lua') -makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') -optdepends=('libxml2: mod_webdav' \ - 'e2fsprogs: mod_webdav' \ - 'libmysqlclient: mod_mysql_vhost' \ - 'sqlite3: mod_webdav' \ - 'gdbm: mod_trigger_b4_dl' \ - ) -backup=(etc/lighttpd/lighttpd.conf etc/logrotate.d/lighttpd etc/lighttpd/auth-inc.conf etc/lighttpd/conf.include etc/lighttpd/html.include) -options=('!libtool' 'emptydirs') -source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \ - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' \ - 'openssl-0.9.8m.patch') -#install='lighttpd.install' -build() { - cd $srcdir/$pkgname-$pkgver - - # fixed in 1.4.27 - patch -p2 -i ${srcdir}/openssl-0.9.8m.patch || return 1 - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/lighttpd/modules \ - --sysconfdir=/etc/lighttpd \ - --sharedstatedir=/usr/var \ - --localstatedir=/var \ - --libdir=/usr/lib/lighttpd \ - --includedir=/usr/include/lighttpd \ - --with-mysql \ - --with-ldap \ - --with-attr \ - --with-openssl \ - --with-kerberos5 \ - --without-fam \ - --with-webdav-props \ - --with-webdav-locks \ - --with-gdbm \ - --with-memcache \ - --with-lua || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - - install -D -m755 ../lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd - install -D -m644 ../lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd - install -d -m755 -o http -g http $pkgdir/var/run/lighttpd/ - install -d -m755 -o http -g http $pkgdir/var/log/lighttpd/ - - install -D -m644 ../lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf - install -D -m644 ../auth-inc.conf $pkgdir/etc/lighttpd/auth-inc.conf - - # set sane defaults - sed -e 's|/srv/www/htdocs/|/srv/http/|' \ - -e 's|/srv/www/|/srv/http/|' \ - -e 's|#server.username = "wwwrun"|server.username = "http"|' \ - -e 's|#server.groupname = "wwwrun"|server.groupname = "http"|' \ - -e 's|#server.pid-file = "/var/run/lighttpd.pid"|server.pid-file = "/var/run/lighttpd/lighttpd.pid"|' \ - -e 's|/usr/local/bin/php-cgi|/usr/bin/php-cgi|' \ - -e 's|"^/mythweb|"^/{1,2}mythweb|' \ - -e 's|# "mod_proxy",| "mod_proxy",|' \ - -e 's|# "mod_ssi",| "mod_ssi",|' \ - -e 's|#ssi.extension = ( ".shtml" )|ssi.extension = ( ".shtml" )|' \ - -i ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 - - /bin/touch $pkgdir/etc/lighttpd/{conf,html}.include || return 1 - /bin/echo 'include "/etc/lighttpd/conf.include"' >> $pkgdir/etc/lighttpd/lighttpd.conf || return 1 - /bin/echo 'include "/etc/lighttpd/html.include"' >> $pkgdir/etc/lighttpd/lighttpd.conf || return 1 - - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} -md5sums=('a682c8efce47a2f4263a247ba0813c9b' - 'bd690eee0d9e51857448770a151023b0' - '857e174643fd7761a2f0d8431a679f6c' - '11fbec7ff7ca1b0d5575445681e8f60e' - 'c6e361131000ceec085f40b310ef4a2c' - '84c884b8dadd724afe2bc6529e9d4485') diff --git a/abs/core-testing/lighttpd/__changelog b/abs/core-testing/lighttpd/__changelog deleted file mode 100644 index 0fe6415..0000000 --- a/abs/core-testing/lighttpd/__changelog +++ /dev/null @@ -1,14 +0,0 @@ -changed docroot to /data/srv/ -modified auth to require valid user (include auth-inc.conf) - -# by mihanson: -upgraded to 1.4.26 to address http://linhes.org/flyspray/index.php?do=details&task_id=624 -Added -e 's|"^/mythweb|"^/{1,2}mythweb|' \ to the sed command to work around lighttpd no longer honoring // in a url and/or to work around mythweb producing url's with a // for streaming and downloading. - -changed lightttpd.conf to user perl for .cgi (needed for monx)_ -added 404 page - -bummped to version 13 to test redmine #690 - -# by mihanson -Added etc/lighttpd/conf.include and etc/lighttpd/html.include to backup array diff --git a/abs/core-testing/lighttpd/auth-inc.conf b/abs/core-testing/lighttpd/auth-inc.conf deleted file mode 100644 index 21c4c55..0000000 --- a/abs/core-testing/lighttpd/auth-inc.conf +++ /dev/null @@ -1,12 +0,0 @@ -auth.backend = "plain" -auth.backend.plain.userfile = "/etc/lighttpd/lighttpd.user" - - -auth.require = ( "/mythweb" => - ( - "method" => "basic", - "realm" => "MythWeb", - "require" => "valid-user" - ) - ) - diff --git a/abs/core-testing/lighttpd/lighttpd.conf b/abs/core-testing/lighttpd/lighttpd.conf deleted file mode 100644 index f437484..0000000 --- a/abs/core-testing/lighttpd/lighttpd.conf +++ /dev/null @@ -1,348 +0,0 @@ -# lighttpd configuration file -# -# use it as a base for lighttpd 1.0.0 and above -# -# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $ - -############ Options you really have to take care of #################### - -## modules to load -# at least mod_access and mod_accesslog should be loaded -# all other module should only be loaded if really neccesary -# - saves some time -# - saves memory -server.modules = ( - "mod_rewrite", -# "mod_redirect", -# "mod_alias", - "mod_access", -# "mod_cml", -# "mod_trigger_b4_dl", - "mod_auth", -# "mod_status", - "mod_setenv", - "mod_fastcgi", -# "mod_proxy", -# "mod_simple_vhost", -# "mod_evhost", -# "mod_userdir", - "mod_cgi", -# "mod_compress", -# "mod_ssi", -# "mod_usertrack", -# "mod_expire", -# "mod_secdownload", -# "mod_rrdtool", - "mod_accesslog" ) - -## a static document-root, for virtual-hosting take look at the -## server.virtual-* options -server.document-root = "/data/srv/httpd/htdocs" - -## where to send error-messages to -server.errorlog = "/var/log/lighttpd/error.log" - -# files to check for if .../ is requested -index-file.names = ( "index.php", "index.html", - "index.htm", "default.htm" , "mythweb.php" ) - -## set the event-handler (read the performance section in the manual) -# server.event-handler = "freebsd-kqueue" # needed on OS X - -# mimetype mapping -mimetype.assign = ( - ".pdf" => "application/pdf", - ".sig" => "application/pgp-signature", - ".spl" => "application/futuresplash", - ".class" => "application/octet-stream", - ".ps" => "application/postscript", - ".torrent" => "application/x-bittorrent", - ".dvi" => "application/x-dvi", - ".gz" => "application/x-gzip", - ".pac" => "application/x-ns-proxy-autoconfig", - ".swf" => "application/x-shockwave-flash", - ".tar.gz" => "application/x-tgz", - ".tgz" => "application/x-tgz", - ".tar" => "application/x-tar", - ".zip" => "application/zip", - ".mp3" => "audio/mpeg", - ".m3u" => "audio/x-mpegurl", - ".wma" => "audio/x-ms-wma", - ".wax" => "audio/x-ms-wax", - ".ogg" => "application/ogg", - ".wav" => "audio/x-wav", - ".gif" => "image/gif", - ".jar" => "application/x-java-archive", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".xbm" => "image/x-xbitmap", - ".xpm" => "image/x-xpixmap", - ".xwd" => "image/x-xwindowdump", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - ".asc" => "text/plain", - ".c" => "text/plain", - ".cpp" => "text/plain", - ".log" => "text/plain", - ".conf" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".dtd" => "text/xml", - ".xml" => "text/xml", - ".mpeg" => "video/mpeg", - ".mpg" => "video/mpeg", - ".mp4" => "video/quicktime", - ".mov" => "video/quicktime", - ".qt" => "video/quicktime", - ".avi" => "video/x-msvideo", - ".asf" => "video/x-ms-asf", - ".asx" => "video/x-ms-asf", - ".wmv" => "video/x-ms-wmv", - ".bz2" => "application/x-bzip", - ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar", - # default mime type - "" => "application/octet-stream", - ) - -# Use the "Content-Type" extended attribute to obtain mime type if possible -#mimetype.use-xattr = "enable" - - -## send a different Server: header -## be nice and keep it at lighttpd -# server.tag = "lighttpd" - -#### accesslog module -accesslog.filename = "/var/log/lighttpd/access.log" - -## deny access the file-extensions -# -# ~ is for backupfiles from vi, emacs, joe, ... -# .inc is often used for code includes which should in general not be part -# of the document-root -url.access-deny = ( "~", ".inc" ) - -$HTTP["url"] =~ "\.pdf$" { - server.range-requests = "disable" -} - -## -# which extensions should not be handle via static-file transfer -# -# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi -static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) - -######### Options that are good to be but not neccesary to be changed ####### - -## bind to port (default: 80) -#server.port = 81 - -## bind to localhost (default: all interfaces) -#server.bind = "127.0.0.1" - -## error-handler for status 404 -server.error-handler-404 = "/404.html" -#server.error-handler-404 = "/error-handler.php" - -## to help the rc.scripts -server.pid-file = "/var/run/lighttpd/lighttpd.pid" - - -###### virtual hosts -## -## If you want name-based virtual hosting add the next three settings and load -## mod_simple_vhost -## -## document-root = -## virtual-server-root + virtual-server-default-host + virtual-server-docroot -## or -## virtual-server-root + http-host + virtual-server-docroot -## -#simple-vhost.server-root = "/srv/http/vhosts/" -#simple-vhost.default-host = "www.example.org" -#simple-vhost.document-root = "/htdocs/" - - -## -## Format: <errorfile-prefix><status-code>.html -## -> ..../status-404.html for 'File not found' -#server.errorfile-prefix = "/usr/share/lighttpd/errors/status-" -#server.errorfile-prefix = "/srv/http/errors/status-" - -## virtual directory listings -#dir-listing.activate = "enable" -## select encoding for directory listings -#dir-listing.encoding = "utf-8" - -## enable debugging -#debug.log-request-header = "enable" -#debug.log-response-header = "enable" -#debug.log-request-handling = "enable" -#debug.log-file-not-found = "enable" - -### only root can use these options -# -# chroot() to directory (default: no chroot() ) -#server.chroot = "/" - -## change uid to <uid> (default: don't care) -server.username = "http" - -## change uid to <uid> (default: don't care) -server.groupname = "http" - -#### compress module -#compress.cache-dir = "/var/cache/lighttpd/compress/" -#compress.filetype = ("text/plain", "text/html") - -#### proxy module -## read proxy.txt for more info -#proxy.server = ( ".php" => -# ( "localhost" => -# ( -# "host" => "192.168.0.101", -# "port" => 80 -# ) -# ) -# ) - -#### fastcgi module -## read fastcgi.txt for more info -## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini - fastcgi.server = ( - ".php" => (( - "bin-path" => "/usr/bin/php-cgi", - "socket" => "/var/run/lighttpd/mythtv-php-fcgi.socket", - "broken-scriptfilename" => "enable", - "bin-environment" => ( - "db_server" => "localhost", - "db_name" => "mythconverg", - "db_login" => "mythtv", - "db_password" => "mythtv" - ) - )) - ) - - setenv.add-environment = ( - "db_server" => "localhost", - "db_name" => "mythconverg", - "db_login" => "mythtv", - "db_password" => "mythtv" -) -#### CGI module -cgi.assign = ( ".pl" => "/usr/bin/perl", - ".cgi" => "/usr/bin/perl" ) - - url.rewrite-once = ( - "^/mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0", - "^/mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1", - "^/mythweb/(.+)$" => "/mythweb/mythweb.php/$1", - "^/mythweb/(.*)$" => "/mythweb/mythweb.php" - ) - - - -#### SSL engine -#ssl.engine = "enable" -#ssl.pemfile = "/etc/ssl/private/lighttpd.pem" - -#### status module -#status.status-url = "/server-status" -#status.config-url = "/server-config" - -#### auth module -## read authentication.txt for more info -#auth.backend = "plain" -#auth.backend.plain.userfile = "lighttpd.user" -#auth.backend.plain.groupfile = "lighttpd.group" - -#auth.backend.ldap.hostname = "localhost" -#auth.backend.ldap.base-dn = "dc=my-domain,dc=com" -#auth.backend.ldap.filter = "(uid=$)" - -#auth.require = ( "/mythweb => -# ( -# "method" => "plain", -# "realm" => "download archiv", -# "require" => "valid-user" -# ) -# "/server-config" => -# ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "valid-user" -# ) -# ) - -#### url handling modules (rewrite, redirect, access) -#url.rewrite = ( "^/$" => "/server-status" ) -#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" ) -#### both rewrite/redirect support back reference to regex conditional using %n -#$HTTP["host"] =~ "^www\.(.*)" { -# url.redirect = ( "^/(.*)" => "http://%1/$1" ) -#} - -# -# define a pattern for the host url finding -# %% => % sign -# %0 => domain name + tld -# %1 => tld -# %2 => domain name without tld -# %3 => subdomain 1 name -# %4 => subdomain 2 name -# -#evhost.path-pattern = "/srv/http/vhosts/%3/htdocs/" - -#### expire module -#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes") - -#### ssi -#ssi.extension = ( ".shtml" ) - -#### rrdtool -#rrdtool.binary = "/usr/bin/rrdtool" -#rrdtool.db-name = "/var/lib/lighttpd/lighttpd.rrd" - -#### setenv -#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) -#setenv.add-response-header = ( "X-Secret-Message" => "42" ) - -## for mod_trigger_b4_dl -# trigger-before-download.gdbm-filename = "/var/lib/lighttpd/trigger.db" -# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) -# trigger-before-download.trigger-url = "^/trigger/" -# trigger-before-download.download-url = "^/download/" -# trigger-before-download.deny-url = "http://127.0.0.1/index.html" -# trigger-before-download.trigger-timeout = 10 - -## for mod_cml -## don't forget to add index.cml to server.indexfiles -# cml.extension = ".cml" -# cml.memcache-hosts = ( "127.0.0.1:11211" ) - -#### variable usage: -## variable name without "." is auto prefixed by "var." and becomes "var.bar" -#bar = 1 -#var.mystring = "foo" - -## integer add -#bar += 1 -## string concat, with integer cast as string, result: "www.foo1.com" -#server.name = "www." + mystring + var.bar + ".com" -## array merge -#index-file.names = (foo + ".php") + index-file.names -#index-file.names += (foo + ".php") - -#### include -#include "/etc/lighttpd/auth-inc.conf" -## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf" -#include "lighttpd-inc.conf" - -#### include_shell -#include_shell "echo var.a=1" -## the above is same as: -#var.a=1 diff --git a/abs/core-testing/lighttpd/lighttpd.install b/abs/core-testing/lighttpd/lighttpd.install deleted file mode 100755 index a921b0f..0000000 --- a/abs/core-testing/lighttpd/lighttpd.install +++ /dev/null @@ -1,7 +0,0 @@ -pre_upgrade() { - mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.old -} -post_upgrade() { - sed -i 's|"^/mythweb|"^/{1,2}mythweb|g' /etc/lighttpd/lighttpd.conf - touch /etc/lighttpd/lighttpd.user -} diff --git a/abs/core-testing/lighttpd/lighttpd.logrotate.d b/abs/core-testing/lighttpd/lighttpd.logrotate.d deleted file mode 100644 index 15cacc9..0000000 --- a/abs/core-testing/lighttpd/lighttpd.logrotate.d +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/lighttpd/*log { - postrotate - /bin/kill -HUP `cat /var/run/lighttpd/lighttpd.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/abs/core-testing/lighttpd/lighttpd.rc.d b/abs/core-testing/lighttpd/lighttpd.rc.d deleted file mode 100644 index 97c315f..0000000 --- a/abs/core-testing/lighttpd/lighttpd.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lighttpd` - -case "$1" in - start) - stat_busy "Starting lighttpd Daemon" - [ -z "$PID" ] && /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lighttpd - stat_done - fi - ;; - stop) - stat_busy "Stopping lighttpd Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lighttpd - rm -f /var/run/lighttpd/lighttpd.pid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core-testing/lighttpd/openssl-0.9.8m.patch b/abs/core-testing/lighttpd/openssl-0.9.8m.patch deleted file mode 100644 index 321e10b..0000000 --- a/abs/core-testing/lighttpd/openssl-0.9.8m.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lighttpd-1.4.26/src/network.c.orig 2010-03-12 01:19:34.000000000 +0000 -+++ src/lighttpd-1.4.26/src/network.c 2010-03-12 01:20:45.000000000 +0000 -@@ -525,7 +525,7 @@ - - if (!s->ssl_use_sslv2) { - /* disable SSLv2 */ -- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { -+ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", - ERR_error_string(ERR_get_error(), NULL)); - return -1; |