[arch-commits] Commit in sthttpd/repos/community-x86_64 (8 files)

Gaëtan Bisson bisson at archlinux.org
Wed Dec 20 20:29:45 UTC 2017


    Date: Wednesday, December 20, 2017 @ 20:29:45
  Author: bisson
Revision: 275074

archrelease: copy trunk to community-x86_64

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

----------------+
 PKGBUILD       |  116 +++++++++++++++++++++++++++----------------------------
 config         |   11 ++---
 discreet.patch |   68 ++++++++++++++++----------------
 service        |   20 ++++-----
 4 files changed, 108 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-20 20:29:11 UTC (rev 275073)
+++ PKGBUILD	2017-12-20 20:29:45 UTC (rev 275074)
@@ -1,58 +0,0 @@
-# $Id$
-# 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.0
-pkgrel=3
-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'
-          '4e2d1f714a68fadc2ae8fd6ba6b826c4785a77fd')
-
-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/PKGBUILD (from rev 275073, sthttpd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-20 20:29:45 UTC (rev 275074)
@@ -0,0 +1,58 @@
+# $Id$
+# 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=1
+pkgdesc='Supported fork of the thttpd web server'
+url='https://github.com/blueness/sthttpd'
+license=('custom:BSD')
+arch=('x86_64')
+backup=('etc/thttpd.conf')
+validpgpkeys=('1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA')
+source=("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=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.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
+}

Deleted: config
===================================================================
--- config	2017-12-20 20:29:11 UTC (rev 275073)
+++ config	2017-12-20 20:29:45 UTC (rev 275074)
@@ -1,5 +0,0 @@
-user=http
-dir=/srv/http
-cgipat=**.cgi
-charset=utf-8
-vhost

Copied: sthttpd/repos/community-x86_64/config (from rev 275073, sthttpd/trunk/config)
===================================================================
--- config	                        (rev 0)
+++ config	2017-12-20 20:29:45 UTC (rev 275074)
@@ -0,0 +1,6 @@
+user=http
+dir=/srv/http
+cgipat=**.cgi
+charset=utf-8
+chroot
+vhost

Deleted: discreet.patch
===================================================================
--- discreet.patch	2017-12-20 20:29:11 UTC (rev 275073)
+++ discreet.patch	2017-12-20 20:29:45 UTC (rev 275074)
@@ -1,34 +0,0 @@
-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/discreet.patch (from rev 275073, sthttpd/trunk/discreet.patch)
===================================================================
--- discreet.patch	                        (rev 0)
+++ discreet.patch	2017-12-20 20:29:45 UTC (rev 275074)
@@ -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\

Deleted: service
===================================================================
--- service	2017-12-20 20:29:11 UTC (rev 275073)
+++ service	2017-12-20 20:29:45 UTC (rev 275074)
@@ -1,10 +0,0 @@
-[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/service (from rev 275073, sthttpd/trunk/service)
===================================================================
--- service	                        (rev 0)
+++ service	2017-12-20 20:29:45 UTC (rev 275074)
@@ -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