commit thttpd for openSUSE:Factory

2020-05-17 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2020-05-17 23:44:01

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new.2738 (New)


Package is "thttpd"

Sun May 17 23:44:01 2020 rev:42 rq:806233 version:2.29

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2020-02-09 
20:49:15.178903646 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new.2738/thttpd.changes  2020-05-17 
23:44:10.277178509 +0200
@@ -1,0 +2,6 @@
+Thu May 14 08:42:14 UTC 2020 - Vítězslav Čížek 
+
+- Allow regular users to execute makeweb (bsc#1171580)
+  * Set permissions to 2751
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.sf9j4A/_old  2020-05-17 23:44:11.177180317 +0200
+++ /var/tmp/diff_new_pack.sf9j4A/_new  2020-05-17 23:44:11.181180325 +0200
@@ -158,7 +158,7 @@
 %doc README config.h
 %{serverroot}/htdocs/*
 %attr(775, root, www) %{serverroot}/htdocs/users
-%verify(not mode) %attr(2750, root, www) %{_bindir}/makeweb
+%verify(not mode) %attr(2751, root, www) %{_bindir}/makeweb
 %{_bindir}/htpasswd
 %{_sbindir}/*
 %{_mandir}/*/*

commit thttpd for openSUSE:Factory

2020-02-09 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2020-02-09 20:49:12

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new.26092 (New)


Package is "thttpd"

Sun Feb  9 20:49:12 2020 rev:41 rq:772325 version:2.29

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2018-10-23 
20:42:42.504378151 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new.26092/thttpd.changes 2020-02-09 
20:49:15.178903646 +0100
@@ -1,0 +2,6 @@
+Mon Feb  3 16:40:08 UTC 2020 - Dominique Leuenberger 
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+  shortcut through the -mini flavors.
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.1T27Z4/_old  2020-02-09 20:49:16.286904279 +0100
+++ /var/tmp/diff_new_pack.1T27Z4/_new  2020-02-09 20:49:16.290904281 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
 Summary:Small and simple webserver
 License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
-Url:http://www.acme.com/software/thttpd/
+URL:http://www.acme.com/software/thttpd/
 Source: http://www.acme.com/software/thttpd/%{name}-%{version}.tar.gz
 Source1:%{name}-initd.script
 Source2:%{name}.service
@@ -60,8 +60,8 @@
 Conflicts:  apache2-utils
 Provides:   http_daemon
 %if %{with_systemd}
-BuildRequires:  systemd
-%{?systemd_requires}
+BuildRequires:  pkgconfig(systemd)
+%{?systemd_ordering}
 %else
 Requires(post): %fillup_prereq
 Requires(post): %insserv_prereq

commit thttpd for openSUSE:Factory

2018-10-23 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2018-10-23 20:41:52

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Tue Oct 23 20:41:52 2018 rev:40 rq:643958 version:2.29

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2017-11-11 
14:20:22.121523022 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2018-10-23 
20:42:42.504378151 +0200
@@ -1,0 +2,10 @@
+Mon Oct 22 08:44:39 UTC 2018 - Vítězslav Čížek 
+
+- Update to 2.29 (bsc#1112629)
+  Allow CGI to handle HTTP methods besides GET/HEAD/POST.
+  Improvements to the FreeBSD startup script. (Craig Leres)
+  Minor portability tweak in mmc.c.
+  Fix to buffer overrun bug in htpasswd. Reported by Alessio Santoru as 
CVE-2017-17663.
+- update thttpd-2.25b-overflow.diff
+
+---

Old:

  thttpd-2.27.tar.gz

New:

  thttpd-2.29.tar.gz



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.BZyLwF/_old  2018-10-23 20:42:43.360377128 +0200
+++ /var/tmp/diff_new_pack.BZyLwF/_new  2018-10-23 20:42:43.360377128 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,13 +23,13 @@
 %define with_systemd 0
 %endif
 Name:   thttpd
-Version:2.27
+Version:2.29
 Release:0
 Summary:Small and simple webserver
 License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
 Url:http://www.acme.com/software/thttpd/
-Source: %{name}-%{version}.tar.gz
+Source: http://www.acme.com/software/thttpd/%{name}-%{version}.tar.gz
 Source1:%{name}-initd.script
 Source2:%{name}.service
 Source3:%{name}.logrotate

++ thttpd-2.25b-overflow.diff ++
--- /var/tmp/diff_new_pack.BZyLwF/_old  2018-10-23 20:42:43.388377095 +0200
+++ /var/tmp/diff_new_pack.BZyLwF/_new  2018-10-23 20:42:43.388377095 +0200
@@ -1,18 +1,8 @@
 Index: extras/htpasswd.c
 ===
 extras/htpasswd.c.orig 2014-09-03 09:40:24.741007309 +0200
-+++ extras/htpasswd.c  2014-09-03 09:42:47.188597773 +0200
-@@ -184,15 +184,17 @@ int main(int argc, char *argv[]) {
- fprintf(stderr,"Use -c option to create new one.\n");
- exit(1);
- }
--strcpy(user,argv[2]);
- 
-+strncpy(user,argv[2],MAX_STRING_LEN);
-+user[MAX_STRING_LEN-1]='\0';
- found = 0;
- while(!(my_getline(line,MAX_STRING_LEN,f))) {
- if(found || (line[0] == '#') || (!line[0])) {
+--- extras/htpasswd.c.orig 2018-10-22 10:48:47.811465609 +0200
 extras/htpasswd.c  2018-10-22 10:52:45.008744706 +0200
+@@ -193,7 +193,8 @@ int main(int argc, char *argv[]) {
  putline(tfp,line);
  continue;
  }
@@ -22,7 +12,7 @@
  getword(w,l,':');
  if(strcmp(user,w)) {
  putline(tfp,line);
-@@ -210,7 +212,8 @@ int main(int argc, char *argv[]) {
+@@ -211,7 +212,8 @@ int main(int argc, char *argv[]) {
  }
  fclose(f);
  fclose(tfp);

++ thttpd-2.27.tar.gz -> thttpd-2.29.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/thttpd-2.27/INSTALL new/thttpd-2.29/INSTALL
--- old/thttpd-2.27/INSTALL 2003-12-29 18:14:43.0 +0100
+++ new/thttpd-2.29/INSTALL 2018-05-24 01:31:09.0 +0200
@@ -20,9 +20,9 @@
 On Red Hat Linux systems you can use RPM to install thttpd, like so:
 
cd /usr/src/redhat/SOURCES
-   wget http://www.acme.com/software/thttpd/thttpd-2.26.tar.gz
-   rpm -ta thttpd-2.26.tar.gz
-   rpm -i /usr/src/redhat/RPMS/i386/thttpd-2.26-1.i386.rpm
+   wget http://www.acme.com/software/thttpd/thttpd-2.29.tar.gz
+   rpm -ta thttpd-2.29.tar.gz
+   rpm -i /usr/src/redhat/RPMS/i386/thttpd-2.29-1.i386.rpm
 
 
 Solaris:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/thttpd-2.27/README new/thttpd-2.29/README
--- old/thttpd-2.27/README  2015-10-20 01:38:08.0 +0200
+++ new/thttpd-2.29/README

commit thttpd for openSUSE:Factory

2017-11-11 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2017-11-11 14:19:59

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Sat Nov 11 14:19:59 2017 rev:39 rq:540237 version:2.27

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2017-09-12 
19:55:04.497776325 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2017-11-11 
14:20:22.121523022 +0100
@@ -1,0 +2,5 @@
+Wed Oct 18 08:30:54 UTC 2017 - jeng...@inai.de
+
+- Trim filler wording from description.
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.tuqpSy/_old  2017-11-11 14:20:23.297479924 +0100
+++ /var/tmp/diff_new_pack.tuqpSy/_new  2017-11-11 14:20:23.301479777 +0100
@@ -25,7 +25,7 @@
 Name:   thttpd
 Version:2.27
 Release:0
-Summary:Small and very simple webserver
+Summary:Small and simple webserver
 License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
 Url:http://www.acme.com/software/thttpd/
@@ -68,11 +68,11 @@
 %endif
 
 %description
-Thttpd is a very compact no-frills httpd serving daemon that can handle
-very high loads.  While lacking many of the advanced features of Roxen
-or Apache, thttpd operates without forking and is extremely efficient
-in memory use. Basic support for cgi scripts, authentication, and ssi
-is provided for.  Advanced features include the ability to throttle
+Thttpd is a compact httpd serving daemon that can handle
+high loads. While lacking many of the advanced features of Roxen
+or Apache, thttpd operates without forking and is efficient
+in memory use. Basic support for CGI scripts, authentication, and SSI
+is provided. Advanced features include the ability to throttle
 traffic.
 
 %prep

commit thttpd for openSUSE:Factory

2017-09-12 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2017-09-12 19:54:27

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Tue Sep 12 19:54:27 2017 rev:38 rq:523016 version:2.27

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2017-08-10 
14:13:02.852475398 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2017-09-12 
19:55:04.497776325 +0200
@@ -1,0 +2,5 @@
+Mon Sep 11 09:36:59 UTC 2017 - vci...@suse.com
+
+- Require group www (bsc#1057985)
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.QzFA3T/_old  2017-09-12 19:55:05.465640237 +0200
+++ /var/tmp/diff_new_pack.QzFA3T/_new  2017-09-12 19:55:05.469639675 +0200
@@ -52,6 +52,7 @@
 BuildRequires:  automake
 BuildRequires:  libtool
 Requires(post): permissions
+Requires:   group(www)
 Recommends: logrotate
 # both packages provide /srw/www/htdocs/index.html
 Conflicts:  apache2-example-pages

commit thttpd for openSUSE:Factory

2017-08-10 Thread root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2017-08-10 14:05:17

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Thu Aug 10 14:05:17 2017 rev:37 rq:514492 version:2.27

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2015-10-20 
00:05:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2017-08-10 
14:13:02.852475398 +0200
@@ -1,0 +2,10 @@
+Mon Jun 26 11:58:22 UTC 2017 - vci...@suse.com
+
+- update to 2.27
+  Stats syslogs changed from LOG_INFO to LOG_NOTICE.
+  Use memmove() for self-overlapping string copies instead of strcpy().
+  Couple of subroutine name changes for consistency.
+- drop thttpd-2.25b-strcpy.patch (upstream)
+- enforce single process build, as parallel does fail sometimes
+
+---

Old:

  thttpd-2.25b-strcpy.patch
  thttpd-2.26.tar.gz

New:

  thttpd-2.27.tar.gz



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.MwaP4t/_old  2017-08-10 14:13:03.820339121 +0200
+++ /var/tmp/diff_new_pack.MwaP4t/_new  2017-08-10 14:13:03.820339121 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %define with_systemd 0
 %endif
 Name:   thttpd
-Version:2.26
+Version:2.27
 Release:0
 Summary:Small and very simple webserver
 License:BSD-3-Clause
@@ -45,7 +45,6 @@
 Patch8: %{name}-2.25b-overflow.diff
 Patch9: %{name}-2.25b-chown.diff
 Patch10:%{name}-2.25b-zerolen.patch
-Patch11:%{name}-2.25b-strcpy.patch
 # PATCH-FIX-SUSE CVE-2012-5640
 Patch13:thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
 Patch14:thttpd-CVE-2013-0348.patch
@@ -54,12 +53,11 @@
 BuildRequires:  libtool
 Requires(post): permissions
 Recommends: logrotate
-# both packages provide /usr/bin/htpasswd
-Conflicts:  apache2-utils
 # both packages provide /srw/www/htdocs/index.html
 Conflicts:  apache2-example-pages
+# both packages provide /usr/bin/htpasswd
+Conflicts:  apache2-utils
 Provides:   http_daemon
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if %{with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -89,7 +87,6 @@
 %patch8
 %patch9
 %patch10
-%patch11
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
@@ -104,7 +101,8 @@
 export CFLAGS="%{optflags} -fPIC -DPIC -fPIE"
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %configure
-make
+# parallel build causes problems, single thread build takes only 10s anyway
+make -j1
 
 %install
 install -d %{buildroot}%{_bindir} \
@@ -112,7 +110,7 @@
 %{buildroot}%{_mandir}/man1 \
 %{buildroot}%{_mandir}/man8 \
 %{buildroot}%{serverroot}/htdocs/users
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 install -D -m0644 index.html %{buildroot}/%{serverroot}/htdocs/index.html
 install -D -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}.conf
 install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
@@ -135,11 +133,7 @@
 %else
 %{fillup_and_insserv thttpd}
 %endif
-%if 0%{?suse_version} <= 1130
-%run_permissions
-%else
 %set_permissions %{_bindir}/makeweb
-%endif
 
 %verifyscript
 %verify_permissions -e %{_bindir}/makeweb
@@ -160,7 +154,6 @@
 %endif
 
 %files
-%defattr(-, root, root)
 %doc README config.h
 %{serverroot}/htdocs/*
 %attr(775, root, www) %{serverroot}/htdocs/users

++ thttpd-2.26.tar.gz -> thttpd-2.27.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/thttpd-2.26/README new/thttpd-2.27/README
--- old/thttpd-2.26/README  2005-05-20 21:10:25.0 +0200
+++ new/thttpd-2.27/README  2015-10-20 01:38:08.0 +0200
@@ -1,5 +1,5 @@
  thttpd - tiny/turbo/throttling HTTP server
-version 2.26 of ??may2004
+version 2.27 of 19Oct2015
 
 thttpd is a simple, small, portable, fast, and secure HTTP server.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/thttpd-2.26/contrib/redhat-rpm/thttpd.spec 
new/thttpd-2.27/contrib/redhat-rpm/thttpd.spec
--- old/thttpd-2.26/contrib/redhat-rpm/thttpd.spec  2005-05-20 
21:10:25.0 +0200
+++ new/thttpd-2.27/contrib/redhat-rpm/thttpd.spec  2015-10-20 
01:38:13.0 +0200
@@ -1,6 +1,6 @@
 Su

commit thttpd for openSUSE:Factory

2015-10-19 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2015-10-19 22:51:22

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2015-06-10 
09:15:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2015-10-20 
00:05:17.0 +0200
@@ -1,0 +2,19 @@
+Thu Sep 17 14:10:46 UTC 2015 - vci...@suse.com
+
+- added Conflicts: apache2-example-pages
+  * both packages provide /srv/www/htdocs/index.html
+
+---
+Sun Jul  5 09:43:36 UTC 2015 - vci...@suse.com
+
+- build with pie and full relro
+
+---
+Thu Jun 18 15:07:51 UTC 2015 - thehe...@suse.com
+
+- package cleanup (bnc#899218)
+  * removed SUSE branding
+  * added logrotate support
+  * changed note about default codepage
+
+---

Old:

  thttpd-SuSE.tar.bz2

New:

  thttpd-initd.script
  thttpd.conf
  thttpd.logrotate



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.whrySU/_old  2015-10-20 00:05:18.0 +0200
+++ /var/tmp/diff_new_pack.whrySU/_new  2015-10-20 00:05:18.0 +0200
@@ -16,6 +16,7 @@
 #
 
 
+%define serverroot /srv/www
 %if 0%{?suse_version} > 1220
 %define with_systemd 1
 %else
@@ -29,8 +30,10 @@
 Group:  Productivity/Networking/Web/Servers
 Url:http://www.acme.com/software/thttpd/
 Source: %{name}-%{version}.tar.gz
-Source1:%{name}-SuSE.tar.bz2
+Source1:%{name}-initd.script
 Source2:%{name}.service
+Source3:%{name}.logrotate
+Source4:%{name}.conf
 Patch0: %{name}-2.25b-configure.patch
 Patch1: %{name}-2.25b-dirs.patch
 Patch2: %{name}-2.25b-time_h.patch
@@ -50,9 +53,12 @@
 BuildRequires:  automake
 BuildRequires:  libtool
 Requires(post): permissions
-Provides:   http_daemon
+Recommends: logrotate
 # both packages provide /usr/bin/htpasswd
 Conflicts:  apache2-utils
+# both packages provide /srw/www/htdocs/index.html
+Conflicts:  apache2-example-pages
+Provides:   http_daemon
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if %{with_systemd}
 BuildRequires:  systemd
@@ -70,10 +76,8 @@
 is provided for.  Advanced features include the ability to throttle
 traffic.
 
-%define serverroot /srv/www
-
 %prep
-%setup -q -a 1
+%setup -q
 %patch0
 %patch1
 %patch2
@@ -92,25 +96,15 @@
 
 %build
 cp %{_datadir}/automake-1.*/config.* .
-# update server root path
-sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE 
SuSE%{_sysconfdir}/thttpd.conf
-sed -i "s@__PREFIX__@%{_prefix}@g;\
-s@__SYSCONFDIR__@%{_sysconfdir}@g;\
-s@__NAME__@%{name}@g;\
-s@__VERSION__@%{version}@g" SuSE%{_initddir}/thttpd
-chmod 744 SuSE%{_initddir}/thttpd
-chmod 644 SuSE%{_sysconfdir}/thttpd.conf
 mv aclocal.m4 acinclude.m4
 libtoolize --force
 aclocal --force
 autoconf -f
-V_CCOPT="%{optflags} -Wall" \
+export V_CCOPT="%{optflags} -fPIC -DPIC -fPIE"
+export CFLAGS="%{optflags} -fPIC -DPIC -fPIE"
+export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %configure
-%ifarch s390 s390x
-make F_PIE="-fPIE" %{?_smp_mflags}
-%else
-make F_PIE="-fpie" %{?_smp_mflags}
-%endif
+make
 
 %install
 install -d %{buildroot}%{_bindir} \
@@ -119,18 +113,18 @@
 %{buildroot}%{_mandir}/man8 \
 %{buildroot}%{serverroot}/htdocs/users
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-cp -a SuSE/* %{buildroot}
-rm -f %{buildroot}%{serverroot}/htdocs/index.html
+install -D -m0644 index.html %{buildroot}/%{serverroot}/htdocs/index.html
+install -D -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}.conf
+install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %if %{with_systemd}
-rm -rf %{buildroot}%{_sysconfdir}/init.d
-rm %{buildroot}%{_sbindir}/rc%{name}
-mkdir -p %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+%else
+install -D -m0644 %{SOURCE1} %{buildroot}%{_initddir}/%{name}
+ln -s %{buildroot}%{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %endif
 
 %if %{with_systemd}
-
 %pre
 %service_add_pre %{name}.service
 %endif
@@ -167,13 +161,14 @@
 
 %files
 %defattr(-, root, root)
-%doc README README.SuSE config.h
+%doc README config.h
 %{serverroot}/htdocs/*
 %attr(775, root, www) %{serverroot}/htdocs/users
 %verify(not mode) %attr(2750, root, www) %{_bindir}/makeweb
 %{_bindir}/htpasswd

commit thttpd for openSUSE:Factory

2015-06-10 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2015-06-10 09:15:26

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2014-11-26 
10:33:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2015-06-10 
09:15:27.0 +0200
@@ -1,0 +2,7 @@
+Thu Jun  4 15:09:12 UTC 2015 - vci...@suse.com
+
+- added Conflicts: apache2-utils
+  * both packages provide /usr/bin/htpasswd
+  * see comments in https://build.opensuse.org/request/show/310178
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.jKwGy2/_old  2015-06-10 09:15:28.0 +0200
+++ /var/tmp/diff_new_pack.jKwGy2/_new  2015-06-10 09:15:28.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,6 +51,8 @@
 BuildRequires:  libtool
 Requires(post): permissions
 Provides:   http_daemon
+# both packages provide /usr/bin/htpasswd
+Conflicts:  apache2-utils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %if %{with_systemd}
 BuildRequires:  systemd

commit thttpd for openSUSE:Factory

2014-11-26 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2014-11-26 10:33:50

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2014-09-23 
10:42:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2014-11-26 
10:33:56.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 23 04:50:32 UTC 2014 - bwiedem...@suse.com
+
+- use /usr/sbin path in service to fix start (bnc#906696)
+
+---



Other differences:
--
++ thttpd.service ++
--- /var/tmp/diff_new_pack.VFRMEs/_old  2014-11-26 10:33:57.0 +0100
+++ /var/tmp/diff_new_pack.VFRMEs/_new  2014-11-26 10:33:57.0 +0100
@@ -3,7 +3,7 @@
 
 [Service]
 PIDFile=/run/thttpd.pid
-ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
+ExecStart=/usr/sbin/thttpd -D -C /etc/thttpd.conf
 Restart=always
 
 [Install]

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2014-09-23 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2014-09-23 10:42:42

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2014-07-21 
22:35:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2014-09-23 
10:42:59.0 +0200
@@ -1,0 +2,19 @@
+Mon Sep 22 13:34:52 UTC 2014 - vci...@suse.com
+
+- drop thttpd-2.25b.tar.bz2 (old tarball)
+
+---
+Wed Sep  3 07:42:53 UTC 2014 - vci...@suse.com
+
+- update to 2.26 (bnc#894285)
+  Ignore ECONNABORTED on accept().
+  Correctly implemented the config-file option change from "nosymlink"
+  to "nosymlinkcheck", which was supposedly done in version 2.24.
+  Removed mailto: link from default index page.
+  Allow CGIs to provide both Location and Status headers.
+  Better logic for figuring out CGI SERVER_NAME environment variable.
+  Updated for clang, and general cleanup.
+- dropped thttpd-2.25b-getline.patch (upstream)
+- added thttpd-crypt_is_in_crypt.h.patch
+
+---

Old:

  thttpd-2.25b-getline.patch
  thttpd-2.25b.tar.bz2

New:

  thttpd-2.26.tar.gz
  thttpd-crypt_is_in_crypt.h.patch



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.cblCad/_old  2014-09-23 10:43:02.0 +0200
+++ /var/tmp/diff_new_pack.cblCad/_new  2014-09-23 10:43:02.0 +0200
@@ -15,49 +15,50 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?suse_version} > 1220
 %define with_systemd 1
 %else
 %define with_systemd 0
 %endif
-
 Name:   thttpd
-Provides:   http_daemon
-%if %{with_systemd}
-BuildRequires:  systemd
-%{?systemd_requires}
-%else
-PreReq: %fillup_prereq %insserv_prereq
-%endif
-PreReq: permissions
-Version:2.25b
+Version:2.26
 Release:0
-Source: %{name}-%{version}.tar.bz2
+Summary:Small and very simple webserver
+License:BSD-3-Clause
+Group:  Productivity/Networking/Web/Servers
+Url:http://www.acme.com/software/thttpd/
+Source: %{name}-%{version}.tar.gz
 Source1:%{name}-SuSE.tar.bz2
 Source2:%{name}.service
-Patch0: %{name}-%{version}-configure.patch
-Patch1: %{name}-%{version}-dirs.patch
-Patch2: %{name}-%{version}-time_h.patch
-Patch3: %{name}-%{version}-newautoconf.patch  
-Patch4: %{name}-%{version}-sec.patch
-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
-Patch10:%{name}-%{version}-zerolen.patch
-Patch11:%{name}-%{version}-strcpy.patch
-Patch12:thttpd-2.25b-getline.patch
+Patch0: %{name}-2.25b-configure.patch
+Patch1: %{name}-2.25b-dirs.patch
+Patch2: %{name}-2.25b-time_h.patch
+Patch3: %{name}-2.25b-newautoconf.patch
+Patch4: %{name}-2.25b-sec.patch
+Patch5: %{name}-2.25b-static.patch
+Patch6: %{name}-2.25b-pie.patch
+Patch7: %{name}-2.25b-syslogtocern.diff
+Patch8: %{name}-2.25b-overflow.diff
+Patch9: %{name}-2.25b-chown.diff
+Patch10:%{name}-2.25b-zerolen.patch
+Patch11:%{name}-2.25b-strcpy.patch
 # PATCH-FIX-SUSE CVE-2012-5640
 Patch13:thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
 Patch14:thttpd-CVE-2013-0348.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
+Patch15:thttpd-crypt_is_in_crypt.h.patch
 BuildRequires:  automake
 BuildRequires:  libtool
+Requires(post): permissions
+Provides:   http_daemon
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if %{with_systemd}
+BuildRequires:  systemd
+%{?systemd_requires}
+%else
+Requires(post): %fillup_prereq
+Requires(post): %insserv_prereq
+%endif
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle
@@ -83,50 +84,51 @@
 %patch9
 %patch10
 %patch11
-%patch12
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
-cp /usr/share/automake-1.*/config.* . 
+cp %{_datadir}/automake-1.*/config.* .
 # update server root path
-sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
+sed -i "s@__SRVROOT__@%{s

commit thttpd for openSUSE:Factory

2014-07-21 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2014-07-21 21:40:29

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2013-12-04 
12:32:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2014-07-21 
22:35:07.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 18 16:40:22 UTC 2014 - p.drou...@gmail.com
+
+- Use systemd instead of sysvinit in openSUSE > 12.2
+
+---

New:

  thttpd.service



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.1RBqub/_old  2014-07-21 22:35:08.0 +0200
+++ /var/tmp/diff_new_pack.1RBqub/_new  2014-07-21 22:35:08.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -15,14 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} > 1220
+%define with_systemd 1
+%else
+%define with_systemd 0
+%endif
 
 Name:   thttpd
 Provides:   http_daemon
-PreReq: %fillup_prereq %insserv_prereq permissions
+%if %{with_systemd}
+BuildRequires:  systemd
+%{?systemd_requires}
+%else
+PreReq: %fillup_prereq %insserv_prereq
+%endif
+PreReq: permissions
 Version:2.25b
 Release:0
 Source: %{name}-%{version}.tar.bz2
 Source1:%{name}-SuSE.tar.bz2
+Source2:%{name}.service
 Patch0: %{name}-%{version}-configure.patch
 Patch1: %{name}-%{version}-dirs.patch
 Patch2: %{name}-%{version}-time_h.patch
@@ -55,12 +67,6 @@
 is provided for.  Advanced features include the ability to throttle
 traffic.
 
-
-
-Authors:
-
-j...@acme.com
-
 %define serverroot /srv/www
 
 %prep
@@ -96,11 +102,7 @@
 aclocal --force
 autoconf -f
 V_CCOPT="$RPM_OPT_FLAGS -Wall" \
-./configure \
---mandir=%{_mandir} \
---prefix=%{_prefix} \
---infodir=%{_infodir} \
---sysconfdir=%{_sysconfdir}
+%configure
 %ifarch s390 s390x
 make F_PIE="-fPIE"
 %else
@@ -116,9 +118,25 @@
 make DESTDIR=%{buildroot} install
 cp -a SuSE/* %{buildroot}
 rm -f %{buildroot}%{serverroot}/htdocs/index.html
+%if %{with_systemd}
+rm -rf %{buildroot}/etc/init.d
+rm %{buildroot}%{_sbindir}/rc%{name}
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+%endif
+
+%if %{with_systemd}
+%pre 
+%service_add_pre %{name}.service
+%endif
 
 %post
+%if %{with_systemd}
+%service_add_post %{name}.service
+%else
 %{fillup_and_insserv thttpd}
+%endif
 %if 0%{?suse_version} <= 1130
 %run_permissions
 %else
@@ -129,14 +147,19 @@
 %verify_permissions -e /usr/bin/makeweb
 
 %preun
+%if %{with_systemd}
+%service_del_preun %{name}.service
+%else
 %stop_on_removal thttpd
+%endif
 
 %postun
+%if %{with_systemd}
+%service_del_postun %{name}.service
+%else
 %restart_on_update thttpd
 %{insserv_cleanup}
-
-%clean
-rm -rf "%{buildroot}"
+%endif
 
 %files
 %defattr(-, root, root)
@@ -147,7 +170,11 @@
 /usr/bin/htpasswd
 /usr/sbin/*
 /usr/share/man/*/*
+%if %{with_systemd}
+%{_unitdir}/%{name}.service
+%else
 %config /etc/init.d/thttpd
+%endif
 %config(noreplace) /etc/thttpd.conf
 
 %changelog

++ thttpd.service ++
[Unit]
Description=Tiny HTTP Daemon

[Service]
PIDFile=/run/thttpd.pid
ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
Restart=always

[Install]
WantedBy=multi-user.target
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2013-12-04 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2013-12-04 12:32:06

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2013-06-28 
19:28:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2013-12-04 
12:32:08.0 +0100
@@ -1,0 +2,6 @@
+Tue Dec  3 14:31:18 UTC 2013 - vci...@suse.com
+
+- fix CVE-2013-0348 (bnc#853381)
+  * don't create a world readable logfile
+
+---

New:

  thttpd-CVE-2013-0348.patch



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.BthcGc/_old  2013-12-04 12:32:08.0 +0100
+++ /var/tmp/diff_new_pack.BthcGc/_new  2013-12-04 12:32:08.0 +0100
@@ -38,6 +38,7 @@
 Patch12:thttpd-2.25b-getline.patch
 # PATCH-FIX-SUSE CVE-2012-5640
 Patch13:thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
+Patch14:thttpd-CVE-2013-0348.patch
 Url:http://www.acme.com/software/thttpd/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:Small and very simple webserver
@@ -78,6 +79,7 @@
 %patch11
 %patch12
 %patch13 -p1
+%patch14 -p1
 
 %build
 cp /usr/share/automake-1.*/config.* . 

++ thttpd-CVE-2013-0348.patch ++
>From d2e186dbd58d274a0dea9b59357edc8498b5388d Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" 
Date: Tue, 26 Feb 2013 14:28:26 -0500
Subject: [PATCH] src/thttpd.c: Fix world readable log, CVE-2013-0348.

Make sure that the logfile is created or reopened as read/write
by thttpd user only.

X-gentoo-Bug: 458896
X-gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=458896
Reported-by:  Agostino Sarubbo 
Signed-off-by: Anthony G. Basile 
---
 src/thttpd.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Index: thttpd-2.25b/thttpd.c
===
--- thttpd-2.25b.orig/thttpd.c  2013-12-03 15:38:31.719334530 +0100
+++ thttpd-2.25b/thttpd.c   2013-12-03 15:38:31.754334893 +0100
@@ -331,6 +331,7 @@ static void
 re_open_logfile( void )
 {
 FILE* logfp;
+int retchmod;
 
 if ( no_log || hs == (httpd_server*) 0 )
return;
@@ -340,7 +341,8 @@ re_open_logfile( void )
{
syslog( LOG_NOTICE, "re-opening logfile" );
logfp = fopen( logfile, "a" );
-   if ( logfp == (FILE*) 0 )
+   retchmod = chmod( logfile, S_IRUSR|S_IWUSR );
+   if ( logfp == (FILE*) 0 || retchmod != 0 )
{
syslog( LOG_CRIT, "re-opening %.80s - %m", logfile );
return;
@@ -360,6 +362,7 @@ main( int argc, char** argv )
 gid_t gid = 32767;
 char cwd[MAXPATHLEN+1];
 FILE* logfp;
+int retchmod;
 int num_ready;
 int cnum;
 connecttab* c;
@@ -429,7 +432,8 @@ main( int argc, char** argv )
else
{
logfp = fopen( logfile, "a" );
-   if ( logfp == (FILE*) 0 )
+   retchmod = chmod( logfile, S_IRUSR|S_IWUSR );
+   if ( logfp == (FILE*) 0 || retchmod != 0 )
{
syslog( LOG_CRIT, "%.80s - %m", logfile );
perror( logfile );
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2013-06-28 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2013-06-28 19:28:54

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd"

Changes:

--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes2013-03-10 
09:13:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2013-06-28 
19:28:56.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 27 21:03:49 UTC 2013 - crrodrig...@opensuse.org
+
+- DO not add sample index.html that will conflict with apache 
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.56K955/_old  2013-06-28 19:28:56.0 +0200
+++ /var/tmp/diff_new_pack.56K955/_new  2013-06-28 19:28:56.0 +0200
@@ -113,10 +113,7 @@
 %{buildroot}%{serverroot}/htdocs/users
 make DESTDIR=%{buildroot} install
 cp -a SuSE/* %{buildroot}
-sed "s@THTTPD-RELEASE@%{version}@" \
-%{buildroot}%{serverroot}/htdocs/index.html.template > \
-%{buildroot}%{serverroot}/htdocs/index.html
-rm -f %{buildroot}%{serverroot}/htdocs/index.html.template
+rm -f %{buildroot}%{serverroot}/htdocs/index.html
 
 %post
 %{fillup_and_insserv thttpd}
@@ -144,7 +141,6 @@
 %doc README README.SuSE config.h
 %{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
 /usr/bin/htpasswd
 /usr/sbin/*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2013-03-10 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2013-03-10 09:13:16

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.changes2012-11-02 
17:43:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2013-03-10 
09:13:17.0 +0100
@@ -1,0 +2,6 @@
+Mon Mar  4 16:04:08 UTC 2013 - vci...@suse.com
+
+- added checks for crypt() return value (CVE-2012-5640) (bnc#783165)
+  * thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
+
+---

New:

  thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.9YkcjN/_old  2013-03-10 09:13:18.0 +0100
+++ /var/tmp/diff_new_pack.9YkcjN/_new  2013-03-10 09:13:18.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -36,6 +36,8 @@
 Patch10:%{name}-%{version}-zerolen.patch
 Patch11:%{name}-%{version}-strcpy.patch
 Patch12:thttpd-2.25b-getline.patch
+# PATCH-FIX-SUSE CVE-2012-5640
+Patch13:thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
 Url:http://www.acme.com/software/thttpd/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:Small and very simple webserver
@@ -75,6 +77,7 @@
 %patch10
 %patch11
 %patch12
+%patch13 -p1
 
 %build
 cp /usr/share/automake-1.*/config.* . 

++ thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch ++
Index: thttpd-2.25b/libhttpd.c
===
--- thttpd-2.25b.orig/libhttpd.c2013-03-04 18:01:55.209721739 +0100
+++ thttpd-2.25b/libhttpd.c 2013-03-04 18:01:55.244722735 +0100
@@ -1024,6 +1024,7 @@ auth_check2( httpd_conn* hc, char* dirna
 static size_t maxprevuser = 0;
 static char* prevcryp;
 static size_t maxprevcryp = 0;
+char *crypt_result;
 
 /* Construct auth filename. */
 httpd_realloc_str(
@@ -1072,7 +1073,10 @@ auth_check2( httpd_conn* hc, char* dirna
 strcmp( authinfo, prevuser ) == 0 )
{
/* Yes.  Check against the cached encrypted password. */
-   if ( strcmp( crypt( authpass, prevcryp ), prevcryp ) == 0 )
+crypt_result = crypt( authpass, prevcryp );
+if ( ! crypt_result )
+return -1;
+   if ( strcmp( crypt_result, prevcryp ) == 0 )
{
/* Ok! */
httpd_realloc_str(
@@ -1121,7 +1125,10 @@ auth_check2( httpd_conn* hc, char* dirna
/* Yes. */
(void) fclose( fp );
/* So is the password right? */
-   if ( strcmp( crypt( authpass, cryp ), cryp ) == 0 )
+crypt_result = crypt( authpass, cryp );
+if ( ! crypt_result )
+return -1;
+   if ( strcmp( crypt_result, cryp ) == 0 )
{
/* Ok! */
httpd_realloc_str(
Index: thttpd-2.25b/extras/htpasswd.c
===
--- thttpd-2.25b.orig/extras/htpasswd.c 2013-03-04 18:01:55.22673 +0100
+++ thttpd-2.25b/extras/htpasswd.c  2013-03-04 18:02:15.755306445 +0100
@@ -133,7 +133,10 @@ add_password( char* user, FILE* f )
 (void) srandom( (int) time( (time_t*) 0 ) );
 to64( &salt[0], random(), 2 );
 cpw = crypt( pw, salt );
-(void) fprintf( f, "%s:%s\n", user, cpw );
+if (cpw)
+(void) fprintf( f, "%s:%s\n", user, cpw );
+else
+(void) fprintf( stderr, "crypt() returned NULL, sorry\n" );
 }
 
 static void usage(void) {
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2012-11-02 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2012-11-02 17:43:29

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.changes2012-06-12 
22:10:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2012-11-02 
17:43:30.0 +0100
@@ -1,0 +2,5 @@
+Wed Oct 24 21:20:29 UTC 2012 - s...@ammler.ch
+
+- use different versions of automake (SLE)
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.XWx5Ip/_old  2012-11-02 17:43:33.0 +0100
+++ /var/tmp/diff_new_pack.XWx5Ip/_new  2012-11-02 17:43:33.0 +0100
@@ -77,7 +77,7 @@
 %patch12
 
 %build
-cp /usr/share/automake-1.11/config.* . ||  cp 
/usr/share/automake-1.12/config.* .
+cp /usr/share/automake-1.*/config.* . 
 # update server root path
 sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
 sed -i "s@__PREFIX__@%{_prefix}@g;\

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2012-06-12 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2012-06-12 21:59:58

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.changes2012-06-01 
07:24:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2012-06-12 
22:10:40.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun  8 14:29:40 UTC 2012 - vci...@suse.com
+
+- use %set_permissions instead of %run_permissions (bnc#764110)
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.jGLUvq/_old  2012-06-12 22:10:42.0 +0200
+++ /var/tmp/diff_new_pack.jGLUvq/_new  2012-06-12 22:10:42.0 +0200
@@ -117,7 +117,12 @@
 
 %post
 %{fillup_and_insserv thttpd}
+%if 0%{?suse_version} <= 1130
 %run_permissions
+%else
+%set_permissions /usr/bin/makeweb
+%endif
+
 %verifyscript
 %verify_permissions -e /usr/bin/makeweb
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2012-05-31 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2012-06-01 07:24:38

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.changes2012-04-17 
07:50:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2012-06-01 
07:24:41.0 +0200
@@ -1,0 +2,5 @@
+Tue May 29 14:06:26 UTC 2012 - pu...@suse.com
+
+- fix build with automake 1.12 
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.oXjPoy/_old  2012-06-01 07:24:42.0 +0200
+++ /var/tmp/diff_new_pack.oXjPoy/_new  2012-06-01 07:24:42.0 +0200
@@ -41,7 +41,8 @@
 Summary:Small and very simple webserver
 License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
-BuildRequires:  libtool automake
+BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle
@@ -76,7 +77,7 @@
 %patch12
 
 %build
-cp /usr/share/automake-1.11/config.* .
+cp /usr/share/automake-1.11/config.* . ||  cp 
/usr/share/automake-1.12/config.* .
 # update server root path
 sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
 sed -i "s@__PREFIX__@%{_prefix}@g;\

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2012-04-16 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2012-04-17 07:50:08

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.changes2012-03-13 
09:40:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2012-04-17 
07:50:09.0 +0200
@@ -1,0 +2,6 @@
+Thu Mar 22 09:33:49 UTC 2012 - dval...@suse.com
+
+- drop thttpd-2.25b-x86_64_machine_not_recognized.patch but copy
+  config.guess from automake to fix ppc64 as well 
+
+---

Old:

  thttpd-2.25b-x86_64_machine_not_recognized.patch



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.HiGJs3/_old  2012-04-17 07:50:10.0 +0200
+++ /var/tmp/diff_new_pack.HiGJs3/_new  2012-04-17 07:50:10.0 +0200
@@ -36,13 +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
+BuildRequires:  libtool automake
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle
@@ -75,9 +74,9 @@
 %patch10
 %patch11
 %patch12
-%patch13 -p1
 
 %build
+cp /usr/share/automake-1.11/config.* .
 # update server root path
 sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
 sed -i "s@__PREFIX__@%{_prefix}@g;\

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2012-03-13 Thread h_root 
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.changes2011-11-25 
10:21:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2012-03-13 
09:40:03.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.oxYYke/_new  2012-03-13 09:40:05.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.oxYYke/_new  2012-03-13 09:40:05.0 +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.orig2012-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.sub1998-05-09 03:12:58.0 +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-comm

commit thttpd for openSUSE:Factory

2011-12-06 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2011-12-06 19:08:23

Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
 and  /work/SRC/openSUSE:Factory/.thttpd.new (New)


Package is "thttpd", Maintainer is "vci...@suse.com"

Changes:




Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.RfKCaa/_old  2011-12-06 19:42:40.0 +0100
+++ /var/tmp/diff_new_pack.RfKCaa/_new  2011-12-06 19:42:40.0 +0100
@@ -18,7 +18,7 @@
 
 
 Name:   thttpd
-License:BSD 3-Clause
+License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
 Provides:   http_daemon 
 PreReq: %fillup_prereq %insserv_prereq permissions

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit thttpd for openSUSE:Factory

2011-11-25 Thread h_root 
Hello community,

here is the log from the commit of package thttpd for openSUSE:Factory checked 
in at 2011-11-25 11:21:27

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.changes2011-09-23 
12:48:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes   2011-11-25 
10:21:56.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov 23 09:32:34 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---



Other differences:
--
++ thttpd.spec ++
--- /var/tmp/diff_new_pack.6eqSk7/_old  2011-11-25 10:21:58.0 +0100
+++ /var/tmp/diff_new_pack.6eqSk7/_new  2011-11-25 10:21:58.0 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package thttpd (Version 2.25b)
+# spec file for package thttpd
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -22,7 +22,6 @@
 Group:  Productivity/Networking/Web/Servers
 Provides:   http_daemon 
 PreReq: %fillup_prereq %insserv_prereq permissions
-AutoReqProv:on
 Version:2.25b
 Release:173
 Source: %{name}-%{version}.tar.bz2
@@ -43,6 +42,7 @@
 Url:http://www.acme.com/software/thttpd/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:Small and very simple webserver
+BuildRequires:  libtool
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org