Accepting request 1228571 from server:http

OBS-URL: https://build.opensuse.org/request/show/1228571
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/thttpd?expand=0&rev=45

thttpd-c99.patch

@@ -0,0 +1,34 @@
+diff --git a/libhttpd.c b/libhttpd.c
+index 6a985f8601d0ccfc..7c3ae74d0cda56d1 100644
+--- a/libhttpd.c
++++ b/libhttpd.c
+@@ -47,7 +47,12 @@
+ #include <memory.h>
+ #endif /* HAVE_MEMORY_H */
+ #include <pwd.h>
++
+ #include <signal.h>
++/* Not available with glibc default feature test macros.  Kludge to
++   avoid extensive changes.  */
++extern __typeof (signal) sigset;
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/thttpd.c b/thttpd.c
+index bfb57bacd955cd1b..25ad5d4cd47dc094 100644
+--- a/thttpd.c
++++ b/thttpd.c
+@@ -44,7 +44,12 @@
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+ #endif
++
+ #include <signal.h>
++/* Not available with glibc default feature test macros.  Kludge to
++   avoid extensive changes.  */
++extern __typeof (signal) sigset;
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

thttpd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec  3 20:19:55 UTC 2024 - Giacomo Comes <gcomes.obs@gmail.com>
+
+- added thttpd-c99.patch
+  * keep using the deprecated function sigset
+  * patch borrowed from fedora rpm
+
 -------------------------------------------------------------------
 Mon Feb 26 14:42:02 UTC 2024 - pgajdos@suse.com
 

thttpd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package thttpd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -49,6 +49,8 @@ Patch10:        %{name}-2.25b-zerolen.patch
 Patch13:        thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch
 Patch14:        thttpd-CVE-2013-0348.patch
 Patch15:        thttpd-crypt_is_in_crypt.h.patch
+# PATCH-FIX-SUSE keep using deprecated function sigset
+Patch16:        thttpd-c99.patch
 BuildRequires:  automake
 BuildRequires:  libtool
 Requires(post): permissions
@@ -91,6 +93,7 @@ traffic.
 %patch -P 13 -p1
 %patch -P 14 -p1
 %patch -P 15 -p1
+%patch -P 16 -p1
 
 %build
 cp %{_datadir}/automake-1.*/config.* .
@@ -156,6 +159,8 @@ ln -s %{buildroot}%{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
 
 %files
 %doc README config.h
+%dir %{serverroot}
+%dir %{serverroot}/htdocs
 %{serverroot}/htdocs/*
 %attr(775, root, www) %{serverroot}/htdocs/users
 %verify(not mode) %attr(2751, root, www) %{_bindir}/makeweb