rpms/tclhttpd/FC-4 tclhttpd-md5-3.5.1.patch, NONE, 1.1 tclhttpd.spec, 1.4, 1.5
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Mon Apr 24 23:00:46 UTC 2006
Author: wart
Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26717
Modified Files:
tclhttpd.spec
Added Files:
tclhttpd-md5-3.5.1.patch
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't create the tclhttpd home directory when adding the user.
- Added patch for utils.tcl to prevent error due to missing md5 function.
- Don't delete the tclhttpd user when uninstalling
tclhttpd-md5-3.5.1.patch:
--- NEW FILE tclhttpd-md5-3.5.1.patch ---
Index: lib/utils.tcl
===================================================================
RCS file: /cvsroot/tclhttpd/tclhttpd/lib/utils.tcl,v
retrieving revision 1.10
retrieving revision 1.14
diff -c -r1.10 -r1.14
*** lib/utils.tcl 27 May 2004 01:25:19 -0000 1.10
--- lib/utils.tcl 22 Oct 2004 03:43:06 -0000 1.14
***************
*** 4,13 ****
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
! # RCS: @(#) $Id: utils.tcl,v 1.10 2004/05/27 01:25:19 coldstore Exp $
package provide httpd::utils 1.0
# Stderr - print to standard error
proc Stderr {string} {
--- 4,15 ----
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
! # RCS: @(#) $Id: utils.tcl,v 1.14 2004/10/22 03:43:06 coldstore Exp $
package provide httpd::utils 1.0
+ package require httpd::log ;# Log_SetFile
+
# Stderr - print to standard error
proc Stderr {string} {
***************
*** 24,30 ****
proc lappendOnce {listName value} {
upvar $listName list
! if ![info exists list] {
lappend list $value
} else {
set ix [lsearch $list $value]
--- 26,32 ----
proc lappendOnce {listName value} {
upvar $listName list
! if {![info exists list]} {
lappend list $value
} else {
set ix [lsearch $list $value]
***************
*** 106,112 ****
proc ldelete {varList value} {
upvar $varList list
! if ![info exist list] {
return 0
}
set ix [lsearch $list $value]
--- 108,114 ----
proc ldelete {varList value} {
upvar $varList list
! if {![info exist list]} {
return 0
}
set ix [lsearch $list $value]
***************
*** 310,316 ****
foreach name [array names a $pat] {
setmax max [string length $name]
}
! if ![info exists max] {
return {}
}
incr max [string length $aname]
--- 312,318 ----
foreach name [array names a $pat] {
setmax max [string length $name]
}
! if {![info exists max]} {
return {}
}
incr max [string length $aname]
***************
*** 415,421 ****
set hit 0
for {set c $limit} {$c >= 0} {incr c -1} {
set char [string index $line $c]
! if [regexp \[\ \t\n>/\] $char] {
set hit 1
break
}
--- 417,423 ----
set hit 0
for {set c $limit} {$c >= 0} {incr c -1} {
set char [string index $line $c]
! if {[regexp \[\ \t\n>/\] $char]} {
set hit 1
break
}
***************
*** 606,619 ****
proc K {a b} {set a}
proc lambda {argl body} {K [info level 0] [proc [info level 0] $argl $body]}
- # Tcllib 1.6 has inconsistencies with md5 1.4.3 and 2.0.0,
- # and requiring 1.0 cures later conflicts with 2.0
- # we run with whatever version is available
- # by making an aliased wrapper
- if {[package vcompare [package present md5] 2.0] > -1} {
- # we have md5 v2 - it needs to be told to return hex
- interp alias {} md5hex {} ::md5::md5 --hex --
- } else {
- # we have md5 v1 - it returns hex anyway
- interp alias {} md5hex {} ::md5::md5
- }
--- 608,610 ----
Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclhttpd.spec 27 Jan 2006 19:36:38 -0000 1.4
+++ tclhttpd.spec 24 Apr 2006 23:00:46 -0000 1.5
@@ -1,7 +1,7 @@
%define contentdir %_var/www/tclhttpd
Name: tclhttpd
Version: 3.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Extensible Web+Application server written in Tcl
Group: System Environment/Daemons
@@ -9,6 +9,7 @@
URL: http://tclhttpd.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
Patch0: tclhttpd_fedora.1.patch
+Patch1: tclhttpd-md5-3.5.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel
@@ -25,7 +26,8 @@
%prep
%setup -q -n %{name}%{version}
-%patch -p1
+%patch0 -p1
+%patch1
%build
%configure --with-serverroot=%{contentdir}
@@ -61,6 +63,10 @@
# It can be turned on manually if needed.
sed -e 's/Config uid.*/Config uid tclhttpd/' \
-e 's/Config gid.*/Config gid tclhttpd/' \
+ -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+ -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+ -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+ -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
-e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
-e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -90,7 +96,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
@@ -104,9 +110,7 @@
%postun
-if [ "$1" = "0" ]; then
- /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
/sbin/service tclhttpd restart >/dev/null 2>&1
fi
@@ -131,32 +135,46 @@
%ghost %{_var}/run/tclhttpd/tclhttpd.pid
%changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-9
+- Change default paths to ssl files to match Fedora default locations.
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch for utils.tcl to prevent error due to missing md5 function.
+- Don't delete the tclhttpd user when uninstalling
+
* 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.
@@ -164,13 +182,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
@@ -178,15 +199,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 scm-commits
mailing list