* keep using the deprecated function sigset * patch borrowed from fedora rpm - Use %patch -P N instead of deprecated %patchN. - Added hardening to systemd service(s) (bsc#1181400). Modified: * thttpd.service - Allow regular users to execute makeweb (bsc#1171580) * Set permissions to 2751 - BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to shortcut through the -mini flavors. - 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 - Trim filler wording from description. - Require group www (bsc#1057985) - 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 - added Conflicts: apache2-example-pages * both packages provide /srv/www/htdocs/index.html - build with pie and full relro - package cleanup (bnc#899218) * removed SUSE branding * added logrotate support * changed note about default codepage - added Conflicts: apache2-utils * both packages provide /usr/bin/htpasswd * see comments in https://build.opensuse.org/request/show/310178 - use /usr/sbin path in service to fix start (bnc#906696) - drop thttpd-2.25b.tar.bz2 (old tarball) - 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 - Use systemd instead of sysvinit in openSUSE > 12.2 - fix CVE-2013-0348 (bnc#853381) * don't create a world readable logfile - DO not add sample index.html that will conflict with apache - added checks for crypt() return value (CVE-2012-5640) (bnc#783165) * thttpd-2.25b-CVE-2012-5640-check_crypt_return_value.patch - use different versions of automake (SLE) - use %set_permissions instead of %run_permissions (bnc#764110) - fix build with automake 1.12 - drop thttpd-2.25b-x86_64_machine_not_recognized.patch but copy config.guess from automake to fix ppc64 as well - fixed build and added -fpie for makeweb - add libtool as buildrequire to avoid implicit dependency - rename getline to my_getline to avoid collision with function from glibc - add new branding (bnc#492693) - fixed another syntax error in config file - fix syntax error in config file - use %config(noreplace) for /etc/thttpd.conf - added Short-Description tag into init script - added config file (/etc/thttpd.conf) - Adding check for zero length - from Marcus Meissner - zerolen.patch - Replacing strcpy with memmove when they overlap - strcpy.patch - Both from #230776 - Fix building as non-root. - fix buffer overflows in htpasswd (#156978) - converted neededforbuild to BuildRequires - fix tmp race in syslogtocern (#131056) - use %config(noreplace) for index.html - compile dynamic binaries instead of static - compile htpasswd with -pie - do not conflict with other webservers (bug #71742) - update to version 2.25b - Fix use of aclocal. - 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 - added macros %stop_on_removal and %restart_on_update [bug #29022] - remove unpackaged files from buildroot - fixed permissions of the init scipt [bug #25084] - substitute correct servroot during built - use /srv/www rather then /usr/local/httpd [bug #20802] - adapt server root - Change group from wwwadmin to www - do not source rc.config anymore - update to version 2.23beta1 - update to version 2.20c - added thttpd-2.20c-sec.patch - removed START_THTTPD from README.SuSE - removed START_THTTPD - fix version on template webpage - fix /etc/init.d in thttpd-SuSE.tar.bz2 files - split patches on configure, dirs, time_h and newautoconf - fix for new autoconf - changed initscript according to skeleton - compiled with RPM_OPT_FLAGS - fixed to compile - generatig of default page moved to %install (it was in %post and - caused [#4566] - default cgibin pattern changed [#4564] - rcthttpd link added - new version: 2.20b - moved init-script - fix ugly bug in startup scripts - new version: 2.20 - fix bug in startup script - new version: 2.19 - buildroot fixed - buildroot added - update to 2.16 - moved man pages to %{_mandir} - new version: 2.15 - bug #1268 rc.config variable set to no - new version: 2.11 - new conflicts (roxen, apache, aolserv), provides (http_daemon) - new homepage - Fix stack overflow - ran old prepare_spec on spec file to switch to new prepare_spec. - fixed call of Check at the end of %install section - new package: thttpd (a _small_ webserver) absolutely no configuration needed - and yet save (chroot)! OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=51
107 lines
3.8 KiB
Diff
107 lines
3.8 KiB
Diff
Index: config.h
|
|
===================================================================
|
|
--- config.h.orig 2014-09-03 09:38:25.650677391 +0200
|
|
+++ config.h 2014-09-03 09:38:50.657956674 +0200
|
|
@@ -57,17 +57,7 @@
|
|
** as a security measure that's how you do it, just don't define any
|
|
** pattern here and don't run with the -c flag.
|
|
*/
|
|
-#ifdef notdef
|
|
-/* Some sample patterns. Allow programs only in one central directory: */
|
|
-#define CGI_PATTERN "/cgi-bin/*"
|
|
-/* Allow programs in a central directory, or anywhere in a trusted
|
|
-** user's tree: */
|
|
-#define CGI_PATTERN "/cgi-bin/*|/jef/**"
|
|
-/* Allow any program ending with a .cgi: */
|
|
-#define CGI_PATTERN "**.cgi"
|
|
-/* When virtual hosting, enable the central directory on every host: */
|
|
-#define CGI_PATTERN "/*/cgi-bin/*"
|
|
-#endif
|
|
+#define CGI_PATTERN "/cgi-bin/*|**.cgi"
|
|
|
|
/* CONFIGURE: How many seconds to allow CGI programs to run before killing
|
|
** them. This is in case someone writes a CGI program that goes into an
|
|
@@ -75,7 +65,7 @@
|
|
** or whatever. If you don't want any limit, comment this out, but that's
|
|
** probably a really bad idea.
|
|
*/
|
|
-#define CGI_TIMELIMIT 30
|
|
+#define CGI_TIMELIMIT 60
|
|
|
|
/* CONFIGURE: Maximum number of simultaneous CGI programs allowed.
|
|
** If this many are already running, then attempts to run more will
|
|
@@ -123,8 +113,8 @@
|
|
** You can also leave both options undefined, and thttpd will not do
|
|
** anything special about tildes. Enabling both options is an error.
|
|
*/
|
|
-#ifdef notdef
|
|
#define TILDE_MAP_1 "users"
|
|
+#ifdef notdef
|
|
#define TILDE_MAP_2 "public_html"
|
|
#endif
|
|
|
|
@@ -185,9 +175,7 @@
|
|
** measure, to prevent inadvertant exposure by accidentally running without -r.
|
|
** You can still disable it at runtime with the -nor flag.
|
|
*/
|
|
-#ifdef notdef
|
|
#define ALWAYS_CHROOT
|
|
-#endif
|
|
|
|
/* CONFIGURE: Define this if you want to always do virtual hosting, without
|
|
** having to give the -v command line flag. You can still disable it at
|
|
@@ -237,7 +225,7 @@
|
|
** initializing. If this user (or the one specified by the -u flag) does
|
|
** not exist, the program will refuse to run.
|
|
*/
|
|
-#define DEFAULT_USER "nobody"
|
|
+#define DEFAULT_USER "wwwrun"
|
|
|
|
/* CONFIGURE: When started as root, the program can automatically chdir()
|
|
** to the home directory of the user specified by -u or DEFAULT_USER.
|
|
@@ -276,7 +264,7 @@
|
|
|
|
/* CONFIGURE: $PATH to use for CGI programs.
|
|
*/
|
|
-#define CGI_PATH "/usr/local/bin:/usr/ucb:/bin:/usr/bin"
|
|
+#define CGI_PATH "/bin:/usr/bin"
|
|
|
|
/* CONFIGURE: If defined, $LD_LIBRARY_PATH to use for CGI programs.
|
|
*/
|
|
@@ -327,7 +315,7 @@
|
|
/* CONFIGURE: A list of index filenames to check. The files are searched
|
|
** for in this order.
|
|
*/
|
|
-#define INDEX_NAMES "index.html", "index.htm", "index.xhtml", "index.xht", "Default.htm", "index.cgi"
|
|
+#define INDEX_NAMES "index.html", "index.htm", "index.xhtml", "index.xht", "index.cgi"
|
|
|
|
/* CONFIGURE: If this is defined then thttpd will automatically generate
|
|
** index pages for directories that don't have an explicit index file.
|
|
Index: configure.in
|
|
===================================================================
|
|
--- configure.in.orig 2014-09-03 09:38:25.651677402 +0200
|
|
+++ configure.in 2014-09-03 09:38:50.657956674 +0200
|
|
@@ -6,8 +6,10 @@ AC_CANONICAL_SYSTEM
|
|
|
|
AC_PROG_CC
|
|
|
|
-V_CCOPT="-O"
|
|
-if test "$GCC" = yes ; then
|
|
+if test "x$V_CCOPT" = "x"; then
|
|
+ V_CCOPT="-O"
|
|
+
|
|
+ if test "$GCC" = yes ; then
|
|
AC_MSG_CHECKING(gcc version)
|
|
AC_CACHE_VAL(ac_cv_lbl_gcc_vers,
|
|
ac_cv_lbl_gcc_vers=`$CC -dumpversion 2>&1 | \
|
|
@@ -16,7 +18,8 @@ if test "$GCC" = yes ; then
|
|
if test "$ac_cv_lbl_gcc_vers" -gt 1 ; then
|
|
V_CCOPT="-O2"
|
|
fi
|
|
-fi
|
|
+ fi
|
|
+fi
|
|
if test -f .devel ; then
|
|
V_CCOPT="-g $V_CCOPT -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long"
|
|
fi
|