[arch-commits] Commit in sthttpd/repos (5 files)

Kyle Keen kkeen at archlinux.org
Thu Aug 20 11:02:09 UTC 2020


    Date: Thursday, August 20, 2020 @ 11:02:08
  Author: kkeen
Revision: 685512

archrelease: copy trunk to community-testing-x86_64

Added:
  sthttpd/repos/community-testing-x86_64/
  sthttpd/repos/community-testing-x86_64/PKGBUILD
    (from rev 685511, sthttpd/trunk/PKGBUILD)
  sthttpd/repos/community-testing-x86_64/config
    (from rev 685511, sthttpd/trunk/config)
  sthttpd/repos/community-testing-x86_64/discreet.patch
    (from rev 685511, sthttpd/trunk/discreet.patch)
  sthttpd/repos/community-testing-x86_64/service
    (from rev 685511, sthttpd/trunk/service)

----------------+
 PKGBUILD       |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 config         |    6 +++++
 discreet.patch |   34 ++++++++++++++++++++++++++++++++
 service        |   10 +++++++++
 4 files changed, 108 insertions(+)

Copied: sthttpd/repos/community-testing-x86_64/PKGBUILD (from rev 685511, sthttpd/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2020-08-20 11:02:08 UTC (rev 685512)
@@ -0,0 +1,58 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Contributor: Stewart Starbuck <stewart at stewartstarbuck.co.uk>
+
+pkgname=sthttpd
+pkgver=2.27.1
+pkgrel=3
+pkgdesc='Supported fork of the thttpd web server'
+url='https://github.com/blueness/sthttpd'
+license=('custom:BSD')
+arch=('x86_64')
+depends=('libxcrypt')
+backup=('etc/thttpd.conf')
+validpgpkeys=('1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA')
+source=("$pkgname-$pkgver.tgz::https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz"
+        'discreet.patch'
+        'service'
+        'config')
+sha256sums=('a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846'
+            'be953777f2b5b860f1c5a8c96d8478535fe517d76bd4b76597d743a96c2659cf'
+            '6fea42a6876e2a44eff4f76ed64befabe400e5c844b11b782b1507299e5eb986'
+            '1f42c7625422944bd035731d264a711f50b47f4e4f58b6c67693f09fabb76350')
+
+conflicts=('thttpd')
+provides=('thttpd')
+replaces=('thttpd')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../discreet.patch
+	./autogen.sh
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export WEBDIR=/srv/http
+	export WEBGROUP=root
+	./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.md "${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-testing-x86_64/config (from rev 685511, sthttpd/trunk/config)
===================================================================
--- community-testing-x86_64/config	                        (rev 0)
+++ community-testing-x86_64/config	2020-08-20 11:02:08 UTC (rev 685512)
@@ -0,0 +1,6 @@
+user=http
+dir=/srv/http
+cgipat=**.cgi
+charset=utf-8
+chroot
+vhost

Copied: sthttpd/repos/community-testing-x86_64/discreet.patch (from rev 685511, sthttpd/trunk/discreet.patch)
===================================================================
--- community-testing-x86_64/discreet.patch	                        (rev 0)
+++ community-testing-x86_64/discreet.patch	2020-08-20 11:02:08 UTC (rev 685512)
@@ -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-testing-x86_64/service (from rev 685511, sthttpd/trunk/service)
===================================================================
--- community-testing-x86_64/service	                        (rev 0)
+++ community-testing-x86_64/service	2020-08-20 11:02:08 UTC (rev 685512)
@@ -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



More information about the arch-commits mailing list