* [PR PATCH] thttpd: unbreak
@ 2020-04-25 16:03 4ricci
2020-04-25 18:05 ` [PR PATCH] [Updated] " 4ricci
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: 4ricci @ 2020-04-25 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
There is a new pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages patch-1
https://github.com/void-linux/void-packages/pull/21332
thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
A patch file from https://github.com/void-linux/void-packages/pull/21332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-21332.patch --]
[-- Type: text/x-diff, Size: 1312 bytes --]
From f0e071d8701380c7428f42ca4e668425a7a55191 Mon Sep 17 00:00:00 2001
From: 4ricci <52817765+4ricci@users.noreply.github.com>
Date: Sat, 25 Apr 2020 16:03:12 +0000
Subject: [PATCH] thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
---
srcpkgs/thttpd/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index 08c185814ec..a86c8ef4edb 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,7 +1,7 @@
# Template file for 'thttpd'
pkgname=thttpd
version=2.29
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Tiny/turbo/throttling HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,6 @@ license="BSD-2-Clause"
homepage="http://www.acme.com/software/thttpd/"
distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397
-broken="ELF in /usr/share"
pre_configure() {
sed "s,-o bin -g bin,,g" -i Makefile.in
@@ -25,7 +24,7 @@ do_install() {
vmkdir usr/share/man/man8
make WEBGROUP=$(whoami) \
- WEBDIR=${DESTDIR}/usr/share/thttpd \
+ WEBDIR=${DESTDIR}/usr/libexec/thttpd \
BINDIR=${DESTDIR}/usr/bin \
MANDIR=${DESTDIR}/usr/share/man install
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] thttpd: unbreak
2020-04-25 16:03 [PR PATCH] thttpd: unbreak 4ricci
@ 2020-04-25 18:05 ` 4ricci
2020-04-26 7:57 ` Piraty
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: 4ricci @ 2020-04-25 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages patch-1
https://github.com/void-linux/void-packages/pull/21332
thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
A patch file from https://github.com/void-linux/void-packages/pull/21332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-21332.patch --]
[-- Type: text/x-diff, Size: 2059 bytes --]
From f0e071d8701380c7428f42ca4e668425a7a55191 Mon Sep 17 00:00:00 2001
From: 4ricci <52817765+4ricci@users.noreply.github.com>
Date: Sat, 25 Apr 2020 16:03:12 +0000
Subject: [PATCH 1/2] thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
---
srcpkgs/thttpd/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index 08c185814ec..a86c8ef4edb 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,7 +1,7 @@
# Template file for 'thttpd'
pkgname=thttpd
version=2.29
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Tiny/turbo/throttling HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,6 @@ license="BSD-2-Clause"
homepage="http://www.acme.com/software/thttpd/"
distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397
-broken="ELF in /usr/share"
pre_configure() {
sed "s,-o bin -g bin,,g" -i Makefile.in
@@ -25,7 +24,7 @@ do_install() {
vmkdir usr/share/man/man8
make WEBGROUP=$(whoami) \
- WEBDIR=${DESTDIR}/usr/share/thttpd \
+ WEBDIR=${DESTDIR}/usr/libexec/thttpd \
BINDIR=${DESTDIR}/usr/bin \
MANDIR=${DESTDIR}/usr/share/man install
From 046c7dc43d7619a8be1533d17d212bd21e30e26f Mon Sep 17 00:00:00 2001
From: 4ricci <52817765+4ricci@users.noreply.github.com>
Date: Sat, 25 Apr 2020 18:05:07 +0000
Subject: [PATCH 2/2] Update template
---
srcpkgs/thttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index a86c8ef4edb..13de3fbef35 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -11,7 +11,7 @@ distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397
pre_configure() {
- sed "s,-o bin -g bin,,g" -i Makefile.in
+ vsed -i Makefile.in -e "s,-o bin -g bin,,g"
}
do_build() {
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: thttpd: unbreak
2020-04-25 16:03 [PR PATCH] thttpd: unbreak 4ricci
2020-04-25 18:05 ` [PR PATCH] [Updated] " 4ricci
@ 2020-04-26 7:57 ` Piraty
2020-04-26 9:59 ` [PR PATCH] [Updated] " 4ricci
2020-04-30 11:05 ` [PR PATCH] [Merged]: " Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: Piraty @ 2020-04-26 7:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21332#issuecomment-619504733
Comment:
looks good, please squash the commits.
(see CONTRIBUTING.md as well)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] thttpd: unbreak
2020-04-25 16:03 [PR PATCH] thttpd: unbreak 4ricci
2020-04-25 18:05 ` [PR PATCH] [Updated] " 4ricci
2020-04-26 7:57 ` Piraty
@ 2020-04-26 9:59 ` 4ricci
2020-04-30 11:05 ` [PR PATCH] [Merged]: " Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: 4ricci @ 2020-04-26 9:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages patch-1
https://github.com/void-linux/void-packages/pull/21332
thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
A patch file from https://github.com/void-linux/void-packages/pull/21332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-21332.patch --]
[-- Type: text/x-diff, Size: 1380 bytes --]
From aca3ae9fab72207eba8c4a7515cf35b99d679870 Mon Sep 17 00:00:00 2001
From: 4ricci <52817765+4ricci@users.noreply.github.com>
Date: Sat, 25 Apr 2020 16:03:12 +0000
Subject: [PATCH] thttpd: unbreak
Place cgi-bin executables in /usr/libexec instead of /usr/share.
---
srcpkgs/thttpd/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index 08c185814ec..13de3fbef35 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,7 +1,7 @@
# Template file for 'thttpd'
pkgname=thttpd
version=2.29
-revision=1
+revision=2
build_style=gnu-configure
short_desc="Tiny/turbo/throttling HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,10 +9,9 @@ license="BSD-2-Clause"
homepage="http://www.acme.com/software/thttpd/"
distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397
-broken="ELF in /usr/share"
pre_configure() {
- sed "s,-o bin -g bin,,g" -i Makefile.in
+ vsed -i Makefile.in -e "s,-o bin -g bin,,g"
}
do_build() {
@@ -25,7 +24,7 @@ do_install() {
vmkdir usr/share/man/man8
make WEBGROUP=$(whoami) \
- WEBDIR=${DESTDIR}/usr/share/thttpd \
+ WEBDIR=${DESTDIR}/usr/libexec/thttpd \
BINDIR=${DESTDIR}/usr/bin \
MANDIR=${DESTDIR}/usr/share/man install
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Merged]: thttpd: unbreak
2020-04-25 16:03 [PR PATCH] thttpd: unbreak 4ricci
` (2 preceding siblings ...)
2020-04-26 9:59 ` [PR PATCH] [Updated] " 4ricci
@ 2020-04-30 11:05 ` Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: Johnnynator @ 2020-04-30 11:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
There's a merged pull request on the void-packages repository
thttpd: unbreak
https://github.com/void-linux/void-packages/pull/21332
Description:
Place cgi-bin executables in /usr/libexec instead of /usr/share.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-30 11:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-25 16:03 [PR PATCH] thttpd: unbreak 4ricci
2020-04-25 18:05 ` [PR PATCH] [Updated] " 4ricci
2020-04-26 7:57 ` Piraty
2020-04-26 9:59 ` [PR PATCH] [Updated] " 4ricci
2020-04-30 11:05 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).