diff --git a/thttpd-c99.patch b/thttpd-c99.patch new file mode 100644 index 0000000..1368e6b --- /dev/null +++ b/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 + #endif /* HAVE_MEMORY_H */ + #include ++ + #include ++/* Not available with glibc default feature test macros. Kludge to ++ avoid extensive changes. */ ++extern __typeof (signal) sigset; ++ + #include + #include + #include +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 + #endif ++ + #include ++/* Not available with glibc default feature test macros. Kludge to ++ avoid extensive changes. */ ++extern __typeof (signal) sigset; ++ + #include + #include + #include diff --git a/thttpd.changes b/thttpd.changes index f75eaac..143e60e 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 3 20:19:55 UTC 2024 - Giacomo Comes + +- 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 diff --git a/thttpd.spec b/thttpd.spec index 73cba18..dea1314 100644 --- a/thttpd.spec +++ b/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