summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/241.native_packages_inet.group4
-rw-r--r--patches/thttpd-2.29.local.patch (renamed from patches/thttpd-2.27.local.patch)28
2 files changed, 17 insertions, 15 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index ea1a1f19..52813cce 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -187,8 +187,8 @@ pacman proxytunnel rsync socat thttpd w3m weechat wget whois")";
: ${PKG_SOCAT_SHA256SUM:=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034};
: ${PKG_SOCAT_VERSION:=1.7.3.2};
: ${PKG_SOCAT_URL:=http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.gz};
-: ${PKG_THTTPD_SHA256SUM:=b1c4bc37ada7c39cc2bcfbf86b3bc05be91be49f8bb4f55379eaff1f66516d7a};
-: ${PKG_THTTPD_VERSION:=2.27};
+: ${PKG_THTTPD_SHA256SUM:=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397};
+: ${PKG_THTTPD_VERSION:=2.29};
: ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz};
: ${PKG_THTTPD_CONFIGURE_ARGS:="--disable-nls --host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};
: ${PKG_THTTPD_IN_TREE:=1};
diff --git a/patches/thttpd-2.27.local.patch b/patches/thttpd-2.29.local.patch
index 53b6fc22..c0425c56 100644
--- a/patches/thttpd-2.27.local.patch
+++ b/patches/thttpd-2.29.local.patch
@@ -1,11 +1,23 @@
---- 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
+diff -ru thttpd-2.29.orig/extras/Makefile.in thttpd-2.29/extras/Makefile.in
+--- thttpd-2.29.orig/extras/Makefile.in 2005-05-20 21:10:25.000000000 +0200
++++ thttpd-2.29/extras/Makefile.in 2020-05-23 22:44:07.959407057 +0200
+@@ -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 -ru thttpd-2.29.orig/Makefile.in thttpd-2.29/Makefile.in
+--- thttpd-2.29.orig/Makefile.in 2005-05-20 21:10:24.000000000 +0200
++++ thttpd-2.29/Makefile.in 2020-05-23 22:45:10.811407438 +0200
@@ -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) -m 755 thttpd $(DESTDIR)$(BINDIR)
install-man:
-mkdir -p $(DESTDIR)$(MANDIR)/man8
@@ -14,13 +26,3 @@
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