summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-08 14:00:15 +0000
committermidipix <writeonce@midipix.org>2017-11-08 19:48:23 -0500
commit0966a410c7ddad7a270ac5ce7e107dc7fc55c4ab (patch)
tree66c95071a0d96dadf07660a5f1745fb46e04ba75
parent508891097f567982628d9012f738e64d3a07f474 (diff)
downloadmidipix_build-0966a410c7ddad7a270ac5ce7e107dc7fc55c4ab.tar.bz2
midipix_build-0966a410c7ddad7a270ac5ce7e107dc7fc55c4ab.tar.xz
vars/build.vars: adds thttpd v2.27. patches/thttpd-2.27.local.patch: don't change {user,group} ownership during install.
-rw-r--r--patches/thttpd-2.27.local.patch26
-rw-r--r--vars/build.vars9
2 files changed, 34 insertions, 1 deletions
diff --git a/patches/thttpd-2.27.local.patch b/patches/thttpd-2.27.local.patch
new file mode 100644
index 00000000..53b6fc22
--- /dev/null
+++ b/patches/thttpd-2.27.local.patch
@@ -0,0 +1,26 @@
+--- thttpd-2.27/Makefile.in.orig 2005-05-20 19:10:24.000000000 +0000
++++ thttpd-2.27/Makefile.in 2017-11-08 13:57:11.088000000 +0000
+@@ -110,11 +110,11 @@
+
+ installthis:
+ -mkdir -p $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 555 thttpd $(DESTDIR)$(BINDIR)
+
+ install-man:
+ -mkdir -p $(DESTDIR)$(MANDIR)/man8
+- $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
++ $(INSTALL) -m 444 thttpd.8 $(DESTDIR)$(MANDIR)/man8
+
+ installsubdirs:
+ for i in $(SUBDIRS) ; do ( \
+--- thttpd-2.27/extras/Makefile.in.orig 2005-05-20 19:10:25.000000000 +0000
++++ thttpd-2.27/extras/Makefile.in 2017-11-08 13:59:32.352000000 +0000
+@@ -68,7 +68,6 @@
+ install: all
+ rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
+ cp makeweb $(BINDIR)/makeweb
+- chgrp $(WEBGROUP) $(BINDIR)/makeweb
+ chmod 2755 $(BINDIR)/makeweb
+ cp htpasswd $(BINDIR)/htpasswd
+ cp syslogtocern $(BINDIR)/syslogtocern
diff --git a/vars/build.vars b/vars/build.vars
index 0af03d6a..5f89b6e9 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -676,7 +676,7 @@ apk_tools aria2 bash bc bdwgc bind bison chicken clang_host coreutils cparser cr
dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip
irssi john ldns less lighttpd flex lunix lynx make man_db mc mksh mtr m4 nano ncdu nginx openlitespeed openssh p7zip
pacman patch patchutils perl procps_ng python3 qpdf rsync ruby rxvt_unicode sbase sed smallbasic socat st tar tcsh
-the_silver_searcher tmux toilet ubase util_linux vim weechat wget which whois xeyes xwd zsh";
+the_silver_searcher thttpd tmux toilet ubase util_linux vim weechat wget which whois xeyes xwd zsh";
LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
: ${PKG_APK_TOOLS_VERSION:=2.6.8};
@@ -998,6 +998,13 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=6f4a78e1f1dfa5434c19e5a585ac8cefee69986f90920928498217b36b84a46c};
: ${PKG_THE_SILVER_SEARCHER_VERSION:=1.0.2};
: ${PKG_THE_SILVER_SEARCHER_URL:=http://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz};
+: ${PKG_THTTPD_SHA256SUM:=b1c4bc37ada7c39cc2bcfbf86b3bc05be91be49f8bb4f55379eaff1f66516d7a};
+: ${PKG_THTTPD_VERSION:=2.27};
+: ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz};
+: ${PKG_THTTPD_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix= --target=${TARGET}"};
+: ${PKG_THTTPD_BUILD_DIR:=thttpd-${PKG_THTTPD_VERSION}};
+: ${PKG_THTTPD_MAKEFLAGS_INSTALL_EXTRA:="prefix=${PREFIX_NATIVE}"};
+: ${PKG_THTTPD_SUBDIR:=${PKG_THTTPD_BUILD_DIR}};
: ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
: ${PKG_TMUX_VERSION:=2.3};
: ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz};