Date: Friday, August 14, 2015 @ 11:25:54
Author: bisson
Revision: 138344
archrelease: copy trunk to community-i686, community-x86_64
Added:
sthttpd/repos/community-i686/
sthttpd/repos/community-i686/PKGBUILD
(from rev 138343, sthttpd/trunk/PKGBUILD)
sthttpd/repos/community-i686/config
(from rev 138343, sthttpd/trunk/config)
sthttpd/repos/community-i686/discreet.patch
(from rev 138343, sthttpd/trunk/discreet.patch)
sthttpd/repos/community-i686/service
(from rev 138343, sthttpd/trunk/service)
sthttpd/repos/community-x86_64/
sthttpd/repos/community-x86_64/PKGBUILD
(from rev 138343, sthttpd/trunk/PKGBUILD)
sthttpd/repos/community-x86_64/config
(from rev 138343, sthttpd/trunk/config)
sthttpd/repos/community-x86_64/discreet.patch
(from rev 138343, sthttpd/trunk/discreet.patch)
sthttpd/repos/community-x86_64/service
(from rev 138343, sthttpd/trunk/service)
---------------------------------+
community-i686/PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++++
community-i686/config | 4 ++
community-i686/discreet.patch | 34 ++++++++++++++++++++++
community-i686/service | 10 ++++++
community-x86_64/PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++++
community-x86_64/config | 4 ++
community-x86_64/discreet.patch | 34 ++++++++++++++++++++++
community-x86_64/service | 10 ++++++
8 files changed, 212 insertions(+)
Copied: sthttpd/repos/community-i686/PKGBUILD (from rev 138343,
sthttpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+# Contributor: Stewart Starbuck <stew...@stewartstarbuck.co.uk>
+
+pkgname=sthttpd
+pkgver=2.27.0
+pkgrel=1
+pkgdesc='Supported fork of the thttpd web server'
+url='http://opensource.dyc.edu/sthttpd'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+backup=('etc/thttpd.conf')
+validpgpkeys=('1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA')
+source=("http://opensource.dyc.edu/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ 'discreet.patch'
+ 'service'
+ 'config')
+sha1sums=('27ea739c4e3c7922979c4357a80fe6d141da4356' 'SKIP'
+ 'ae0143fce29cf7eb84ebbee9640b9a2c977b5093'
+ '73bd76de0e89a9cc31e5605659837d83b3c8dfde'
+ '7a6413491b6ba68625d450caa3c6f071af0ca1ac')
+
+conflicts=('thttpd')
+provides=('thttpd')
+replaces=('thttpd')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ aclocal && automake --add-missing
+ patch -p1 -i ../discreet.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export WEBDIR=/srv/http
+ export WEBGROUP=http
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --mandir=/usr/share/man \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ rm -fr "${pkgdir}"/srv
+
+ install -Dm644 ../config "${pkgdir}"/etc/thttpd.conf
+ install -Dm644 ../service
"${pkgdir}"/usr/lib/systemd/system/thttpd.service
+ install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # Avoid conflicts with Apache
+ mv "${pkgdir}"/usr/bin/htpasswd{,-thttpd}
+ mv "${pkgdir}"/usr/share/man/man1/htpasswd{,-thttpd}.1
+}
Copied: sthttpd/repos/community-i686/config (from rev 138343,
sthttpd/trunk/config)
===================================================================
--- community-i686/config (rev 0)
+++ community-i686/config 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,4 @@
+dir=/srv/http
+vhost
+user=http
+cgipat=**.cgi
Copied: sthttpd/repos/community-i686/discreet.patch (from rev 138343,
sthttpd/trunk/discreet.patch)
===================================================================
--- community-i686/discreet.patch (rev 0)
+++ community-i686/discreet.patch 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,34 @@
+diff -Naur old/src/libhttpd.c new/src/libhttpd.c
+--- old/src/libhttpd.c 2014-10-04 03:43:00.000000000 +0900
++++ new/src/libhttpd.c 2015-08-14 17:15:30.081099286 +0900
+@@ -738,7 +738,7 @@
+ (void) my_snprintf( buf, sizeof(buf), "\
+ <HTML>\n\
+ <HEAD><TITLE>%d %s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#cc9999\" TEXT=\"#000000\" LINK=\"#2020ff\"
VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>%d %s</H2>\n",
+ status, title, status, title );
+ add_response( hc, buf );
+@@ -763,11 +763,8 @@
+ char buf[1000];
+
+ (void) my_snprintf( buf, sizeof(buf), "\
+-<HR>\n\
+-<ADDRESS><A HREF=\"%s\">%s</A></ADDRESS>\n\
+ </BODY>\n\
+-</HTML>\n",
+- SERVER_ADDRESS, EXPOSED_SERVER_SOFTWARE );
++</HTML>\n" );
+ add_response( hc, buf );
+ }
+
+@@ -2768,7 +2765,7 @@
+ (void) fprintf( fp, "\
+ <HTML>\n\
+ <HEAD><TITLE>Index of %.80s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#99cc99\" TEXT=\"#000000\" LINK=\"#2020ff\"
VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>Index of %.80s</H2>\n\
+ <PRE>\n\
+ mode links bytes last-changed name\n\
Copied: sthttpd/repos/community-i686/service (from rev 138343,
sthttpd/trunk/service)
===================================================================
--- community-i686/service (rev 0)
+++ community-i686/service 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny HTTP Daemon
+
+[Service]
+PIDFile=/run/thttpd.pid
+ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Copied: sthttpd/repos/community-x86_64/PKGBUILD (from rev 138343,
sthttpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+# Contributor: Stewart Starbuck <stew...@stewartstarbuck.co.uk>
+
+pkgname=sthttpd
+pkgver=2.27.0
+pkgrel=1
+pkgdesc='Supported fork of the thttpd web server'
+url='http://opensource.dyc.edu/sthttpd'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+backup=('etc/thttpd.conf')
+validpgpkeys=('1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA')
+source=("http://opensource.dyc.edu/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ 'discreet.patch'
+ 'service'
+ 'config')
+sha1sums=('27ea739c4e3c7922979c4357a80fe6d141da4356' 'SKIP'
+ 'ae0143fce29cf7eb84ebbee9640b9a2c977b5093'
+ '73bd76de0e89a9cc31e5605659837d83b3c8dfde'
+ '7a6413491b6ba68625d450caa3c6f071af0ca1ac')
+
+conflicts=('thttpd')
+provides=('thttpd')
+replaces=('thttpd')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ aclocal && automake --add-missing
+ patch -p1 -i ../discreet.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export WEBDIR=/srv/http
+ export WEBGROUP=http
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --mandir=/usr/share/man \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ rm -fr "${pkgdir}"/srv
+
+ install -Dm644 ../config "${pkgdir}"/etc/thttpd.conf
+ install -Dm644 ../service
"${pkgdir}"/usr/lib/systemd/system/thttpd.service
+ install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # Avoid conflicts with Apache
+ mv "${pkgdir}"/usr/bin/htpasswd{,-thttpd}
+ mv "${pkgdir}"/usr/share/man/man1/htpasswd{,-thttpd}.1
+}
Copied: sthttpd/repos/community-x86_64/config (from rev 138343,
sthttpd/trunk/config)
===================================================================
--- community-x86_64/config (rev 0)
+++ community-x86_64/config 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,4 @@
+dir=/srv/http
+vhost
+user=http
+cgipat=**.cgi
Copied: sthttpd/repos/community-x86_64/discreet.patch (from rev 138343,
sthttpd/trunk/discreet.patch)
===================================================================
--- community-x86_64/discreet.patch (rev 0)
+++ community-x86_64/discreet.patch 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,34 @@
+diff -Naur old/src/libhttpd.c new/src/libhttpd.c
+--- old/src/libhttpd.c 2014-10-04 03:43:00.000000000 +0900
++++ new/src/libhttpd.c 2015-08-14 17:15:30.081099286 +0900
+@@ -738,7 +738,7 @@
+ (void) my_snprintf( buf, sizeof(buf), "\
+ <HTML>\n\
+ <HEAD><TITLE>%d %s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#cc9999\" TEXT=\"#000000\" LINK=\"#2020ff\"
VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>%d %s</H2>\n",
+ status, title, status, title );
+ add_response( hc, buf );
+@@ -763,11 +763,8 @@
+ char buf[1000];
+
+ (void) my_snprintf( buf, sizeof(buf), "\
+-<HR>\n\
+-<ADDRESS><A HREF=\"%s\">%s</A></ADDRESS>\n\
+ </BODY>\n\
+-</HTML>\n",
+- SERVER_ADDRESS, EXPOSED_SERVER_SOFTWARE );
++</HTML>\n" );
+ add_response( hc, buf );
+ }
+
+@@ -2768,7 +2765,7 @@
+ (void) fprintf( fp, "\
+ <HTML>\n\
+ <HEAD><TITLE>Index of %.80s</TITLE></HEAD>\n\
+-<BODY BGCOLOR=\"#99cc99\" TEXT=\"#000000\" LINK=\"#2020ff\"
VLINK=\"#4040cc\">\n\
++<BODY>\n\
+ <H2>Index of %.80s</H2>\n\
+ <PRE>\n\
+ mode links bytes last-changed name\n\
Copied: sthttpd/repos/community-x86_64/service (from rev 138343,
sthttpd/trunk/service)
===================================================================
--- community-x86_64/service (rev 0)
+++ community-x86_64/service 2015-08-14 09:25:54 UTC (rev 138344)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny HTTP Daemon
+
+[Service]
+PIDFile=/run/thttpd.pid
+ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
