rpms/tclhttpd/FC-5 tclhttpd-3.5.1-nofork.patch, NONE, 1.1 tclhttpd.spec, 1.5, 1.6
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Sun Apr 2 20:12:42 UTC 2006
Author: wart
Update of /cvs/extras/rpms/tclhttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3564
Modified Files:
tclhttpd.spec
Added Files:
tclhttpd-3.5.1-nofork.patch
Log Message:
- Don't create the tclhttpd home directory when adding the user.
- Added patch to disable [fork] if we're running in a threaded Tcl.
- Add newlines to make the ChangeLog more readable.
tclhttpd-3.5.1-nofork.patch:
--- NEW FILE tclhttpd-3.5.1-nofork.patch ---
diff -Naur tclhttpd3.5.1/bin/httpd.tcl tclhttpd3.5.1.new/bin/httpd.tcl
--- tclhttpd3.5.1/bin/httpd.tcl 2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/httpd.tcl 2006-04-02 12:57:50.000000000 -0700
@@ -342,6 +342,11 @@
# Fork a child process if expect is present.
if {$Config(daemon)} {
+ if {[info exists tcl_platform(threaded)] && $tcl_platform(threaded) == 1} {
+ Stderr "Can't fork with a threaded interpreter. Please run without the -daemon flag."
+ exit 1
+ }
+
if {![catch {package require Expect}] || ![catch {package require Tclx}]} {
if {[fork]} {
exit
diff -Naur tclhttpd3.5.1/bin/redhat.init.tclhttpd tclhttpd3.5.1.new/bin/redhat.init.tclhttpd
--- tclhttpd3.5.1/bin/redhat.init.tclhttpd 2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/redhat.init.tclhttpd 2006-04-02 12:58:23.000000000 -0700
@@ -142,7 +142,7 @@
'start')
echo -n $"Starting $prog: "
ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
- daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
+ daemon $prog -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom 2>1 >> /var/log/tclhttpd/startup.log &
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd
Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclhttpd.spec 21 Feb 2006 17:32:00 -0000 1.5
+++ tclhttpd.spec 2 Apr 2006 20:12:42 -0000 1.6
@@ -1,7 +1,7 @@
%define contentdir %_var/www/tclhttpd
Name: tclhttpd
Version: 3.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Extensible Web+Application server written in Tcl
Group: System Environment/Daemons
@@ -10,6 +10,7 @@
Source0: http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
Patch0: tclhttpd_fedora.1.patch
Patch1: tclhttpd-md5-3.5.1.patch
+Patch2: tclhttpd-3.5.1-nofork.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel
@@ -28,16 +29,15 @@
%setup -q -n %{name}%{version}
%patch0 -p1
%patch1
+%patch2 -p1
%build
%configure --with-serverroot=%{contentdir}
-#make limit_LIB_FILE=liblimit.so crypt_LIB_FILE=libcrypt.so %{?_smp_mflags}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-# Override the names of the library files so that rpm does not try to think
-# that this is a library package.
+
make install DESTDIR=$RPM_BUILD_ROOT
install -p -D bin/redhat.init.tclhttpd $RPM_BUILD_ROOT/%{_initrddir}/tclhttpd
mkdir -p $RPM_BUILD_ROOT%_var/run/tclhttpd
@@ -92,7 +92,7 @@
# server as "root" or "nobody".
user_uid=`id -u tclhttpd 2>/dev/null`
if [ x"$user_uid" = x ] ; then
- /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+ /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
fi
%post
@@ -133,36 +133,51 @@
%ghost %{_var}/run/tclhttpd/tclhttpd.pid
%changelog
+* Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch to disable [fork] if we're running in a threaded Tcl.
+- Add newlines to make the ChangeLog more readable.
+
* Tue Feb 21 2006 Wart <wart at kobold.org> - 3.5.1-10
- Rebuild for FC5
+
* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-9
- Added patch for utils.tcl to prevent error due to missing md5 function.
+
* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
- Updated patch so that tclhttpd starts as root and then switches to
the tclhttpd user. This is necessary if tclhttpd is to listen
on port 80.
+
* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
- Check if the tclhttpd user exists before trying to create it
+
* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
- Use ghosted files for runtime state files.
- Update patch to remove build dependency on autoconf.
+
* Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
- Move bin/httpdthread.tcl out of the bin directory.
+
* Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
- Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
- Added BuildRequires: autoconf.
- Clean up file permissions to remove many rpmlint warnings.
+
* Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
- Add 'restart' in the rpm postun stage. Add post/preun requirements
for /sbin/chkconfig and /sbin/service.
- Changed the default runlevel in the init script to '-' to prevent the
service from being started by default.
+
* Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
- Updated release tag to include %{dist}
- Don't include changes to the spec in the patchfile.
- run autoreconf in the prep stage, not the build stage.
+
* Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
- Updated spec file to conform to Fedora Core 4 standards.
+
* Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
- Change content directory again to prevent rpmlint warnings.
- Change ownership of content directory to prevent rpmlint warnings.
@@ -170,13 +185,16 @@
- Move crypt and limit dynamically loadable modules into the proper
subdirectories
- Turn off potentially insecure debug url.
+
* Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
- Change content directory to /var/tclhttpd
- Move logs to /var/log/tclhttpd
- Remove the debug auth password.
+
* Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
- Add missing #include <crypt.h> to crypt.c to fix a segfault on
x86_64.
+
* Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
- Add expect to the dependency list.
- Let tclhttpd fork into the background if either one of tclx
@@ -184,15 +202,19 @@
- Add existing docs to %doc list.
- Move configuration file to /etc/tclhttpd.
- Clean up some rpmlint warnings
+
* Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
- Change package group in the specfile. Add tcllib to dependency list.
Remove tclhttpd user during uninstall.
+
* Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
- Fix bug in the /etc/init.d/tclhttpd startup script that was causing
it to kill a random tclsh process during shutdown, and misreporting
the status of tclhttpd.
+
* Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
- remove hardcoded path in the %build section of the rpm spec file.
+
* Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
- Initial rpm with a Fedora-compatible spec file. Included patch
for better /etc/init.d script behaviour.
More information about the fedora-extras-commits
mailing list