Hello community,
here is the log from the commit of package thttpd for openSUSE:Factory checked
in at 2012-03-13 09:40:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
and /work/SRC/openSUSE:Factory/.thttpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "thttpd", Maintainer is "vci...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes 2011-11-25
10:21:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes 2012-03-13
09:40:03.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 31 13:07:43 UTC 2012 - vci...@suse.com
+
+- fixed build and added -fpie for makeweb
+
+-------------------------------------------------------------------
New:
----
thttpd-2.25b-x86_64_machine_not_recognized.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ thttpd.spec ++++++
--- /var/tmp/diff_new_pack.oxYYke/_old 2012-03-13 09:40:05.000000000 +0100
+++ /var/tmp/diff_new_pack.oxYYke/_new 2012-03-13 09:40:05.000000000 +0100
@@ -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 @@
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 @@
%patch10
%patch11
%patch12
+%patch13 -p1
%build
# update server root path
@@ -85,7 +86,6 @@
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
++++++ thttpd-2.25b-pie.patch ++++++
--- /var/tmp/diff_new_pack.oxYYke/_old 2012-03-13 09:40:05.000000000 +0100
+++ /var/tmp/diff_new_pack.oxYYke/_new 2012-03-13 09:40:05.000000000 +0100
@@ -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)
++++++ thttpd-2.25b-x86_64_machine_not_recognized.patch ++++++
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
