From 5bf1dc2d2d277e7804dd5c8eff79cda19a67b9cc6ad4f2f4bd0615c8b4a4d37b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Jun 2009 11:05:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/thttpd?expand=0&rev=10 --- thttpd-SuSE.tar.bz2 | 4 +- thttpd.changes | 5 ++ thttpd.spec | 133 +++++++++++++++++++++++--------------------- 3 files changed, 78 insertions(+), 64 deletions(-) diff --git a/thttpd-SuSE.tar.bz2 b/thttpd-SuSE.tar.bz2 index c9a99df..e67ead3 100644 --- a/thttpd-SuSE.tar.bz2 +++ b/thttpd-SuSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4cd236be3c96a9dd4195c20a8b7c94cee2ec1607ed4d773565bda3bb1f9ae4f -size 61841 +oid sha256:eee1ce423ec3f6ecd7bd4ceca7bef9cdf5a07f21fca5a8acbac8e152bdc26cbc +size 133331 diff --git a/thttpd.changes b/thttpd.changes index 007853a..2d68b27 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 26 15:18:48 CEST 2009 - anicka@suse.cz + +- add new branding (bnc#492693) + ------------------------------------------------------------------- Mon Jun 11 11:10:28 CEST 2007 - pcerny@suse.cz diff --git a/thttpd.spec b/thttpd.spec index d4c5a3c..7e01920 100644 --- a/thttpd.spec +++ b/thttpd.spec @@ -1,22 +1,30 @@ # # spec file for package thttpd (Version 2.25b) # -# 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. +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: thttpd -License: BSD License and BSD-like +License: BSD 3-Clause Group: Productivity/Networking/Web/Servers Provides: http_daemon PreReq: %fillup_prereq %insserv_prereq permissions -Autoreqprov: on +AutoReqProv: on Version: 2.25b -Release: 93 +Release: 172 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SuSE.tar.bz2 Patch0: %{name}-%{version}-configure.patch @@ -31,7 +39,7 @@ Patch8: %{name}-%{version}-overflow.diff Patch9: %{name}-%{version}-chown.diff Patch10: %{name}-%{version}-zerolen.patch Patch11: %{name}-%{version}-strcpy.patch -URL: http://www.acme.com/software/thttpd/ +Url: http://www.acme.com/software/thttpd/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Small and very simple webserver @@ -50,6 +58,7 @@ Authors: jef@acme.com %define serverroot /srv/www + %prep %setup -q -a 1 %patch0 @@ -107,7 +116,6 @@ rm -f %{buildroot}%{serverroot}/htdocs/index.html.template %post %{fillup_and_insserv thttpd} %run_permissions - %verifyscript %verify_permissions -e /usr/bin/makeweb @@ -124,8 +132,7 @@ rm -rf "%{buildroot}" %files %defattr(-, root, root) %doc README README.SuSE config.h -%{serverroot}/htdocs/cgi-bin -%{serverroot}/htdocs/gif +%{serverroot}/htdocs/* %attr(775, root, www) %{serverroot}/htdocs/users %config(noreplace) %{serverroot}/htdocs/index.html %verify(not mode) %attr(2750, root, www) /usr/bin/makeweb @@ -136,124 +143,126 @@ rm -rf "%{buildroot}" %config(noreplace) /etc/thttpd.conf %changelog -* Mon Jun 11 2007 - pcerny@suse.cz +* Tue May 26 2009 anicka@suse.cz +- add new branding (bnc#492693) +* Mon Jun 11 2007 pcerny@suse.cz - fixed another syntax error in config file -* Fri Jun 08 2007 - dmueller@suse.de +* Fri Jun 08 2007 dmueller@suse.de - fix syntax error in config file -* Wed Jun 06 2007 - pcerny@suse.cz +* Wed Jun 06 2007 pcerny@suse.cz - use %%config(noreplace) for /etc/thttpd.conf -* Tue Jun 05 2007 - pcerny@suse.cz +* Tue Jun 05 2007 pcerny@suse.cz - added Short-Description tag into init script -* Fri Jun 01 2007 - pcerny@suse.cz +* Fri Jun 01 2007 pcerny@suse.cz - added config file (/etc/thttpd.conf) -* Fri Feb 16 2007 - mvaner@suse.cz +* Fri Feb 16 2007 mvaner@suse.cz - Adding check for zero length - from Marcus Meissner - zerolen.patch - Replacing strcpy with memmove when they overlap - strcpy.patch - Both from #230776 -* Wed Feb 14 2007 - schwab@suse.de +* Wed Feb 14 2007 schwab@suse.de - Fix building as non-root. -* Fri Mar 10 2006 - anicka@suse.cz +* Fri Mar 10 2006 anicka@suse.cz - fix buffer overflows in htpasswd (#156978) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Nov 21 2005 - anicka@suse.cz +* Mon Nov 21 2005 anicka@suse.cz - fix tmp race in syslogtocern (#131056) -* Wed Oct 12 2005 - anicka@suse.cz +* Wed Oct 12 2005 anicka@suse.cz - use %%config(noreplace) for index.html -* Wed Jun 22 2005 - anicka@suse.cz +* Wed Jun 22 2005 anicka@suse.cz - compile dynamic binaries instead of static - compile htpasswd with -pie -* Wed Mar 09 2005 - mcihar@suse.cz +* Wed Mar 09 2005 mcihar@suse.cz - do not conflict with other webservers (bug #71742) -* Tue Feb 17 2004 - tcrhak@suse.cz +* Tue Feb 17 2004 tcrhak@suse.cz - update to version 2.25b -* Tue Jan 13 2004 - schwab@suse.de +* Tue Jan 13 2004 schwab@suse.de - Fix use of aclocal. -* Wed Oct 29 2003 - tcrhak@suse.cz +* Wed Oct 29 2003 tcrhak@suse.cz - update to 2.24, includes a fix for a buffer overflow [bug #32734] - fixed virtual hosting security hole [bug #32757] - fixed permissions according to permissions.secure, added macros %%run_permissions and %%verify_permissions -* Mon Sep 01 2003 - tcrhak@suse.cz +* Mon Sep 01 2003 tcrhak@suse.cz - added macros %%stop_on_removal and %%restart_on_update [bug #29022] -* Thu Jun 05 2003 - ro@suse.de +* Thu Jun 05 2003 ro@suse.de - remove unpackaged files from buildroot -* Tue Mar 11 2003 - tcrhak@suse.cz +* Tue Mar 11 2003 tcrhak@suse.cz - fixed permissions of the init scipt [bug #25084] -* Tue Oct 15 2002 - tcrhak@suse.cz +* Tue Oct 15 2002 tcrhak@suse.cz - substitute correct servroot during built -* Mon Oct 14 2002 - tcrhak@suse.cz +* Mon Oct 14 2002 tcrhak@suse.cz - use /srv/www rather then /usr/local/httpd [bug #20802] -* Fri Aug 02 2002 - ro@suse.de +* Fri Aug 02 2002 ro@suse.de - adapt server root -* Sat Jul 27 2002 - kukuk@suse.de +* Sat Jul 27 2002 kukuk@suse.de - Change group from wwwadmin to www -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - do not source rc.config anymore -* Tue Jul 02 2002 - tcrhak@suse.cz +* Tue Jul 02 2002 tcrhak@suse.cz - update to version 2.23beta1 -* Tue Jan 15 2002 - tcrhak@suse.cz +* Tue Jan 15 2002 tcrhak@suse.cz - update to version 2.20c - added thttpd-2.20c-sec.patch - removed START_THTTPD from README.SuSE -* Tue Jan 15 2002 - ro@suse.de +* Tue Jan 15 2002 ro@suse.de - removed START_THTTPD -* Fri Sep 21 2001 - bjacke@suse.de +* Fri Sep 21 2001 bjacke@suse.de - fix version on template webpage -* Mon Sep 03 2001 - adostal@suse.cz +* Mon Sep 03 2001 adostal@suse.cz - fix /etc/init.d in thttpd-SuSE.tar.bz2 files - split patches on configure, dirs, time_h and newautoconf -* Thu Jun 14 2001 - adostal@suse.cz +* Thu Jun 14 2001 adostal@suse.cz - fix for new autoconf -* Fri Apr 13 2001 - nadvornik@suse.cz +* Fri Apr 13 2001 nadvornik@suse.cz - changed initscript according to skeleton -* Thu Mar 08 2001 - nadvornik@suse.cz +* Thu Mar 08 2001 nadvornik@suse.cz - compiled with RPM_OPT_FLAGS -* Thu Feb 15 2001 - nadvornik@suse.cz +* Thu Feb 15 2001 nadvornik@suse.cz - fixed to compile -* Wed Dec 13 2000 - smid@suse.cz +* Wed Dec 13 2000 smid@suse.cz - generatig of default page moved to %%install (it was in %%post and - caused [#4566] -* Tue Dec 12 2000 - smid@suse.cz +* Tue Dec 12 2000 smid@suse.cz - default cgibin pattern changed [#4564] - rcthttpd link added -* Sun Dec 03 2000 - smid@suse.cz +* Sun Dec 03 2000 smid@suse.cz - new version: 2.20b -* Fri Dec 01 2000 - ro@suse.de +* Fri Dec 01 2000 ro@suse.de - moved init-script -* Thu Nov 02 2000 - smid@suse.cz +* Thu Nov 02 2000 smid@suse.cz - fix ugly bug in startup scripts -* Thu Sep 28 2000 - smid@suse.cz +* Thu Sep 28 2000 smid@suse.cz - new version: 2.20 -* Wed Aug 30 2000 - smid@suse.cz +* Wed Aug 30 2000 smid@suse.cz - fix bug in startup script -* Wed Jul 05 2000 - mha@suse.de +* Wed Jul 05 2000 mha@suse.de - new version: 2.19 -* Tue May 23 2000 - smid@suse.cz +* Tue May 23 2000 smid@suse.cz - buildroot fixed -* Wed May 03 2000 - smid@suse.cz +* Wed May 03 2000 smid@suse.cz - buildroot added -* Tue Mar 21 2000 - mha@suse.de +* Tue Mar 21 2000 mha@suse.de - update to 2.16 -* Fri Mar 03 2000 - uli@suse.de +* Fri Mar 03 2000 uli@suse.de - moved man pages to %%{_mandir} -* Mon Feb 28 2000 - mha@suse.de +* Mon Feb 28 2000 mha@suse.de - new version: 2.15 -* Thu Feb 17 2000 - dipa@suse.de +* Thu Feb 17 2000 dipa@suse.de - bug #1268 rc.config variable set to no -* Wed Jan 12 2000 - mha@suse.de +* Wed Jan 12 2000 mha@suse.de - new version: 2.11 - new conflicts (roxen, apache, aolserv), provides (http_daemon) - new homepage -* Tue Nov 16 1999 - kukuk@suse.de +* Tue Nov 16 1999 kukuk@suse.de - Fix stack overflow -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Sep 09 1999 - bs@suse.de +* Thu Sep 09 1999 bs@suse.de - fixed call of Check at the end of %%install section -* Sun Jul 11 1999 - mha@suse.de +* Sun Jul 11 1999 mha@suse.de - new package: thttpd (a _small_ webserver) absolutely no configuration needed - and yet save (chroot)!