Github messages for voidlinux
 help / color / mirror / Atom feed
From: 4ricci <4ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] thttpd: unbreak
Date: Sun, 26 Apr 2020 11:59:31 +0200	[thread overview]
Message-ID: <20200426095931.cDslHy5ltIMhXqajSkeBlwk9PPOj5bhnH_-7gK3GlK0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21332@inbox.vuxu.org>

[-- 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
 

  parent reply	other threads:[~2020-04-26  9:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-25 16:03 [PR PATCH] " 4ricci
2020-04-25 18:05 ` [PR PATCH] [Updated] " 4ricci
2020-04-26  7:57 ` Piraty
2020-04-26  9:59 ` 4ricci [this message]
2020-04-30 11:05 ` [PR PATCH] [Merged]: " Johnnynator

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200426095931.cDslHy5ltIMhXqajSkeBlwk9PPOj5bhnH_-7gK3GlK0@z \
    --to=4ricci@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).