From 1239c51977630f9c23def0b36c1172f2fc581fca260864d3f2fbd37276ac4c6f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 15 Feb 2007 17:15:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/thttpd?expand=0&rev=2

---
 thttpd-2.25b-chown.diff | 27 +++++++++++++++++++++++++++
 thttpd.changes          |  5 +++++
 thttpd.spec             | 14 ++++++++------
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 thttpd-2.25b-chown.diff

diff --git a/thttpd-2.25b-chown.diff b/thttpd-2.25b-chown.diff
new file mode 100644
index 0000000..fca39ea
--- /dev/null
+++ b/thttpd-2.25b-chown.diff
@@ -0,0 +1,27 @@
+--- Makefile.in
++++ Makefile.in
+@@ -111,11 +111,11 @@
+ 
+ installthis:
+ 	-mkdir -p $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -m 555 thttpd $(DESTDIR)$(SBINDIR)
+ 
+ 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 ( \
+--- extras/Makefile.in
++++ extras/Makefile.in
+@@ -69,7 +69,7 @@
+ install:	all
+ 	rm -f $(SBINDIR)/makeweb $(SBINDIR)/htpasswd $(SBINDIR)/syslogtocern
+ 	cp makeweb $(BINDIR)/makeweb
+-	chgrp $(WEBGROUP) $(BINDIR)/makeweb
++	-chgrp $(WEBGROUP) $(BINDIR)/makeweb
+ 	chmod 2755 $(BINDIR)/makeweb
+ 	cp htpasswd $(BINDIR)/htpasswd
+ 	cp syslogtocern $(SBINDIR)/syslogtocern
diff --git a/thttpd.changes b/thttpd.changes
index a1c88c9..e673341 100644
--- a/thttpd.changes
+++ b/thttpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 14 15:04:06 CET 2007 - schwab@suse.de
+
+- Fix building as non-root.
+
 -------------------------------------------------------------------
 Fri Mar 10 17:14:09 CET 2006 - anicka@suse.cz
 
diff --git a/thttpd.spec b/thttpd.spec
index c7dea40..bf79f97 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd (Version 2.25b)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,13 +10,13 @@
 
 
 Name:           thttpd
-License:        Other License(s), see package, X11/MIT
+License:        X11/MIT
 Group:          Productivity/Networking/Web/Servers
 Provides:       http_daemon 
 PreReq:         %fillup_prereq %insserv_prereq permissions
 Autoreqprov:    on
 Version:        2.25b
-Release:        38
+Release:        68
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-SuSE.tar.bz2
 Patch0:         %{name}-%{version}-configure.patch
@@ -28,6 +28,7 @@ Patch5:         %{name}-%{version}-static.patch
 Patch6:         %{name}-%{version}-pie.patch
 Patch7:         %{name}-%{version}-syslogtocern.diff
 Patch8:         %{name}-%{version}-overflow.diff
+Patch9:         %{name}-%{version}-chown.diff
 URL:            http://www.acme.com/software/thttpd/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Small and very simple webserver
@@ -60,11 +61,11 @@ Authors:
 %patch6
 %patch7
 %patch8
+%patch9
 
 %build
 for i in README.SuSE SuSE/etc/init.d/thttpd; do
-sed "s @SRVROOT@ %{serverroot}/htdocs " $i >$i.new
-mv $i.new $i
+sed -i "s @SRVROOT@ %{serverroot}/htdocs " $i
 done
 chmod 744 SuSE/etc/init.d/thttpd
 %{suse_update_config}
@@ -85,7 +86,6 @@ make F_PIE="-fpie"
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/usr/bin \
 	   $RPM_BUILD_ROOT/usr/sbin \
            $RPM_BUILD_ROOT/%{_mandir}/man1 \
@@ -129,6 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/init.d/thttpd
 
 %changelog -n thttpd
+* Wed Feb 14 2007 - schwab@suse.de
+- Fix building as non-root.
 * Fri Mar 10 2006 - anicka@suse.cz
 - fix buffer overflows in htpasswd (#156978)
 * Wed Jan 25 2006 - mls@suse.de