Date: Friday, August 1, 2014 @ 02:39:13 Author: kkeen Revision: 116655
pkginit: hiawatha 9.6-2 Added: hiawatha/ hiawatha/repos/ hiawatha/trunk/ hiawatha/trunk/PKGBUILD hiawatha/trunk/hiawatha.conf.sample hiawatha/trunk/hiawatha.service Modified: gnuradio/trunk/PKGBUILD polarssl/trunk/PKGBUILD -------------------------------------+ gnuradio/trunk/PKGBUILD | 1 hiawatha/trunk/PKGBUILD | 91 +++++++++++++++++++++++++++ hiawatha/trunk/hiawatha.conf.sample | 114 ++++++++++++++++++++++++++++++++++ hiawatha/trunk/hiawatha.service | 16 ++++ polarssl/trunk/PKGBUILD | 4 + 5 files changed, 226 insertions(+) Modified: gnuradio/trunk/PKGBUILD =================================================================== --- gnuradio/trunk/PKGBUILD 2014-08-01 00:33:59 UTC (rev 116654) +++ gnuradio/trunk/PKGBUILD 2014-08-01 00:39:13 UTC (rev 116655) @@ -36,6 +36,7 @@ # split the gui components? # build doxygen docs? # icons +# gnuradio-osmosdr is not an optdep # comedilib: gr-comedi # zeroc-ice: gr-ctrlport Added: hiawatha/trunk/PKGBUILD =================================================================== --- hiawatha/trunk/PKGBUILD (rev 0) +++ hiawatha/trunk/PKGBUILD 2014-08-01 00:39:13 UTC (rev 116655) @@ -0,0 +1,91 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Kurt Marasco <celilo _at_ lavabit _dot_ com> +# Contributor: Pascal Ernster <aur at hardfalcon dot net> + +pkgname=hiawatha +pkgver=9.6 +pkgrel=2 +pkgdesc="Secure and advanced webserver" +url="https://www.hiawatha-webserver.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('libxslt' 'polarssl') +optdepends=('php-fpm: PHP fastcgi') +makedepends=('cmake') +backup=( + 'etc/hiawatha/hiawatha.conf' + 'etc/hiawatha/cgi-wrapper.conf' + 'etc/hiawatha/mimetype.conf' +) + +source=( + "https://hiawatha-webserver.org/files/$pkgname-$pkgver.tar.gz" + 'hiawatha.conf.sample' + 'hiawatha.service' +) +sha256sums=( + '13132fdb322a8d222f7fa25fa19b5485fcdf7a9568fbe4a52c99905571a75a45' + '4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7' + 'fb789b12bb6246237b15a9244f58317abdd53e5ca4eb55880e40a498b2237155' +) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's/www-data/http/g' extra/logrotate.in + + mkdir -p build + cd build + + cmake ../ -DCMAKE_INSTALL_PREFIX="/" \ + -DCMAKE_INSTALL_BINDIR="/usr/bin" \ + -DCMAKE_INSTALL_SBINDIR="/usr/bin" \ + -DCMAKE_INSTALL_SYSCONFDIR="/etc/hiawatha" \ + -DCMAKE_INSTALL_LIBDIR="/usr/lib" \ + -DCMAKE_INSTALL_MANDIR="/usr/share/man" \ + -DCONFIG_DIR="/etc/hiawatha" \ + -DLOG_DIR="/var/log/hiawatha" \ + -DPID_DIR="/run" \ + -DENABLE_SSL=ON \ + -DUSE_SYSTEM_POLARSSL=ON \ + -DWEBROOT_DIR="/srv/http/hiawatha" \ + -DWORK_DIR="/var/lib/hiawatha" + make + + # Features enabled by default + # -DENABLE_CACHE + # -DENABLE_IPV6 + # -DENABLE_RPROXY + # -DENABLE_TOOLKIT + # -DENABLE_XSLT + + # Features disabled by default + # -DENABLE_DEBUG + # -DENABLE_MONITOR + # -DENABLE_TOMAHAWK +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir/" install + + rmdir "$pkgdir/run" + rm "$pkgdir/srv/http/hiawatha/index.html" + rmdir -p --ignore-fail-on-non-empty "$pkgdir/srv/http/hiawatha" + + # Update stock hiawatha.conf + sed -e 's|#ServerId = www-data|ServerId = http|' \ + -e 's|/var/www/|/srv/http/|g' \ + -e 's|//|/|g' \ + -e 's|#CGIextension = cgi|&\n#TriggerOnCGIstatus = no|g' \ + -e 's|ConnectTo = 127.0.0.1:2005|ConnectTo = 127.0.0.1:9000|g' \ + -e 's|# Extension = php|&\n# SessionTimeout = 30|g' \ + -e 's|#ErrorHandler = 404:/error.cgi|&\n#UseGZfile = yes|g' \ + -i "$pkgdir/etc/hiawatha/hiawatha.conf" + + install -Dm644 logrotate.d/hiawatha "$pkgdir/etc/logrotate.d/hiawatha" + install -Dm755 "$srcdir/hiawatha.service" "$pkgdir/usr/lib/systemd/system/hiawatha.service" + install -Dm644 "$srcdir/hiawatha.conf.sample" "$pkgdir/etc/hiawatha/" +} + Property changes on: hiawatha/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: hiawatha/trunk/hiawatha.conf.sample =================================================================== --- hiawatha/trunk/hiawatha.conf.sample (rev 0) +++ hiawatha/trunk/hiawatha.conf.sample 2014-08-01 00:39:13 UTC (rev 116655) @@ -0,0 +1,114 @@ +# Hiawatha main configuration file +# This is a basic sample configuration file that sets up a: +# 1) Default web site at /srv/http/hiawatha (Note: fast CGI is not active on default site) +# 2) Virtual host for phpmyadmin at /srv/http/phpMyAdmin +# note: you must install phpmyadmin, mysql, php-mcrypt, and php-cgi separately. Be sure that extensions +# mcrypt.so and mysql.so are enabled in your php.ini. +# Also add phpmyadmin to your hosts file +# 3) FastCGI server + + +# GENERAL SETTINGS +ServerId = http +ConnectionsTotal = 150 +ConnectionsPerIP = 10 +SystemLogfile = /var/log/hiawatha/system.log +GarbageLogfile = /var/log/hiawatha/garbage.log + + +# BINDING SETTINGS +# A binding is where a client can connect to. +# +Binding { + Port = 80 +} + + + +### The following fast CGI daemons require php-fpm using a UNIX socket and TCP port, respectively. +# ACTIVATE a FastCGI server for php (using UNIX socket) +FastCGIserver { + FastCGIid = PHP5 + ConnectTo = /run/php-fpm/php-fpm.sock + Extension = php + SessionTimeout = 30 +} + +# ACTIVATE a FastCGI server for php (using IP-address and TCP port) +#FastCGIserver { +# FastCGIid = PHP5 +# ConnectTo = 127.0.0.1:9000 +# Extension = php +# SessionTimeout = 30 +#} + + +# DEFAULT WEBSITE +# It is wise to use your IP address as the hostname of the default website +# and give it a blank webpage. By doing so, automated webscanners won't find +# your possible vulnerable website. +# +Hostname = 127.0.0.1 +WebsiteRoot = /srv/http/hiawatha +StartFile = index.html +AccessLogfile = /var/log/hiawatha/access.log +ErrorLogfile = /var/log/hiawatha/error.log +#ErrorHandler = 404:/error.cgi +UseXSLT = yes + + +# VIRTUAL HOSTS +VirtualHost { + + # If you set WebsiteRoot to /usr/share/webapps/phpMyAdmin you don't need followsymlinks + # I symlinked the phpMyAdmin folder to '/srv/http/phpMyAdmin' so that I can easily remember where it's located but + # still set 'WebsiteRoot' to the real source directory. You could point WebsiteRoot to the + # symlinked directory, but you will have to set 'FollowSymlinks = yes' for that to function properly + + #FollowSymlinks = yes + #WebsiteRoot = /srv/http/phpMyAdmin + WebsiteRoot = /usr/share/webapps/phpMyAdmin + Hostname = phpmyadmin + AccessLogfile = /var/log/hiawatha/phpmyadmin/access.log + ErrorLogfile = /var/log/hiawatha/phpmyadmin/error.log + StartFile = index.php + UseFastCGI = PHP5 + +} + +# Add some more + +#VirtualHost { +# Hostname = www.my-domain.com +# WebsiteRoot = /svr/http/my-domain/public +# StartFile = index.php +# AccessLogfile = /svr/http/my-domain/log/access.log +# ErrorLogfile = /svr/http/my-domain/log/error.log +# TimeForCGI = 5 +# UseFastCGI = PHP5 +# UseToolkit = banshee +#} + + +#Additional settings for monitoring + +UrlToolkit { + ToolkitID = banshee + RequestURI isfile Return + Match ^/(css|files|images|js)/ Return + Match ^/(favicon.ico|robots.txt|sitemap.xml)$ Return + Match .*\?(.*) Rewrite /index.php?$1 + Match .* Rewrite /index.php +} + +VirtualHost { + Hostname = monitor.domain.com + WebsiteRoot = /svr/http/monitor/public + AccessLogfile = /svr/http/monitor/logfiles/access.log + ErrorLogfile = /svr/http/monitor/logfiles/error.log + StartFile = index.php +# ExecuteCGI = yes + UseFastCGI = PHP5 # Use if you use PHP as a FastCGI daemon + TimeForCGI = 15 + UseToolkit = banshee +} Added: hiawatha/trunk/hiawatha.service =================================================================== --- hiawatha/trunk/hiawatha.service (rev 0) +++ hiawatha/trunk/hiawatha.service 2014-08-01 00:39:13 UTC (rev 116655) @@ -0,0 +1,16 @@ +[Unit] +Description=Hiawatha Web Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=simple +SyslogIdentifier=hiawatha +ExecStartPre=/usr/bin/hiawatha -k ; /usr/bin/wigwam +ExecStart= /usr/bin/hiawatha -d +TimeoutSec=10 +#(doesn't like this setting. Can't find files) PrivateTmp=true +LimitNOFILE=infinity +CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID + +[Install] +WantedBy=multi-user.target Modified: polarssl/trunk/PKGBUILD =================================================================== --- polarssl/trunk/PKGBUILD 2014-08-01 00:33:59 UTC (rev 116654) +++ polarssl/trunk/PKGBUILD 2014-08-01 00:39:13 UTC (rev 116655) @@ -17,6 +17,10 @@ depends=('glibc') options=('staticlibs') +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch +# https://github.com/alucryd/aur-alucryd/blob/master/personal/polarssl/PKGBUILD +# https://aur.archlinux.org/packages/po/polarssl-git/PKGBUILD + build() { cd "$pkgname-$pkgver" sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h