From 63feab67351f2c440fbba945450ac8279c89820ae8017dfca61ab373d1c0710d Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 9 Mar 2012 11:33:10 +0000
Subject: [PATCH] Accepting request 102205 from
 home:vitezslav_cizek:branches:server:http

- fixed build and added -fpie for makeweb

OBS-URL: https://build.opensuse.org/request/show/102205
OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=4
---
 thttpd-2.25b-pie.patch                        | 18 +++++++++++----
 ...-2.25b-x86_64_machine_not_recognized.patch | 23 +++++++++++++++++++
 thttpd.changes                                |  5 ++++
 thttpd.spec                                   | 12 +++++-----
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 thttpd-2.25b-x86_64_machine_not_recognized.patch

diff --git a/thttpd-2.25b-pie.patch b/thttpd-2.25b-pie.patch
index 32ed7a4..61aedc7 100644
--- a/thttpd-2.25b-pie.patch
+++ b/thttpd-2.25b-pie.patch
@@ -1,7 +1,17 @@
---- extras/Makefile.in
-+++ extras/Makefile.in
-@@ -60,10 +60,10 @@
- 	$(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c
+Index: extras/Makefile.in
+===================================================================
+--- extras/Makefile.in.orig	2012-01-31 14:03:08.735817916 +0100
++++ extras/Makefile.in	2012-01-31 14:05:10.222510744 +0100
+@@ -54,16 +54,16 @@
+ all:		makeweb htpasswd
+ 
+ makeweb:	makeweb.o
+-	$(CC) $(LDFLAGS) makeweb.o -o makeweb $(LIBS) $(NETLIBS)
++	$(CC) $(LDFLAGS) -pie makeweb.o -o makeweb $(LIBS) $(NETLIBS)
+ 
+ makeweb.o:	makeweb.c ../config.h
+-	$(CC) $(CFLAGS) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c
++	$(CC) $(CFLAGS) $(F_PIE) -DWEBDIR=\"$(WEBDIR)\" -c makeweb.c
  
  htpasswd:	htpasswd.o
 -	$(CC) $(LDFLAGS) $(STATICFLAG) htpasswd.o -o htpasswd $(LIBS)
diff --git a/thttpd-2.25b-x86_64_machine_not_recognized.patch b/thttpd-2.25b-x86_64_machine_not_recognized.patch
new file mode 100644
index 0000000..532fb3b
--- /dev/null
+++ b/thttpd-2.25b-x86_64_machine_not_recognized.patch
@@ -0,0 +1,23 @@
+Index: thttpd-2.25b/config.sub
+===================================================================
+--- thttpd-2.25b.orig/config.sub	1998-05-09 03:12:58.000000000 +0200
++++ thttpd-2.25b/config.sub	2012-01-31 13:56:25.647548490 +0100
+@@ -15,7 +15,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+-# You should have received a copy of the GNU General Public License
++38# You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+@@ -164,6 +164,9 @@
+ 	i[3456]86)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
++	x86_64-*)
++	  basic_machine=$basic_machine-pc
++	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
diff --git a/thttpd.changes b/thttpd.changes
index e98e5e3..0ee657e 100644
--- a/thttpd.changes
+++ b/thttpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 31 13:07:43 UTC 2012 - vcizek@suse.com
+
+- fixed build and added -fpie for makeweb
+
 -------------------------------------------------------------------
 Wed Nov 23 09:32:34 UTC 2011 - coolo@suse.com
 
diff --git a/thttpd.spec b/thttpd.spec
index ff46c85..0dc42cc 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,11 @@
 #
 
 
-
 Name:           thttpd
-License:        BSD-3-Clause
-Group:          Productivity/Networking/Web/Servers
 Provides:       http_daemon 
 PreReq:         %fillup_prereq %insserv_prereq permissions
 Version:        2.25b
-Release:        173
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-SuSE.tar.bz2
 Patch0:         %{name}-%{version}-configure.patch
@@ -39,9 +36,12 @@ Patch9:         %{name}-%{version}-chown.diff
 Patch10:        %{name}-%{version}-zerolen.patch
 Patch11:        %{name}-%{version}-strcpy.patch
 Patch12:        thttpd-2.25b-getline.patch
+Patch13:        thttpd-2.25b-x86_64_machine_not_recognized.patch
 Url:            http://www.acme.com/software/thttpd/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Small and very simple webserver
+License:        BSD-3-Clause
+Group:          Productivity/Networking/Web/Servers
 BuildRequires:  libtool
 
 %description
@@ -75,6 +75,7 @@ Authors:
 %patch10
 %patch11
 %patch12
+%patch13 -p1
 
 %build
 # update server root path
@@ -85,7 +86,6 @@ sed -i "s@__PREFIX__@%{_prefix}@g;\
     s@__VERSION__@%{version}@g" SuSE/etc/init.d/thttpd
 chmod 744 SuSE/etc/init.d/thttpd
 chmod 644 SuSE/etc/thttpd.conf
-%{suse_update_config}
 mv aclocal.m4 acinclude.m4
 libtoolize --force
 aclocal --force