July 2007 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-drbd
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package yast2-drbd checked in at Mon Jul 30 22:06:10 CEST 2007. -------- --- yast2-drbd/yast2-drbd.changes 2007-07-23 11:38:36.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-drbd/yast2-drbd.changes 2007-07-30 13:38:18.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 13:36:28 CEST 2007 - cmeng(a)novell.com + +- fix bug-295546: resource config get deleted +- refix bug-291766: check also iseries64 and ppc64 + +------------------------------------------------------------------- New: ---- bug-295546_res-conf-deleted.pathch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.H17590/_old 2007-07-30 22:03:48.000000000 +0200 +++ /var/tmp/diff_new_pack.H17590/_new 2007-07-30 22:03:48.000000000 +0200 @@ -13,7 +13,7 @@ Name: yast2-drbd URL: http://en.opensuse.org/YaST Version: 2.13.1 -Release: 7 +Release: 12 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -24,8 +24,9 @@ Patch3: bug-291778_create-conf.patch Patch4: bug-291785_def_val_protocol.patch Patch5: bug-291771_err_msg.patch +Patch6: bug-295546_res-conf-deleted.pathch prefix: /usr -BuildRequires: perl-XML-Writer ruby-racc update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer ruby ruby-racc update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 BuildArchitectures: noarch Summary: YaST2 - DRBD Configuration @@ -49,6 +50,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %{prefix}/bin/y2tool y2autoconf @@ -89,6 +91,9 @@ %doc %{prefix}/share/doc/packages/yast2-drbd %changelog +* Mon Jul 30 2007 - cmeng(a)novell.com +- fix bug-295546: resource config get deleted +- refix bug-291766: check also iseries64 and ppc64 * Mon Jul 23 2007 - cmeng(a)novell.com - fix bug-291766: yast-drbd doesn't install drbd-kmp-<arch> pack - fix bug-291778: yast-drbd recreate drbd.conf while it doesn't exist ++++++ bug-291766_install-kmp.patch ++++++ --- /var/tmp/diff_new_pack.H17590/_old 2007-07-30 22:03:48.000000000 +0200 +++ /var/tmp/diff_new_pack.H17590/_new 2007-07-30 22:03:48.000000000 +0200 @@ -7,7 +7,7 @@ // check installed packages - if (!Mode::test() && !PackageSystem::CheckAndInstallPackagesInteractive(["drbd"])) + // find out which krbd-kmp-<arch> to be installed -+ map out = (map) SCR::Execute(.target.bash_output, "echo -n `uname -r|grep -Eo \"default|smp|bigsmp|xen|xenpae|debug\"`"); ++ map out = (map) SCR::Execute(.target.bash_output, "echo -n `uname -r|grep -Eo \"default|smp|bigsmp|xen|xenpae|debug|ppc64|iseries64\"`"); + string krbd_kmp_arch= out["stdout"]:"default"; + + if (!Mode::test() && !PackageSystem::CheckAndInstallPackagesInteractive(["drbd", "drbd-kmp-" + krbd_kmp_arch])) ++++++ bug-291778_create-conf.patch ++++++ --- /var/tmp/diff_new_pack.H17590/_old 2007-07-30 22:03:49.000000000 +0200 +++ /var/tmp/diff_new_pack.H17590/_new 2007-07-30 22:03:49.000000000 +0200 @@ -1,15 +1,16 @@ -diff -ru yast2-drbd-2.13.1.ori/agents/ag_drbd yast2-drbd-2.13.1/agents/ag_drbd ---- yast2-drbd-2.13.1.ori/agents/ag_drbd 2007-04-17 00:35:22.000000000 +0800 -+++ yast2-drbd-2.13.1/agents/ag_drbd 2007-07-19 13:19:36.000000000 +0800 -@@ -820,6 +820,11 @@ +diff -Nru yast2-drbd-2.13.1.ori/agents/drbd.rb.yy yast2-drbd-2.13.1/agents/drbd.rb.yy +--- yast2-drbd-2.13.1.ori/agents/drbd.rb.yy 2007-07-30 14:58:26.000000000 +0800 ++++ yast2-drbd-2.13.1/agents/drbd.rb.yy 2007-07-31 00:16:05.000000000 +0800 +@@ -198,6 +198,12 @@ $configstr = "" in_skip = false +if !File.exist?($drbdcfg) -+ file = File.open($drbdcfg, "w") ++ file = File.open($drbdcfg, "w") + file.close +end + ++ File.open($drbdcfg, "r") do |file| file.each_line do |line| line = line.gsub(/#.*$/, '').chomp ++++++ bug-295546_res-conf-deleted.pathch ++++++ diff -Nru yast2-drbd-2.13.1.ori/src/Drbd.ycp yast2-drbd-2.13.1/src/Drbd.ycp --- yast2-drbd-2.13.1.ori/src/Drbd.ycp 2007-07-30 14:58:26.000000000 +0800 +++ yast2-drbd-2.13.1/src/Drbd.ycp 2007-07-30 16:58:45.000000000 +0800 @@ -193,6 +193,26 @@ } +map del_empty_item(map old_map) +{ + map new_map = old_map; + foreach (string key, any val, (map<string, any>) old_map, + { + if (is(val, map)) + { + new_map[key] = del_empty_item((map)val); + } else //if (is(val, string)) + { + if (size((string)val) == 0) + new_map[key] = nil; + //new_map = remove(new_map, key); + } + }); + + return new_map; +} + + global boolean Write() { /* DRBD write dialog caption */ string caption = _("Writing DRBD Configuration"); @@ -229,6 +249,7 @@ //resource config here Progress::NextStage(); + resource_config = del_empty_item(resource_config); recursive_write_map(.drbd.resources, (map<string, any>)resource_config); y2debug("to write resource config: resource_config=%1", resource_config); diff -Nru yast2-drbd-2.13.1.ori/src/resource_conf.ycp yast2-drbd-2.13.1/src/resource_conf.ycp --- yast2-drbd-2.13.1.ori/src/resource_conf.ycp 2007-07-30 14:58:26.000000000 +0800 +++ yast2-drbd-2.13.1/src/resource_conf.ycp 2007-07-31 00:08:51.000000000 +0800 @@ -157,6 +157,9 @@ map<string, any> save_basic_config(map<string, any> res_config) { + if (UI::QueryWidget(`id(`resname), `Value) == nil) + return res_config; + res_config["resname"] = (string) UI::QueryWidget(`id(`resname), `Value); res_config["on"] = $[ (string) UI::QueryWidget(`id(`n1_name), `Value) : $[ @@ -241,8 +244,18 @@ map<string, any> save_advance_config(map<string, any> res_config) { + if (UI::QueryWidget(`id(`protocol), `Value) == nil) + { + if (res_config["protocol"]:nil == nil) res_config["protocol"] = "C"; + if (res_config["incon-degr-cmd"]:nil == nil) res_config["incon-degr-cmd"] = "echo '!DRBD! pri on incon-degr' | wall ; sleep 60 ; halt -f"; + if (res_config["disk", "on-io-error"]:nil == nil) res_config["disk"] = $["on-io-error" : "pass_on"]; + if (res_config["net", "on-disconnect"]:nil == nil) res_config["net"] = $["on-disconnect" : "reconnect"]; + return res_config; + } + + res_config["protocol"] = (string) UI::QueryWidget(`id(`protocol), `Value); - res_config["cmd"] = (string) UI::QueryWidget(`id(`cmd), `Value); + res_config["incon-degr-cmd"] = (string) UI::QueryWidget(`id(`cmd), `Value); res_config["startup"] = $[ "wfc-timeout" : (string) UI::QueryWidget(`id(`wfc_timeout), `Value), @@ -267,14 +280,11 @@ res_config["syncer"] = $[ "al-extents" : (string) UI::QueryWidget(`id(`al_extents), `Value), - "group " : (string) UI::QueryWidget(`id(`group), `Value), + "group" : (string) UI::QueryWidget(`id(`group), `Value), "rate" : (string) UI::QueryWidget(`id(`rate), `Value) ]; - if (res_config["protocol"]:nil == nil) res_config["protocol"] = "C"; - if (res_config["disk", "on-io-error"]:nil == nil) res_config["disk", "on-io-error"] = "pass_on"; - if (res_config["net", "on-disconnect"]:nil == nil) res_config["net", "on-disconnect"] = "reconnect"; - + y2debug("ret = %1", res_config); return res_config; } @@ -287,11 +297,10 @@ if (is(val, map)) { new_map[key] = del_empty_item((map)val); - } else //if (is(val, string)) + } else { if (size((string)val) == 0) new_map[key] = nil; - //new_map = remove(new_map, key); } }); @@ -303,7 +312,7 @@ { any ret = nil; symbol cur_page = `basic; - map<string, any> res_config = Drbd::resource_config[resname]:$[]; + map<string, any> res_config = Drbd::resource_config[resname]:$[]; res_config["resname"] = resname; my_SetContents("resource_conf", res_basic_config_get_dialog(res_config)); @@ -313,7 +322,7 @@ while (true) { - Wizard::SelectTreeItem("resource_conf"); + Wizard::SelectTreeItem("resource_conf"); ret = UI::UserInput(); y2debug("in ResDialog(), UserInput ret=%1", ret); @@ -334,8 +343,8 @@ } - if (ret == `advance || (ret == `ok && cur_page == `basic)) - { + if (ret == `advance || (ret == `ok && cur_page == `basic)) + { if ((string)UI::QueryWidget(`id(`n1_name), `Value) == (string)UI::QueryWidget(`id(`n2_name), `Value)) { Popup::Warning("Node names must be different."); @@ -348,7 +357,7 @@ string str = (string) UI::QueryWidget(`id(the_id), `Value); if (str == nil || size(str) == 0) { - Popup::Warning("Pleas fill all the items."); + Popup::Warning("Pleas fill out all the items."); ret = nil; break; } @@ -362,6 +371,7 @@ cur_page = `advance; res_config = save_basic_config(res_config); + y2debug("res_config = %1", res_config); my_SetContents("resource_conf", res_advance_config_get_dialog(res_config)); @@ -398,8 +408,7 @@ res_config = save_basic_config(res_config); res_config = save_advance_config(res_config); - res_config = (map<string, any>) del_empty_item(res_config); - y2debug("del_empty_item(res_config)=%1", res_config); + y2debug("res_config=%1", res_config); if (size(resname) > 0) { //edit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-inetd
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package yast2-inetd checked in at Mon Jul 30 22:03:30 CEST 2007. -------- --- yast2-inetd/yast2-inetd.changes 2007-04-25 15:23:04.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-inetd/yast2-inetd.changes 2007-07-30 17:51:58.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 30 17:51:49 CEST 2007 - locilka(a)suse.cz + +- 2.15.1 + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Old: ---- yast2-inetd-2.15.0.tar.bz2 New: ---- yast2-inetd-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.M16975/_old 2007-07-30 22:03:17.000000000 +0200 +++ /var/tmp/diff_new_pack.M16975/_new 2007-07-30 22:03:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-inetd (Version 2.15.0) +# spec file for package yast2-inetd (Version 2.15.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-inetd -Version: 2.15.0 +Version: 2.15.1 Release: 1 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-inetd-2.15.0.tar.bz2 +Source0: yast2-inetd-2.15.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-users Requires: yast2 >= 2.13.74 @@ -42,7 +42,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-inetd-2.15.0 +%setup -n yast2-inetd-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,10 @@ %doc %{prefix}/share/doc/packages/yast2-inetd %changelog +* Mon Jul 30 2007 - locilka(a)suse.cz +- 2.15.1 +* Fri May 25 2007 - jsrain(a)suse.cz +- removed outdated translations from .desktop-files (#271209) * Wed Apr 25 2007 - locilka(a)suse.cz - Fixing inetd.rnc file (#242148), patch from ug(a)suse.de. - 2.15.0 ++++++ yast2-inetd-2.15.0.tar.bz2 -> yast2-inetd-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.15.0/configure new/yast2-inetd-2.15.1/configure --- old/yast2-inetd-2.15.0/configure 2007-04-25 15:23:32.000000000 +0200 +++ new/yast2-inetd-2.15.1/configure 2007-07-30 17:56:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-inetd 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-inetd 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-inetd' PACKAGE_TARNAME='yast2-inetd' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-inetd 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-inetd 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-inetd 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-inetd 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-inetd 2.15.0:";; + short | recursive ) echo "Configuration of yast2-inetd 2.15.1:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-inetd configure 2.15.0 +yast2-inetd configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-inetd $as_me 2.15.0, which was +It was created by yast2-inetd $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-inetd' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-inetd" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-inetd $as_me 2.15.0, which was +This file was extended by yast2-inetd $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-inetd config.status 2.15.0 +yast2-inetd config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.15.0/configure.in new/yast2-inetd-2.15.1/configure.in --- old/yast2-inetd-2.15.0/configure.in 2007-04-25 15:23:26.000000000 +0200 +++ new/yast2-inetd-2.15.1/configure.in 2007-07-30 17:56:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-inetd dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-inetd, 2.15.0, http://bugs.opensuse.org/, yast2-inetd) +AC_INIT(yast2-inetd, 2.15.1, http://bugs.opensuse.org/, yast2-inetd) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-inetd" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.15.0/src/inetd.desktop new/yast2-inetd-2.15.1/src/inetd.desktop --- old/yast2-inetd-2.15.0/src/inetd.desktop 2006-10-27 13:58:29.000000000 +0200 +++ new/yast2-inetd-2.15.1/src/inetd.desktop 2007-05-30 08:09:37.000000000 +0200 @@ -23,34 +23,4 @@ Name=Network Services (xinetd) GenericName=Configure network services (xinetd) -Name[cs]=Síťové služby (xinetd) -GenericName[cs]=Konfigurovat síťové služby (xinetd) -Name[de]=Netzwerkdienste (xinetd) -GenericName[de]=Netzwerkdienste konfigurieren (xinetd) -Name[es]=Servicios de red (xinetd) -GenericName[es]=Configurar servicios de red (xinetd) -Name[hu]=Hálózati szolgáltatások (xinetd) -GenericName[hu]=Hálózati szolgáltatások beállítása (xinetd) -Name[it]=Servizi di rete (xinetd) -GenericName[it]=Configurazione dei servizi di rete (xinetd) -Name[ko]=네트워크 서비스 (xinetd) -GenericName[ko]=네트워크 서비스들 설정(xinetd) -Name[nl]=Netwerk services (xinetd) -GenericName[nl]=Configureer netwerk services (xinetd) -Name[pt]=Serviços de rede (xinetd) -GenericName[pt]=Configure os serviços de rede (xinetd) -Name[sk]=Sieťové služby (xinetd) -GenericName[sk]=Konfigurácia sieťových služieb (xinetd) -Name[sv]=Nätverkstjänster (xinetd) -GenericName[sv]=Ställ in nätverkstjänster (xinetd) -Name[el]=Υπηρεσίες Δικτύου (xinetd) -GenericName[el]=Ρυθμίστε τις Υπηρεσίες Δικτύου (xinetd) -Name[fr]=Services réseau (xinetd) -GenericName[fr]=Configurer les services réseau (xinetd) -Name[ja]=ネットワーク・サービス (xinetd) -GenericName[ja]=ネットワーク・サービスの設定 (xinetd) -Name[lt]=Tinklo paslaugos (xinetd) -Name[sl]=Mrežne storitve (xinetd) -GenericName[sl]=Nastavi Mrežne Storitve (xinetd) -Name[tr]=Ağ servisleri (xinetd) X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-inetd-2.15.0/VERSION new/yast2-inetd-2.15.1/VERSION --- old/yast2-inetd-2.15.0/VERSION 2007-04-25 15:21:25.000000000 +0200 +++ new/yast2-inetd-2.15.1/VERSION 2007-07-30 17:52:03.000000000 +0200 @@ -1 +1 @@ -2.15.0 +2.15.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-multipath
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package yast2-multipath checked in at Mon Jul 30 22:02:59 CEST 2007. -------- --- yast2-multipath/yast2-multipath.changes 2007-07-26 19:07:15.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-multipath/yast2-multipath.changes 2007-07-30 20:38:57.970263000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 20:38:48 CEST 2007 - coyli(a)suse.de + +- fix #291385 (Unclear multipath status recognition). +- fix #290265, add re-read configuration when start/stop multipath. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-multipath.spec ++++++ --- /var/tmp/diff_new_pack.U14139/_old 2007-07-30 22:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.U14139/_new 2007-07-30 22:02:18.000000000 +0200 @@ -13,7 +13,7 @@ Name: yast2-multipath URL: http://en.opensuse.org/Yast Version: 2.13.0 -Release: 44 +Release: 47 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,6 +73,9 @@ %doc %{prefix}/share/doc/packages/yast2-multipath %changelog +* Mon Jul 30 2007 - coyli(a)suse.de +- fix #291385 (Unclear multipath status recognition). +- fix #290265, add re-read configuration when start/stop multipath. * Thu Jul 26 2007 - coyli(a)suse.de - fix #291431, add input check for adding blacklist and blacklist_exception. - fix #290352, recognize path_grouping_policy and getuid_callout. ++++++ yast2-multipath-2.13.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-multipath-2.13.0/src/complex.ycp new/yast2-multipath-2.13.0/src/complex.ycp --- old/yast2-multipath-2.13.0/src/complex.ycp 2007-07-26 18:26:52.000000000 +0200 +++ new/yast2-multipath-2.13.0/src/complex.ycp 2007-07-30 19:46:15.000000000 +0200 @@ -32,6 +32,8 @@ textdomain "multipath"; +import "Service"; + integer service_status = 0; boolean has_dumbtab = false; const string device_template = "vendor %1; product %2"; @@ -2657,7 +2659,8 @@ void Update_Service_Status() { - integer ret = (integer) SCR::Execute(.target.bash, "/etc/init.d/multipathd status"); + integer ret = Service::Status("multipathd"); +// integer ret = (integer) SCR::Execute(.target.bash, "/etc/init.d/multipathd status"); if (ret == 0) { UI::ChangeWidget(`id(`stop_multipath), `Value, false); UI::ChangeWidget(`id(`start_multipath), `Value, true); @@ -2691,22 +2694,70 @@ void Start_Service() { if (service_status == 1) return; - integer ret = (integer) SCR::Execute(.target.bash, "/etc/init.d/multipathd start"); - if (ret == 0) - service_status = 1; - else - service_status = 0; + string prop_info = _("Use multipath failed:") + "\n"; + + boolean ret = Service::Enable("boot.multipath"); + if (ret == false) + { + prop_info = prop_info + _("* Can not enable boot.multipath") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + ret = Service::Enable("multipathd"); + if (ret == false) + { + prop_info = prop_info + _("* Can not enable multipathd") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + /* do not check result for starting boot.multipath */ + ret = Service::Start("boot.multipath"); + ret = Service::Start("multipathd"); + if (ret == false) + { + prop_info = prop_info + _("* Can not start multipathd") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + service_status = 1; Update_Service_Status(); } void Stop_Service() { if (service_status == 0) return; - integer ret = (integer) SCR::Execute(.target.bash, "/etc/init.d/multipathd stop"); - if (ret == 0) - service_status = 0; - else - service_status = 1; + string prop_info = _("Do not use multipath failed:") + "\n"; + + boolean ret = Service::Stop("multipathd"); + if (ret == false) + { + prop_info = prop_info + _("* Can not stop multipath") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + /* do not check result of stopping boot.multipath */ + ret = Service::Stop("boot.multipath"); + ret = Service::Disable("multipathd"); + if (ret == false) + { + prop_info = prop_info + _("* Can not disable multipathd") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + ret = Service::Disable("boot.multipath"); + if (ret == false) + { + prop_info = prop_info + _("* Can not disable boot.multipath") + "\n"; + Popup::Message(prop_info); + Update_Service_Status(); + return; + } + service_status = 0; Update_Service_Status(); } Files old/yast2-multipath-2.13.0/src/.complex.ycp.swp and new/yast2-multipath-2.13.0/src/.complex.ycp.swp differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-multipath-2.13.0/src/Multipath.ycp new/yast2-multipath-2.13.0/src/Multipath.ycp --- old/yast2-multipath-2.13.0/src/Multipath.ycp 2007-07-16 12:15:18.000000000 +0200 +++ new/yast2-multipath-2.13.0/src/Multipath.ycp 2007-07-30 20:15:27.000000000 +0200 @@ -82,6 +82,53 @@ include "multipath/complex.ycp"; +boolean Read_Configures() +{ + boolean ret = false; + + config_modified = false; + defaults_items = $[]; + devices_items = []; + multipaths_items = []; + blacklist_items = []; + blacklist_exception_items = []; + + + /* prepare for loading built-in configurations */ + SCR::Execute(.target.bash, "/sbin/multipath -t > " + builtin_multipath_conf_path); + + ret = Read_MultipathConfig(); + if(ret == false) { + Report::Error(_("Cannot read multipath section in multipath configuration")); + return false; + } + + ret = Read_DefaultsConfig(); + if(ret == false) { + Report::Error(_("Cannot read defaults section in multipath configuration")); + return false; + } + + ret = Read_BlacklistConfig(); + if(ret == false) { + Report::Error(_("Cannot read blacklist section in multipath configuration")); + return false; + } + + ret = Read_BlacklistException_Config(); + if(ret == false) { + Report::Error(_("Cannot read blacklist_exceptions section in multipath configuration")); + return false; + } + + ret = Read_DeviceConfig(); + if(ret == false) { + Report::Error(_("Cannot read devices section in multipath configuration")); + return false; + } + return true; +} + /** * Read all multipath settings * @return true on success @@ -126,38 +173,9 @@ return false; } - /* prepare for loading built-in configurations */ - SCR::Execute(.target.bash, "/sbin/multipath -t > " + builtin_multipath_conf_path); - - ret = Read_MultipathConfig(); - if(ret == false) { - Report::Error(_("Cannot read multipath section in multipath configuration")); - return false; - } - - ret = Read_DefaultsConfig(); - if(ret == false) { - Report::Error(_("Cannot read defaults section in multipath configuration")); - return false; - } - - ret = Read_BlacklistConfig(); - if(ret == false) { - Report::Error(_("Cannot read blacklist section in multipath configuration")); - return false; - } - - ret = Read_BlacklistException_Config(); - if(ret == false) { - Report::Error(_("Cannot read blacklist_exceptions section in multipath configuration")); - return false; - } - - ret = Read_DeviceConfig(); - if(ret == false) { - Report::Error(_("Cannot read devices section in multipath configuration")); - return false; - } + ret = Read_Configures(); + if (ret == false) + return ret; Progress::NextStage(); sleep(sl); @@ -332,10 +350,24 @@ current_tab = `configure; continue; } else if(ret == `start_multipath) { + if (Modified() == true && + Popup::YesNo(_("Ignore your modification ?")) == false) + { + Update_Service_Status(); + continue; + } Start_Service(); + Read_Configures(); continue; } else if(ret == `stop_multipath) { + if (Modified() == true && + Popup::YesNo(_("Ignore your modification ?")) == false) + { + Update_Service_Status(); + continue; + } Stop_Service(); + Read_Configures(); continue; } else if(ret == `blacklist_config_id) { ret = Blacklist_Dialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-restore
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package yast2-restore checked in at Mon Jul 30 22:01:59 CEST 2007. -------- --- yast2-restore/yast2-restore.changes 2007-03-09 13:46:20.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-restore/yast2-restore.changes 2007-07-30 17:48:29.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 30 17:48:21 CEST 2007 - locilka(a)suse.cz + +- 2.15.2 + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Old: ---- yast2-restore-2.15.1.tar.bz2 New: ---- yast2-restore-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-restore.spec ++++++ --- /var/tmp/diff_new_pack.n13113/_old 2007-07-30 22:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.n13113/_new 2007-07-30 22:01:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-restore (Version 2.15.1) +# spec file for package yast2-restore (Version 2.15.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-restore -Version: 2.15.1 +Version: 2.15.2 Release: 1 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-restore-2.15.1.tar.bz2 +Source0: yast2-restore-2.15.2.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite Requires: aaa_base @@ -39,7 +39,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-restore-2.15.1 +%setup -n yast2-restore-2.15.2 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,10 @@ %doc %{prefix}/share/doc/packages/yast2-restore %changelog +* Mon Jul 30 2007 - locilka(a)suse.cz +- 2.15.2 +* Fri May 25 2007 - jsrain(a)suse.cz +- removed outdated translations from .desktop-files (#271209) * Fri Mar 09 2007 - locilka(a)suse.cz - Adjusted RPM dependencies: yast2-installation is not needed. - 2.15.1 ++++++ yast2-restore-2.15.1.tar.bz2 -> yast2-restore-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.1/configure new/yast2-restore-2.15.2/configure --- old/yast2-restore-2.15.1/configure 2006-12-05 13:41:22.000000000 +0100 +++ new/yast2-restore-2.15.2/configure 2007-07-04 14:00:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-restore 2.15.0. +# Generated by GNU Autoconf 2.60 for yast2-restore 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-restore' PACKAGE_TARNAME='yast2-restore' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-restore 2.15.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-restore 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-restore 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-restore 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-restore 2.15.0:";; + short | recursive ) echo "Configuration of yast2-restore 2.15.1:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-restore configure 2.15.0 +yast2-restore configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-restore $as_me 2.15.0, which was +It was created by yast2-restore $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-restore' - VERSION='2.15.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3258,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-restore $as_me 2.15.0, which was +This file was extended by yast2-restore $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3301,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-restore config.status 2.15.0 +yast2-restore config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.1/configure.in new/yast2-restore-2.15.2/configure.in --- old/yast2-restore-2.15.1/configure.in 2006-12-05 13:41:17.000000000 +0100 +++ new/yast2-restore-2.15.2/configure.in 2007-07-04 14:00:32.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-restore dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-restore, 2.15.0, http://bugs.opensuse.org/, yast2-restore) +AC_INIT(yast2-restore, 2.15.1, http://bugs.opensuse.org/, yast2-restore) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.15.1" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.1/src/restore.desktop new/yast2-restore-2.15.2/src/restore.desktop --- old/yast2-restore-2.15.1/src/restore.desktop 2006-10-09 15:50:13.000000000 +0200 +++ new/yast2-restore-2.15.2/src/restore.desktop 2007-05-30 08:09:38.000000000 +0200 @@ -21,38 +21,4 @@ Name=System Restoration GenericName=Restore files from a backup archive -Name[cs]=Obnova systému -GenericName[cs]=Obnovit soubory ze záložního archívu -Name[de]=System wiederherstellen -GenericName[de]=Dateien aus Backup-Archiv wiederherstellen -Name[es]=Recuperar sistema -GenericName[es]=Recuperar ficheros del archivo copia de seguridad -Name[hu]=Rendszer visszaállítása -GenericName[hu]=Fájlok visszaállítása az archívumból -Name[it]=Ripristina sistema -GenericName[it]=Ripristina file dall'archivio di backup -Name[ko]=시스템 복구 -GenericName[ko]=백업 아카이브로 부터 파일 복구 -Name[nl]=Restore systeem -GenericName[nl]=Restore bestanden van backup archief -Name[pt]=Restaurar sistema -GenericName[pt]=Restaurar arquivos do arquivo de backup -Name[sk]=Obnova systému -GenericName[sk]=Obnova súborov z archívu zálohy -Name[sv]=Återställ system -GenericName[sv]=Återställ filer från säkerhetskopia -Name[el]=Επαναφορά Συστήματος -GenericName[el]=Επαναφορά αρχείων από αρχειοθήκη -Name[fr]=Restaurer le système -GenericName[fr]=Restaurer les fichiers à partir de l'archive de sauvegarde -Name[ja]=システムのリストア -GenericName[ja]=バックアップ・アーカイブからファイルをリストアする。 -Name[lt]=Atkurti sistemą -GenericName[lt]=Atkurti bylas iš archyvo -Name[ru]=Восстановить систему -GenericName[ru]=Восстановить файлы из архива резервного копирования -Name[sl]=Obnovi sistem -GenericName[sl]=Obnovi datoteke iz varnostnega arhiva -Name[tr]=Sistem geri yükleme -GenericName[tr]=Dosyaları yedek arşivinden geri yükler X-KDE-SubstituteUID=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.1/VERSION new/yast2-restore-2.15.2/VERSION --- old/yast2-restore-2.15.1/VERSION 2007-03-09 13:46:25.000000000 +0100 +++ new/yast2-restore-2.15.2/VERSION 2007-07-30 17:48:12.000000000 +0200 @@ -1 +1 @@ -2.15.1 +2.15.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zircon
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package zircon checked in at Mon Jul 30 21:55:27 CEST 2007. -------- --- zircon/zircon.changes 2007-02-14 15:32:17.000000000 +0100 +++ /mounts/work_src_done/NOARCH/zircon/zircon.changes 2007-07-30 16:29:19.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 16:28:05 CEST 2007 - max(a)suse.de + +- Bug fix release: 1.18.256 +- Fixed usage of tkEntry... procs in tcl8.4 + +------------------------------------------------------------------- Old: ---- zircon-1.18.253.tar.gz New: ---- zircon-1.18.256.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zircon.spec ++++++ --- /var/tmp/diff_new_pack.p32458/_old 2007-07-30 21:53:26.000000000 +0200 +++ /var/tmp/diff_new_pack.p32458/_new 2007-07-30 21:53:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zircon (Version 1.18.253) +# spec file for package zircon (Version 1.18.256) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ Name: zircon BuildRequires: tk -License: BSD License and BSD-like +License: BSD 3-Clause Group: Productivity/Networking/IRC Requires: tk tcl Autoreqprov: on -Version: 1.18.253 -Release: 688 +Version: 1.18.256 +Release: 1 Summary: Tcl/Tk-based IRC Client -Source: %name-%version.tar.gz +Source: %name-%version.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,10 @@ /usr/share/zircon /usr/bin/zircon -%changelog -n zircon +%changelog +* Mon Jul 30 2007 - max(a)suse.de +- Bug fix release: 1.18.256 +- Fixed usage of tkEntry... procs in tcl8.4 * Wed Feb 14 2007 - schwab(a)suse.de - Add BuildRoot. * Wed Jan 24 2007 - ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package skelcd-control-openSUSE checked in at Mon Jul 30 21:50:30 CEST 2007. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2007-07-25 14:41:19.000000000 +0200 +++ /mounts/work_src_done/NOARCH/skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2007-07-30 15:36:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 15:35:17 CEST 2007 - locilka(a)suse.cz + +- Upgrade process now also offers to use repositories used on the + target system (FATE #301785). + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-CD.spec ++++++ --- /var/tmp/diff_new_pack.D26129/_old 2007-07-30 21:50:18.000000000 +0200 +++ /var/tmp/diff_new_pack.D26129/_new 2007-07-30 21:50:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE-CD (Version 2007.7.25) +# spec file for package skelcd-control-openSUSE-CD (Version 2007.7.30) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: YaST License Group: SuSE internal Autoreqprov: off -Version: 2007.7.25 +Version: 2007.7.30 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +63,9 @@ /CD1/control.xml %changelog +* Mon Jul 30 2007 - locilka(a)suse.cz +- Upgrade process now also offers to use repositories used on the + target system (FATE #301785). * Wed Jul 25 2007 - locilka(a)suse.cz - Unified wizard step names with dialogs, removed Clean Up step part of the Online Update is now Registration (#293095). skelcd-control-openSUSE.spec: same change ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2007-07-24 13:18:01.000000000 +0200 +++ /mounts/work_src_done/NOARCH/skelcd-control-openSUSE/control.xml 2007-07-30 13:04:59.000000000 +0200 @@ -367,6 +367,9 @@ <name>update_partition</name> </module> <module> + <name>upgrade_urls</name> + </module> + <module> <label>Additional Product Sources</label> <name>productsources</name> <enable_back>yes</enable_back> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lighttpd
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package lighttpd checked in at Mon Jul 30 21:47:39 CEST 2007. -------- --- lighttpd/lighttpd.changes 2007-03-26 14:28:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/lighttpd/lighttpd.changes 2007-07-25 14:16:13.135169000 +0200 @@ -1,0 +2,103 @@ +Wed Jul 25 14:02:32 CEST 2007 - mrueckert(a)suse.de + +- update to 1.4.16 + * added static-file.etags, etag.use-inode, etag.use-mtime, + etag.use-size to customize the generation of ETags for static + files. (#1209) (patch by <Yusufg(a)gmail.com>) + * fixed typecast of NULL on execl() (#1235) + (patch by F. Denis) + * fixed circumventing url.access-deny by trailing slash (#1230) + * fixed crash on duplicate headers with trailing WS (#1232) + * fixed accepting more connections then requested (#1216) + * fixed mem-leak in mod_auth (reported by Stefan Esser) + * fixed crash with md5-sess and cnonce not set in mod_auth + (reported by Stefan Esser) + * fixed missing check for base64 encoded string in mod_auth and + Basic auth (reported by Stefan Esser) + * fixed possible crash in Auth-Digest header parser on trailing + WS in mod_auth (reported by Stefan Esser) + * fixed check on stale errno values, which broke handling of + broken fastcgi applications. (#1245) + * fixed crash on 32bit archs when debug-msgs are printed in + mod_scgi, mod_fastcgi and mod_webdav (#1263) +- removed lighttpd-1.4.x_mod_status_orig_uri.patch: + included upstream + +------------------------------------------------------------------- +Fri May 25 16:37:55 CEST 2007 - mrueckert(a)suse.de + +- added lighttpd-1.4.x_mod_status_orig_uri.patch: + show the original request uri in the mod_status output + +------------------------------------------------------------------- +Mon May 14 13:51:01 CEST 2007 - mrueckert(a)suse.de + +- synced spec with the -snapshot rpms + +------------------------------------------------------------------- +Thu Apr 19 19:55:35 CEST 2007 - mrueckert(a)suse.de + +- added /var/lib/lighttpd/sockets/ + +------------------------------------------------------------------- +Mon Apr 16 08:36:26 CEST 2007 - mrueckert(a)suse.de + +- update to 1.4.15: + * fixed broken Set-Cookie headers +- additional changes from 1.4.14: (includes fixes for bnc:#246945) + * fix crash if gethostbyaddr() failed on redirect [1718] + * properly handle 206 responses generated by *cgi scripts. + (#755) [1716] + * added HTTPS=on to the environment of cgi scripts (#861) [1684] + * fix handling of 303 (#1045) [1678] + * made the configure check for lua more portable [1677] + * added mod_extforward module [1665] + * references to the fam stat cache engine should be conditional + (#1039) [1664] + * fix http 500 errors (colin.stephen/at/o2.com) #1041 [1663] + * prevent wrong pidfile unlinking on graceful restart + (Chris Webb) [1656] + * ignore empty packets from STDERR stream. #998 + * fix a crash for files with an mtime of 0 reported by cubiq on + irc [1519] CVE-2007-1870 + * allow empty passwords with ldap (Jörg Sonnenberger) [1516] + * mod_scgi.c segfault fix #964 [1501] + * Added round-robin support to mod_fastcgi [1500] + * Handle DragonFlyBSD the same way as Freebsd + (Jörg Sonnenberger) [1492,1676] + * added now and weeks support to mod_expire. #943 + * fix cpu hog in certain requests [1473] CVE-2007-1869 + * fix for handling hostnames with trailing dot [1406] + * fixed header-injection via server.tag (#1106) + * disabled caching of files without a content-type to solve the + aggressive caching of FF + * remove trailing white-spaces from HTTP-requests before parsing + (#1098) + * fixed accesslog.use-syslog in a conditional and the caching of + the accesslog for files (fixes #1064) + * fixed various crashes at startup on broken accesslog.format + strings (#1000) + * fixed handling of %% in accesslog.format + * fixed conditional dir-listing.exclude (#930) + * reduced default PATH_MAX to 255 (#826) + * ECONNABORTED is not known on cygwin (#863) + * fixed crash on url.redirect and url.rewrite if %0 is used in + a global context (#800) + * fixed possible crash in debug-message in mod_extforward + * fixed compilation of mod_extforward on glibc < 2.3.4 + * fixed include of empty in the configfiles (#1076) + * send SIGUSR1 to fastcgi children before SIGTERM. libfcgi + wants SIGUSR1. (#737) + * fixed missing AUTH_TYPE entry in the fastcgi environment. + (#889) + * fixed compilation in network_writev.c on MacOS X 10.3.9 (#903) + * added kill-signal as another setting for fastcgi backends. See + the wiki for more. +- fixed the default config: (#254820) + it broke when module configs used variables +- added zlib-devel and libbz2-devel to the buildrequires for 10.3+ +- added proper conditionals for older distros +- added optional mod_geoip module. (only build on the buildservice) +- added mod_magnet config file + +------------------------------------------------------------------- @@ -6,0 +110,5 @@ +Sat Dec 2 23:33:26 CET 2006 - mrueckert(a)suse.de + +- fixed building on sles9 + +------------------------------------------------------------------- @@ -19 +127 @@ - * fixed segfault in splitted CRLF CRLF sequences + * fixed segfault in splitted CRLF CRLF sequences @@ -24 +132 @@ - * fixed Content-Length = 0 on HEAD requests without + * fixed Content-Length = 0 on HEAD requests without @@ -28 +136 @@ - * removed warning about a 404-error-handler + * removed warning about a 404-error-handler @@ -66 +174 @@ - o fixed handling of If-Modified-Since if ETag is not set + o fixed handling of If-Modified-Since if ETag is not set @@ -70 +178 @@ - o fixed conditional server.allow-http-11 + o fixed conditional server.allow-http-11 @@ -76 +184 @@ - o added ability to specify which ip address spawn-fci listens on + o added ability to specify which ip address spawn-fci listens on @@ -79 +187 @@ - o fixed handling of error codes returned by mod_dav_svn behing a + o fixed handling of error codes returned by mod_dav_svn behing a @@ -86 +194 @@ - o fixed local source retrieval on windows + o fixed local source retrieval on windows @@ -88 +196 @@ - o fixed hanging cgi if remote side is dieing while reading + o fixed hanging cgi if remote side is dieing while reading @@ -91,0 +200,5 @@ +Thu Jul 20 19:47:22 CEST 2006 - olh(a)suse.de + +- remove unused neon from buildrequires + +------------------------------------------------------------------- @@ -118,5 +230,0 @@ -Thu Jul 20 19:47:22 CEST 2006 - olh(a)suse.de - -- remove unused neon from buildrequires - -------------------------------------------------------------------- @@ -246 +354 @@ - * changed auth.ldap-cafile to be optional + * changed auth.ldap-cafile to be optional @@ -250 +358 @@ - * added support to let the server listen on UNIX-socket + * added support to let the server listen on UNIX-socket @@ -257 +365 @@ - * fixed possible crash in mod_webdav if sqlite3 support + * fixed possible crash in mod_webdav if sqlite3 support @@ -261 +369 @@ - * fixed assert() in "connections.c:962: + * fixed assert() in "connections.c:962: Old: ---- lighttpd-1.4.13.tar.bz2 New: ---- lighttpd-1.4.13_geoip.patch lighttpd-1.4.16.tar.bz2 lighttpd.SuSEfirewall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lighttpd.spec ++++++ --- /var/tmp/diff_new_pack.T20014/_old 2007-07-30 21:46:08.000000000 +0200 +++ /var/tmp/diff_new_pack.T20014/_new 2007-07-30 21:46:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lighttpd (Version 1.4.13) +# spec file for package lighttpd (Version 1.4.16) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,34 +11,69 @@ # norootforbuild Name: lighttpd +Version: 1.4.16 +Release: 1 +# %define pkg_name lighttpd +%define pkg_user lighttpd %define pkg_home /var/lib/%{pkg_name} -Version: 1.4.13 -Release: 38 # Group: Productivity/Networking/Web/Servers -License: BSD License and BSD-like +License: BSD 3-Clause, http://www.lighttpd.net/download/COPYING # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: FastCGI-devel e2fsprogs-devel fam-devel gdbm-devel libattr-devel libmemcache-devel libxml2-devel mysql-devel openldap2-devel pam-devel pcre-devel php5-fastcgi pkgconfig sqlite-devel +BuildRequires: FastCGI-devel e2fsprogs-devel fam-devel gdbm-devel libattr-devel libmemcache-devel libxml2-devel mysql-devel openldap2-devel pcre-devel pkgconfig pwdutils zlib-devel +# +%define with_tests 1 +%define with_enh_webdav 1 +%define with_mod_magnet 1 +%if 0%{?sles_version} == 9 +%define with_tests 0 +%define with_enh_webdav 0 +%endif +%if 0%{?suse_version} > 1020 +%define with_susefirewall_config 1 +%endif +# +%if 0%{?with_enh_webdav} +BuildRequires: sqlite-devel >= 3 +%endif +# %if 0%{?opensuse_bs} BuildRequires: lua51-devel +%define with_geoip 1 %else BuildRequires: lua-devel +%if 0%{sles_version} +%define with_mod_magnet 0 +%endif +%endif +# +%if 0%{?with_geoip} +BuildRequires: GeoIP-devel +%endif +# +%if 0%{?with_tests} +BuildRequires: php5-fastcgi %endif -%if 0%{?suse_version} == 930 +# +%if 0%{?suse_version} == 930 || 0%{?sles_version} == 9 BuildRequires: libstdc++-devel %endif +%if 0%{?suse_version} > 1020 +BuildRequires: libbz2-devel +%endif PreReq: %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/sbin/useradd # URL: http://www.lighttpd.net/ -# http://www.lighttpd.net/download/lighttpd-%{version}.tar.gz -Source: %{pkg_name}-%{version}.tar.bz2 +Source: http://www.lighttpd.net/download/%{pkg_name}-%{version}.tar.bz2 Source1: %{pkg_name}.init Source2: %{pkg_name}.sysconfig Source3: config.tar.bz2 Source4: lightytest.sh +Source5: %{pkg_name}.SuSEfirewall Patch1: lighttpd-1.4.10_testsuite.patch +Patch2: lighttpd-1.4.13_geoip.patch # Summary: A Secure, Fast, Compliant, and Very Flexible Web Server @@ -57,7 +92,7 @@ Jan Kneschke <jan(a)kneschke.de> %package mod_cml -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: CML (Cache Meta Language) module for Lighttpd @@ -85,7 +120,7 @@ Jan Kneschke <jan(a)kneschke.de> %package mod_magnet -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: A module to control the request handling in lighttpd @@ -101,7 +136,7 @@ Jan Kneschke <jan(a)kneschke.de> %package mod_mysql_vhost -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: MySQL based virtual hosts (vhosts) module for Lighttpd @@ -116,7 +151,7 @@ Jan Kneschke <jan(a)kneschke.de> %package mod_trigger_b4_dl -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: Another anti hot-linking module for Lighttpd @@ -142,7 +177,7 @@ Jan Kneschke <jan(a)kneschke.de> %package mod_rrdtool -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Requires: rrdtool Group: Productivity/Networking/Web/Servers Summary: Lighttpd module to feed rrdtool databases @@ -160,8 +195,32 @@ -------- Jan Kneschke <jan(a)kneschke.de> +%if 0%{?with_geoip} +%package mod_geoip +Requires: %{name} = %{version} +Group: Productivity/Networking/Web/Servers +Summary: A Secure, Fast, Compliant, and Very Flexible Web Server + +%description mod_geoip +Lighttpd a secure, fast, compliant, and very flexible Web server that +has been optimized for high-performance environments. It has a very low +memory footprint compared to other Web servers and takes care of CPU +load. Its advanced feature set (FastCGI, CGI, Auth, +Output-Compression, URL-Rewriting, and more) makes lighttpd the perfect +Web server software for every server that is suffering load problems. + +This is just a dummy package which is not build in autobuild. see the +buildservice project server:http if you want it. + + + +Authors: +-------- + Jan Kneschke <jan(a)kneschke.de> + +%endif %package mod_webdav -Requires: %{pkg_name} = %{version} +Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: WebDAV module for Lighttpd @@ -195,10 +254,15 @@ %prep %setup -a 3 %patch1 +%if 0%{?with_geoip} +%patch2 +%endif %build -#autoreconf -fi -export CFLAGS="%{optflags} -DLDAP_DEPRECATED -W -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wformat=2 -Wbad-function-cast" +%if 0%{?with_geoip} +autoreconf -fi +%endif +export CFLAGS="%{optflags} -DLDAP_DEPRECATED -W -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wformat=2 -Wbad-function-cast -std=gnu99" %if %suse_version > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif @@ -210,31 +274,34 @@ --with-ldap \ --with-mysql \ --with-openssl \ + --with-kerberos5 \ --with-gdbm \ --with-lua \ --with-memcache \ --with-bzip2 \ --with-webdav \ +%if 0%{?with_enh_webdav} --with-webdav-props \ --with-webdav-locks \ +%endif --with-fam \ --with-attr %{__make} +%if 0%{?with_tests} sh -x %{S:4} +%endif %install %makeinstall -%{__install} -Dd -m 0755 \ - %{buildroot}%{pkg_home} \ +%{__install} -d -m 0755 \ + %{buildroot}%{pkg_home}/sockets/ \ %{buildroot}%{_var}/cache/%{pkg_name}/compress \ %{buildroot}%{_var}/log/%{pkg_name} \ - %{buildroot}%{_sysconfdir}/%{pkg_name} \ - %{buildroot}%{_sysconfdir}/init.d \ - %{buildroot}/var/adm/fillup-templates/ + %{buildroot}%{_sysconfdir}/%{pkg_name} # # init script # -%{__install} -m 0755 %{S:1} \ +%{__install} -D -m 0755 %{S:1} \ %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} %{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} # @@ -242,14 +309,25 @@ # perl -p -i.orig -e 's|^(server\.tag = ).*$|$1 "%{pkg_name} (%{version}/SuSE)"|' config/lighttpd.conf diff -ur config/lighttpd.conf{.orig,} ||: -rm -f config/lighttpd.conf.orig ||: +%{__rm} -vf config/lighttpd.conf.orig ||: %{__cp} -rv config/* %{buildroot}%{_sysconfdir}/%{pkg_name}/ +# only needed when build with mod_geoip support +%if ! 0%{?with_geoip} +%{__rm} -v %{buildroot}%{_sysconfdir}/%{pkg_name}/conf.d/geoip.conf +%endif # # sysconfig template # -%{__install} -m 0644 %{S:2} \ +%{__install} -D -m 0644 %{S:2} \ %{buildroot}/var/adm/fillup-templates/sysconfig.%{pkg_name} # +# susefirewall config file +# +%if 0%{?with_susefirewall_config} +%{__install} -D -m 0644 %{S:5} \ + %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/lighttpd +%endif +# # remove the .la files. we dont need them. # %{__rm} -vf %{buildroot}%{_libdir}/%{pkg_name}/*.la @@ -261,8 +339,8 @@ # # e.g. adding user # -/usr/sbin/groupadd -r %{pkg_name} &>/dev/null ||: -/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}" -d %{pkg_home} %{pkg_name} &>/dev/null ||: +/usr/sbin/groupadd -r %{pkg_user} &>/dev/null ||: +/usr/sbin/useradd -g %{pkg_user} -s /bin/false -r -c "user for %{pkg_user}" -d %{pkg_home} %{pkg_user} &>/dev/null ||: %post %fillup_and_insserv %{pkg_name} @@ -276,32 +354,35 @@ %files %defattr(-,root,root,-) +%if 0%{?with_susefirewall_config} +/etc/sysconfig/SuSEfirewall2.d/services/lighttpd +%endif %{_sbindir}/* -%dir %attr(750,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name} -%dir %attr(750,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d -%dir %attr(750,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/vhosts.d -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/lighttpd.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/modules.conf +%dir %attr(750,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name} +%dir %attr(750,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d +%dir %attr(750,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/vhosts.d +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/lighttpd.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/modules.conf # modules config -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/access_log.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/auth.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/cgi.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/compress.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/debug.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/dirlisting.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/evhost.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/expire.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/fastcgi.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/mime.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/mod.template -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/proxy.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/scgi.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/secdownload.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/simplev_host.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/ssi.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/status.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/userdir.conf -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/vhosts.d/vhosts.template +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/access_log.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/auth.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/cgi.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/compress.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/debug.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/dirlisting.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/evhost.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/expire.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/fastcgi.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/mime.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/mod.template +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/proxy.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/scgi.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/secdownload.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/simple_vhost.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/ssi.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/status.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/userdir.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/vhosts.d/vhosts.template # modules %dir %{_libdir}/%{pkg_name} %{_libdir}/%{pkg_name}/mod_access.so @@ -314,6 +395,7 @@ %{_libdir}/%{pkg_name}/mod_evasive.so %{_libdir}/%{pkg_name}/mod_evhost.so %{_libdir}/%{pkg_name}/mod_expire.so +%{_libdir}/%{pkg_name}/mod_extforward.so %{_libdir}/%{pkg_name}/mod_fastcgi.so %{_libdir}/%{pkg_name}/mod_flv_streaming.so %{_libdir}/%{pkg_name}/mod_indexfile.so @@ -330,7 +412,7 @@ %{_libdir}/%{pkg_name}/mod_userdir.so %{_libdir}/%{pkg_name}/mod_usertrack.so %{_mandir}/man1/*.1* -%{_sysconfdir}/init.d/%{pkg_name} +%config(noreplace) %{_sysconfdir}/init.d/%{pkg_name} %doc AUTHORS ChangeLog NEWS README %doc doc/*.dot %doc doc/spawn-php.sh @@ -363,49 +445,149 @@ %doc doc/traffic-shaping.txt %doc doc/userdir.txt /var/adm/fillup-templates/sysconfig.%{pkg_name} -%dir %attr(750,%{pkg_name},%{pkg_name}) %{pkg_home} -%attr(750,%{pkg_name},%{pkg_name}) %{_var}/cache/%{pkg_name}/ -%dir %attr(750,%{pkg_name},%{pkg_name}) %{_var}/log/%{pkg_name} +%dir %attr(751,%{pkg_user},%{pkg_user}) %{pkg_home}/ +%dir %attr(751,%{pkg_user},%{pkg_user}) %{pkg_home}/sockets/ +%attr(751,%{pkg_user},%{pkg_user}) %{_var}/cache/%{pkg_name}/ +%dir %attr(750,%{pkg_user},%{pkg_user}) %{_var}/log/%{pkg_name}/ %files mod_rrdtool %defattr(-,root,root,-) -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/rrdtool.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/rrdtool.conf %doc doc/rrdtool.txt %doc doc/rrdtool-graph.sh %{_libdir}/%{pkg_name}/mod_rrdtool.so %files mod_cml %defattr(-,root,root,-) -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/cml.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/cml.conf %{_libdir}/%{pkg_name}/mod_cml.so %doc doc/cml.txt %files mod_magnet %defattr(-,root,root,-) +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/magnet.conf %{_libdir}/%{pkg_name}/mod_magnet.so %doc doc/magnet.txt %files mod_mysql_vhost %defattr(-,root,root,-) -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/mysql_vhost.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/mysql_vhost.conf %{_libdir}/%{pkg_name}/mod_mysql_vhost.so %doc doc/mysqlvhost.txt %files mod_trigger_b4_dl %defattr(-,root,root,-) -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/trigger_b4_dl.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/trigger_b4_dl.conf %{_libdir}/%{pkg_name}/mod_trigger_b4_dl.so %doc doc/trigger_b4_dl.txt +%if 0%{?with_geoip} + +%files mod_geoip +%defattr(-,root,root,-) +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/geoip.conf +%doc doc/geoip.txt +%{_libdir}/%{pkg_name}/mod_geoip.so +%endif %files mod_webdav %defattr(-,root,root,-) -%config(noreplace) %attr(640,root,%{pkg_name}) %{_sysconfdir}/%{pkg_name}/conf.d/webdav.conf +%config(noreplace) %attr(640,root,%{pkg_user}) %{_sysconfdir}/%{pkg_name}/conf.d/webdav.conf %{_libdir}/%{pkg_name}/mod_webdav.so %doc doc/webdav.txt %changelog +* Wed Jul 25 2007 - mrueckert(a)suse.de +- update to 1.4.16 + * added static-file.etags, etag.use-inode, etag.use-mtime, + etag.use-size to customize the generation of ETags for static + files. (#1209) (patch by <Yusufg(a)gmail.com>) + * fixed typecast of NULL on execl() (#1235) + (patch by F. Denis) + * fixed circumventing url.access-deny by trailing slash (#1230) + * fixed crash on duplicate headers with trailing WS (#1232) + * fixed accepting more connections then requested (#1216) + * fixed mem-leak in mod_auth (reported by Stefan Esser) + * fixed crash with md5-sess and cnonce not set in mod_auth + (reported by Stefan Esser) + * fixed missing check for base64 encoded string in mod_auth and + Basic auth (reported by Stefan Esser) + * fixed possible crash in Auth-Digest header parser on trailing + WS in mod_auth (reported by Stefan Esser) + * fixed check on stale errno values, which broke handling of + broken fastcgi applications. (#1245) + * fixed crash on 32bit archs when debug-msgs are printed in + mod_scgi, mod_fastcgi and mod_webdav (#1263) +- removed lighttpd-1.4.x_mod_status_orig_uri.patch: + included upstream +* Fri May 25 2007 - mrueckert(a)suse.de +- added lighttpd-1.4.x_mod_status_orig_uri.patch: + show the original request uri in the mod_status output +* Mon May 14 2007 - mrueckert(a)suse.de +- synced spec with the -snapshot rpms +* Thu Apr 19 2007 - mrueckert(a)suse.de +- added /var/lib/lighttpd/sockets/ +* Mon Apr 16 2007 - mrueckert(a)suse.de +- update to 1.4.15: + * fixed broken Set-Cookie headers +- additional changes from 1.4.14: (includes fixes for bnc:#246945) + * fix crash if gethostbyaddr() failed on redirect [1718] + * properly handle 206 responses generated by *cgi scripts. + (#755) [1716] + * added HTTPS=on to the environment of cgi scripts (#861) [1684] + * fix handling of 303 (#1045) [1678] + * made the configure check for lua more portable [1677] + * added mod_extforward module [1665] + * references to the fam stat cache engine should be conditional + (#1039) [1664] + * fix http 500 errors (colin.stephen/at/o2.com) #1041 [1663] + * prevent wrong pidfile unlinking on graceful restart + (Chris Webb) [1656] + * ignore empty packets from STDERR stream. #998 + * fix a crash for files with an mtime of 0 reported by cubiq on + irc [1519] CVE-2007-1870 + * allow empty passwords with ldap (Jörg Sonnenberger) [1516] + * mod_scgi.c segfault fix #964 [1501] + * Added round-robin support to mod_fastcgi [1500] + * Handle DragonFlyBSD the same way as Freebsd + (Jörg Sonnenberger) [1492,1676] + * added now and weeks support to mod_expire. #943 + * fix cpu hog in certain requests [1473] CVE-2007-1869 + * fix for handling hostnames with trailing dot [1406] + * fixed header-injection via server.tag (#1106) + * disabled caching of files without a content-type to solve the + aggressive caching of FF + * remove trailing white-spaces from HTTP-requests before parsing + (#1098) + * fixed accesslog.use-syslog in a conditional and the caching of + the accesslog for files (fixes #1064) + * fixed various crashes at startup on broken accesslog.format + strings (#1000) + * fixed handling of %% in accesslog.format + * fixed conditional dir-listing.exclude (#930) + * reduced default PATH_MAX to 255 (#826) + * ECONNABORTED is not known on cygwin (#863) + * fixed crash on url.redirect and url.rewrite if %%0 is used in + a global context (#800) + * fixed possible crash in debug-message in mod_extforward + * fixed compilation of mod_extforward on glibc < 2.3.4 + * fixed include of empty in the configfiles (#1076) + * send SIGUSR1 to fastcgi children before SIGTERM. libfcgi + wants SIGUSR1. (#737) + * fixed missing AUTH_TYPE entry in the fastcgi environment. + (#889) + * fixed compilation in network_writev.c on MacOS X 10.3.9 (#903) + * added kill-signal as another setting for fastcgi backends. See + the wiki for more. +- fixed the default config: (#254820) + it broke when module configs used variables +- added zlib-devel and libbz2-devel to the buildrequires for 10.3+ +- added proper conditionals for older distros +- added optional mod_geoip module. (only build on the buildservice) +- added mod_magnet config file * Mon Mar 26 2007 - rguenther(a)suse.de - Add gdbm-devel BuildRequires +* Sat Dec 02 2006 - mrueckert(a)suse.de +- fixed building on sles9 * Thu Oct 19 2006 - mrueckert(a)suse.de - Factory has 5.1.1. so allow building against plain lua-devel * Tue Oct 10 2006 - mrueckert(a)suse.de ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/access_log.conf new/config/conf.d/access_log.conf --- old/config/conf.d/access_log.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/access_log.conf 2006-04-06 01:09:05.000000000 +0200 @@ -9,7 +9,7 @@ ## ## Default access log. ## -accesslog.filename = log_root + "access.log" +accesslog.filename = log_root + "/access.log" ## ## The default format produces CLF compatible output. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/compress.conf new/config/conf.d/compress.conf --- old/config/conf.d/compress.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/compress.conf 2006-04-06 03:31:43.000000000 +0200 @@ -14,7 +14,7 @@ ## This directory should be changed per vhost otherwise you can ## run into trouble with overlapping filenames ## -compress.cache-dir = cache_dir +compress.cache-dir = cache_dir + "/compress" ## ## FileTypes to compress. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/evhost.conf new/config/conf.d/evhost.conf --- old/config/conf.d/evhost.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/evhost.conf 2006-04-06 01:10:50.000000000 +0200 @@ -16,7 +16,7 @@ ## %3 => subdomain 1 name ## %4 => subdomain 2 name ## -evhost.path-pattern = server_root + "/vhosts/%3/htdocs/" +evhost.path-pattern = vhosts_dir + "/%3/htdocs/" ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/fastcgi.conf new/config/conf.d/fastcgi.conf --- old/config/conf.d/fastcgi.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/fastcgi.conf 2006-05-01 22:47:36.000000000 +0200 @@ -11,18 +11,42 @@ ## PHP Example ## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini. ## +## The number of php processes you will get can be easily calculated: +## +## num-procs = max-procs * ( 1 + PHP_FCGI_CHILDREN ) +## +## for the php-num-procs example it means you will get 17*5 = 85 php +## processes. you always should need this high number for your very +## busy sites. And if you have a lot of RAM. :) +## #fastcgi.server = ( ".php" => # ( "php-local" => # ( -# "socket" => home_dir + "/php-fastcgi.socket", -# "bin-path" => server_root + "/cgi-bin/php5" +# "socket" => socket_dir + "/php-fastcgi-1.socket", +# "bin-path" => server_root + "/cgi-bin/php5", +# "max-procs" => 1, +# "broken-scriptfilename" => "enable", # ) # ), # ( "php-tcp" => # ( # "host" => "127.0.0.1", # "port" => 9999, -# "check-local" => "disable" +# "check-local" => "disable", +# "broken-scriptfilename" => "enable", +# ) +# ), +# +# ( "php-num-procs" => +# ( +# "socket" => socket_dir + "/php-fastcgi-2.socket", +# "bin-path" => server_root + "/cgi-bin/php5", +# "bin-environment" => ( +# "PHP_FCGI_CHILDREN" => "16", +# "PHP_FCGI_MAX_REQUESTS" => "10000", +# ), +# "max-procs" => 5, +# "broken-scriptfilename" => "enable", # ) # ), # ) @@ -37,11 +61,11 @@ # server.error-handler-404 = "/dispatch.fcgi" # fastcgi.server = ( ".fcgi" => # ("someapp" => -# ( "socket" => home_dir + "/someapp-fcgi.socket", +# ( "socket" => socket_dir + "/someapp-fcgi.socket", # "bin-path" => server_root + "/rails/someapp/public/dispatch.fcgi", # "bin-environment" => ( # "RAILS_ENV" => "production", -# "TMP" => home_dir + "/rails/someapp" +# "TMP" => home_dir + "/rails/someapp", # ), # ) # ) @@ -54,39 +78,58 @@ ## http://blog.lighttpd.net/articles/2005/11/23/lighttpd-1-4-8-and-multiple-ra… ## #$HTTP["host"] == "rails2.example.com" { -# $HTTP["url"] =~ "^/someapp1" -# server.document-root = server_root + "/rails/someapp2/public" +# $HTTP["url"] =~ "^/someapp1" { +# server.document-root = server_root + "/rails/someapp1/public" # server.error-handler-404 = "/dispatch.fcgi" # fastcgi.server = ( ".fcgi" => # ("someapp1" => -# ( "socket" => home_dir + "/someapp2-fcgi.socket", -# "bin-path" => server_root + "/rails/someapp2/public/dispatch.fcgi", +# ( "socket" => socket_dir + "/someapp1-fcgi.socket", +# "bin-path" => server_root + "/rails/someapp1/public/dispatch.fcgi", # "bin-environment" => ( # "RAILS_ENV" => "production", -# "TMP" => home_dir + "/rails/someapp2" +# "TMP" => home_dir + "/rails/someapp1", # ), # "strip-request-uri" => "/someapp1/" # ) # ) # ) # } -# $HTTP["url"] =~ "^/someapp2" +# +# $HTTP["url"] =~ "^/someapp2" { # server.document-root = server_root + "/rails/someapp2/public" # server.error-handler-404 = "/dispatch.fcgi" # fastcgi.server = ( ".fcgi" => # ("someapp2" => -# ( "socket" => home_dir + "/someapp2-fcgi.socket", +# ( "socket" => socket_dir + "/someapp2-fcgi.socket", # "bin-path" => server_root + "/rails/someapp2/public/dispatch.fcgi", # "bin-environment" => ( # "RAILS_ENV" => "production", -# "TMP" => home_dir + "/rails/someapp2" +# "TMP" => home_dir + "/rails/someapp2", # ), -# "strip-request-uri" => "/someapp1/" +# "strip-request-uri" => "/someapp2/" # ) # ) # ) # } #} +## chrooted webserver + external PHP +## +## $ spawn-fcgi -f /usr/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8 +## +## webserver chrooted to /srv/www/ +## php running outside the chroot +# +#fastcgi.server = ( +# ".php" => (( +# "host" => "127.0.0.1", +# "port" => "2000", +# "docroot" => "/srv/www/servers/www.example.org/htdocs/" +# ))) +# +#server.chroot = "/srv/www" +#server.document-root = "/servers/wwww.example.org/htdocs/" +# + ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/geoip.conf new/config/conf.d/geoip.conf --- old/config/conf.d/geoip.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/config/conf.d/geoip.conf 2006-11-29 23:55:32.000000000 +0100 @@ -0,0 +1,26 @@ +####################################################################### +## +## GeoIP Module +## --------------- +## +## mod_geoip is a module for fast ip/location lookups. It uses MaxMind +## GeoIP / GeoCity databases. If the ip was found in the database the +## module sets the appropriate environments variables to the request, +## thus making other modules/fcgi be informed. +## +server.modules += ( "mod_geoip" ) + +## +## mod_geoip will determine the database type automatically so if you +## enter GeoCity databse path it will load GeoCity Env. +## +#geoip.db-filename = "/path/to/GeoCityLite.dat" + +## +## If enabled, mod_geoip will load the database binary file to memory +## for very fast lookups. The only penalty is memory usage. +## +#geoip.memory-cache = "disable" + +## +####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/magnet.conf new/config/conf.d/magnet.conf --- old/config/conf.d/magnet.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/config/conf.d/magnet.conf 2006-10-15 10:57:26.000000000 +0200 @@ -0,0 +1,22 @@ +####################################################################### +## +## Magnet Module +## --------------- +## +## see http://trac.lighttpd.net/trac/wiki/Docs%3AModMagnet +## +server.modules += ( "mod_magnet" ) + +## +## +## +#magnet.attract-raw-url-to = ( ) + +## +## as an example for that see the mod_magnet docs and +## http://pixel.global-banlist.de./ +## +#magnet.attract-physical-path-to = ( conf_dir + "/cleanurl.lua" ) + +## +####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/mime.conf new/config/conf.d/mime.conf --- old/config/conf.d/mime.conf 2006-03-06 01:28:47.000000000 +0100 +++ new/config/conf.d/mime.conf 2007-04-19 19:58:35.000000000 +0200 @@ -52,6 +52,7 @@ ".conf" => "text/plain", ".text" => "text/plain", ".txt" => "text/plain", + ".spec" => "text/plain", ".dtd" => "text/xml", ".xml" => "text/xml", ".mpeg" => "video/mpeg", @@ -64,7 +65,10 @@ ".wmv" => "video/x-ms-wmv", ".bz2" => "application/x-bzip", ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar" + ".tar.bz2" => "application/x-bzip-compressed-tar", + ".rpm" => "application/x-rpm", + # make the default mime type application/octet-stream. + "" => "application/octet-stream", ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/proxy.conf new/config/conf.d/proxy.conf --- old/config/conf.d/proxy.conf 2006-03-06 01:30:22.000000000 +0100 +++ new/config/conf.d/proxy.conf 2006-07-18 02:51:34.000000000 +0200 @@ -17,19 +17,19 @@ ## ## might be one of 'hash', 'round-robin' or 'fair' (default). ## -proxy.balance = "fair" +#proxy.balance = "fair" ## ## Handle all jsp requests via 192.168.0.101 ## -proxy.server = ( ".jsp" => - ( "tomcat" => - ( - "host" => "192.168.0.101", - "port" => 80 - ) - ) - ) +#proxy.server = ( ".jsp" => +# ( "tomcat" => +# ( +# "host" => "192.168.0.101", +# "port" => 80 +# ) +# ) +# ) ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/scgi.conf new/config/conf.d/scgi.conf --- old/config/conf.d/scgi.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/scgi.conf 2006-04-06 03:48:18.000000000 +0200 @@ -17,11 +17,11 @@ # server.error-handler-404 = "/dispatch.fcgi" # scgi.server = ( ".scgi" => # ("scgi-someapp" => -# ( "socket" => home_dir + "/someapp-scgi.socket", +# ( "socket" => socket_dir + "/someapp-scgi.socket", # "bin-path" => server_root + "/rails/someapp/public/dispatch.scgi", # "bin-environment" => ( # "RAILS_ENV" => "production", -# "TMP" => home_dir + "/rails/someapp" +# "TMP" => home_dir + "/rails/someapp", # ), # ) # ) @@ -41,7 +41,7 @@ # ( # "host" => "127.0.0.1", # "port" => 9998, -# "check-local" => "disable" +# "check-local" => "disable", # ) # ) # ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/simple_vhost.conf new/config/conf.d/simple_vhost.conf --- old/config/conf.d/simple_vhost.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/config/conf.d/simple_vhost.conf 2006-07-26 03:30:23.000000000 +0200 @@ -0,0 +1,28 @@ +####################################################################### +## +## Simple Virtual hosting +## ------------------------ +## +## http://www.lighttpd.net/documentation/simple-vhost.html +## +server.modules += ( "mod_simple_vhost" ) + +## If you want name-based virtual hosting add the next three settings and load +## mod_simple_vhost +## +## document-root = +## virtual-server-root + virtual-server-default-host + virtual-server-docroot +## or +## virtual-server-root + http-host + virtual-server-docroot +## +simple-vhost.server-root = vhosts_dir + "/" +simple-vhost.default-host = "default.example.com" +simple-vhost.document-root = "/htdocs/" + +## +## Print some errors for finding the document-root +## +#simple-vhost.debug = "enable" + +## +####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/simplev_host.conf new/config/conf.d/simplev_host.conf --- old/config/conf.d/simplev_host.conf 2006-03-06 01:31:15.000000000 +0100 +++ new/config/conf.d/simplev_host.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -####################################################################### -## -## Simple Virtual hosting -## ------------------------ -## -## http://www.lighttpd.net/documentation/simple-vhost.html -## -server.modules += ( "mod_simple_vhost" ) - -## If you want name-based virtual hosting add the next three settings and load -## mod_simple_vhost -## -## document-root = -## virtual-server-root + virtual-server-default-host + virtual-server-docroot -## or -## virtual-server-root + http-host + virtual-server-docroot -## -simple-vhost.server-root = server_root + "/vhosts/" -simple-vhost.default-host = "default.example.com" -simple-vhost.document-root = "/htdocs/" - -## -####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/userdir.conf new/config/conf.d/userdir.conf --- old/config/conf.d/userdir.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/conf.d/userdir.conf 2006-04-06 01:12:47.000000000 +0200 @@ -30,7 +30,7 @@ ## if set, only users from this list may use the feature ## Default: empty (all users may use it) ## -#userdir.include-user = () +#userdir.include-user = ("user1", "user2") ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/conf.d/webdav.conf new/config/conf.d/webdav.conf --- old/config/conf.d/webdav.conf 2006-03-06 01:33:26.000000000 +0100 +++ new/config/conf.d/webdav.conf 2006-04-06 01:10:58.000000000 +0200 @@ -27,7 +27,7 @@ ## ## ## - webdav.sqlite-db-name = home_dir + "webdav.db" + webdav.sqlite-db-name = home_dir + "/webdav.db" } ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/lighttpd.conf new/config/lighttpd.conf --- old/config/lighttpd.conf 2006-03-06 21:25:49.000000000 +0100 +++ new/config/lighttpd.conf 2006-11-07 22:17:40.000000000 +0100 @@ -8,6 +8,72 @@ ####################################################################### ## +## Some Variable definition which will make chrooting easier. +## +## if you add a variable here. Add the corresponding variable in the +## chroot example aswell. +## +var.log_root = "/var/log/lighttpd" +var.server_root = "/srv/www" +var.state_dir = "/var/run" +var.home_dir = "/var/lib/lighttpd" +var.conf_dir = "/etc/lighttpd" + +## +## run the server chrooted. +## +## This requires root permissions during startup. +## +## If you run Chrooted set the the variables to directories relative to +## the chroot dir. +## +## example chroot configuration: +## +#var.log_root = "/logs" +#var.server_root = "/" +#var.state_dir = "/run" +#var.home_dir = "/lib/lighttpd" +#var.vhosts_dir = "/vhosts" +#var.conf_dir = "/etc" +# +#server.chroot = "/srv/www" + +## +## Some additional variables to make the configuration easier +## + +## +## Base directory for all virtual hosts +## +## used in: +## conf.d/evhost.conf +## conf.d/simple_vhost.conf +## vhosts.d/vhosts.template +## +var.vhosts_dir = server_root + "/vhosts" + +## +## Cache for mod_compress +## +## used in: +## conf.d/compress.conf +## +var.cache_dir = "/var/cache/lighttpd" + +## +## Base directory for sockets. +## +## used in: +## conf.d/fastcgi.conf +## conf.d/scgi.conf +## +var.socket_dir = home_dir + "/sockets" + +## +####################################################################### + +####################################################################### +## ## Load the modules. include "modules.conf" @@ -39,36 +105,6 @@ server.groupname = "lighttpd" ## -## run the server chrooted. -## -## This requires root permissions during startup. -## -## Some Variable definition which will make chrooting easier. -## -## if you add a variable here. Add the corresponding variable in the -## chroot example aswell. -## -var.log_root = "/var/log/lighttpd/" -var.server_root = "/srv/www/" -var.state_dir = "/var/run/" -var.home_dir = "/var/lib/lighttpd/" -var.cache_dir = home_dir + "cache/compress/" -var.vhosts_dir = server_root + "vhosts/" -## -## If you run Chrooted set the the variables to directories relative to -## the chroot dir. -## -## example chroot configuration: -## -#var.log_root = "/logs/" -#var.server_root = "/htdocs/" -#var.state_dir = "/run/" -#var.home_dir = "/lib/lighttpd/" -#var.cache_dir = home_dir + "/cache/compress/" -#var.vhosts_dir = "/vhosts/" -#server.chroot = "/srv/www/" - -## ## enable core files. ## #server.core-files = "disable" @@ -76,17 +112,19 @@ ## ## Document root ## -server.document-root = server_root + "htdocs/" +server.document-root = server_root + "/htdocs" ## ## The value for the "Server:" response field. ## -server.tag = "lighttpd/1.4.10 (SUSE Linux)" +## It would be nice to keep it at "lighttpd". +## +#server.tag = "lighttpd" ## ## store a pid file ## -server.pid-file = state_dir + "lighttpd.pid" +server.pid-file = state_dir + "/lighttpd.pid" ## ####################################################################### @@ -100,7 +138,7 @@ ## ## Path to the error log file ## -server.errorlog = log_root + "error.log" +server.errorlog = log_root + "/error.log" ## ## If you want to log to syslog you have to unset the @@ -163,6 +201,9 @@ ## Changing this setting requires root permissions on startup. see ## server.username/server.groupname. ## +## By default lighttpd would not change the operation system default. +## But setting it to 2048 is a better default for busy servers. +## server.max-fds = 2048 ## @@ -178,10 +219,10 @@ ## ## Fine tuning for the request handling ## -## max-connections == max-fdS/2 (maybe /3) +## max-connections == max-fds/2 (maybe /3) ## means the other file handles are used for fastcgi/files ## -#server.max-connections = 1024 +server.max-connections = 1024 ## ## How many seconds to keep a keep-alive connection open, @@ -254,7 +295,7 @@ ## index-file.names = ( "index.php", "index.rb", "index.html", ## "index.htm", "default.htm" ) ## -index-file.names = ( +index-file.names += ( "index.xhtml", "index.html", "index.htm", "default.htm", "index.php" ) @@ -380,6 +421,6 @@ ## custom includes like vhosts. ## #include "conf.d/config.conf" -#include_shell "cat vhosts.d/*.conf" +#include_shell "cat /etc/lighttpd/vhosts.d/*.conf" ## ####################################################################### diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/modules.conf new/config/modules.conf --- old/config/modules.conf 2006-03-06 01:14:14.000000000 +0100 +++ new/config/modules.conf 2006-10-15 10:47:33.000000000 +0200 @@ -19,7 +19,7 @@ ## ## NOTE: the order of modules is important. ## -## - mod_accesslog -> conf.d/access.log +## - mod_accesslog -> conf.d/access_log.conf ## - mod_compress -> conf.d/compress.conf ## - mod_status -> conf.d/status.conf ## - mod_webdav -> conf.d/webdav.conf @@ -28,7 +28,7 @@ ## - mod_simple_vhost -> conf.d/simple_vhost.conf ## - mod_mysql_vhost -> conf.d/mysql_vhost.conf ## - mod_trigger_b4_dl -> conf.d/trigger_b4_dl.conf -## - mod_userdir -> conf.d/userdir.conf +## - mod_userdir -> conf.d/userdir.conf ## - mod_rrdtool -> conf.d/rrdtool.conf ## - mod_ssi -> conf.d/ssi.conf ## - mod_cgi -> conf.d/cgi.conf @@ -59,6 +59,11 @@ ## ## +## mod_ssi +## +#include "conf.d/ssi.conf" + +## ## mod_status ## #include "conf.d/status.conf" @@ -79,6 +84,11 @@ #include "conf.d/userdir.conf" ## +## mod_magnet +## +#include "conf.d/magnet.conf" + +## ## mod_cml ## #include "conf.d/cml.conf" @@ -117,7 +127,7 @@ #include "conf.d/scgi.conf" ## -## FastCGI (mod_fastcgi) +## FastCGI (mod_fastcgi) ## #include "conf.d/fastcgi.conf" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/vhosts.d/vhosts.template new/config/vhosts.d/vhosts.template --- old/config/vhosts.d/vhosts.template 2006-03-06 01:35:46.000000000 +0100 +++ new/config/vhosts.d/vhosts.template 2006-07-18 02:47:01.000000000 +0200 @@ -13,7 +13,7 @@ ## include "conf.d/trigger_b4_dl.conf" - server.document-root = vhosts_dir + "example.com/download/htdocs" + server.document-root = vhosts_dir + "/example.com/download/htdocs" ## ## use a seperate access log file ## At the moment you cant have different error log files. @@ -25,8 +25,8 @@ server.name = "localhost" ssl.pemfile = "/etc/ssl/private/lighttpd-localhost.pem" ssl.engine = "enable" - - server.document-root = "/srv/www/vhosts/ssl-localhost/pages/" + + server.document-root = vhosts_dir + "/ssl-localhost/pages/" } ## ++++++ lighttpd-1.4.13_geoip.patch ++++++ Index: src/Makefile.am =================================================================== --- src/Makefile.am.orig +++ src/Makefile.am @@ -234,6 +234,10 @@ mod_accesslog_la_SOURCES = mod_accesslog mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined mod_accesslog_la_LIBADD = $(common_libadd) +lib_LTLIBRARIES += mod_geoip.la +mod_geoip_la_SOURCES = mod_geoip.c +mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP hdr = server.h buffer.h network.h log.h keyvalue.h \ response.h request.h fastcgi.h chunk.h \ Index: src/mod_geoip.c =================================================================== --- /dev/null +++ src/mod_geoip.c @@ -0,0 +1,417 @@ +#include <GeoIP.h> +#include <GeoIPCity.h> + +#include <ctype.h> +#include <stdlib.h> +#include <string.h> + +#include "base.h" +#include "log.h" +#include "buffer.h" + +#include "plugin.h" +#include "inet_ntop_cache.h" + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/** + * + * $mod_geoip.c (v2.0) (13.09.2006 00:29:11) + * + * Name: + * mod_geoip.c + * + * Description: + * GeoIP module (plugin) for lighttpd. + * the module loads a geoip database of type "country" or "city" and + * sets new ENV vars based on ip record lookups. + * + * country db env's: + * GEOIP_COUNTRY_CODE + * GEOIP_COUNTRY_CODE3 + * GEOIP_COUNTRY_NAME + * + * city db env's: + * GEOIP_COUNTRY_CODE + * GEOIP_COUNTRY_CODE3 + * GEOIP_COUNTRY_NAME + * GEOIP_CITY_NAME + * GEOIP_CITY_POSTAL_CODE + * GEOIP_CITY_LATITUDE + * GEOIP_CITY_LONG_LATITUDE + * GEOIP_CITY_DMA_CODE + * GEOIP_CITY_AREA_CODE + * + * Usage (configuration options): + * geoip.db-filename = <path to the geoip or geocity database> + * geoip.memory-cache = <enable|disable> : default disabled + * if enabled, mod_geoip will load the database binary file to + * memory for very fast lookups. the only penalty is memory usage. + * + * Author: + * Ami E. Bizamcher (amix) + * duke.amix(a)gmail.com + * + * Note: + * GeoIP Library and API must be installed! + */ + + +/* plugin config for all request/connections */ + +typedef struct { + unsigned short mem_cache; + buffer *db_name; + GeoIP *gi; +} plugin_config; + +typedef struct { + PLUGIN_DATA; + + plugin_config **config_storage; + + plugin_config conf; +} plugin_data; + +/* init the plugin data */ +INIT_FUNC(mod_geoip_init) { + plugin_data *p; + + p = calloc(1, sizeof(*p)); + + return p; +} + +/* detroy the plugin data */ +FREE_FUNC(mod_geoip_free) { + plugin_data *p = p_d; + + UNUSED(srv); + + if (!p) return HANDLER_GO_ON; + + if (p->config_storage) { + size_t i; + + for (i = 0; i < srv->config_context->used; i++) { + plugin_config *s = p->config_storage[i]; + + if (!s) continue; + + buffer_free(s->db_name); + + /* clean up */ + GeoIP_delete(s->gi); + + free(s); + } + free(p->config_storage); + } + + free(p); + + return HANDLER_GO_ON; +} + +/* handle plugin config and check values */ + +SETDEFAULTS_FUNC(mod_geoip_set_defaults) { + plugin_data *p = p_d; + size_t i = 0; + + config_values_t cv[] = { + { "geoip.db-filename", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ + { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ + { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } + }; + + if (!p) return HANDLER_ERROR; + + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); + + for (i = 0; i < srv->config_context->used; i++) { + plugin_config *s; + int mode; + + s = calloc(1, sizeof(plugin_config)); + + s->db_name = buffer_init(); + s->mem_cache = 0; /* default: do not load db to cache */ + s->gi = NULL; + + cv[0].destination = s->db_name; + cv[1].destination = &(s->mem_cache); + + p->config_storage[i] = s; + + if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) { + return HANDLER_ERROR; + } + + mode = GEOIP_STANDARD | GEOIP_CHECK_CACHE; + + /* country db filename is requeried! */ + if (!buffer_is_empty(s->db_name)) { + + /* let's start cooking */ + if (s->mem_cache != 0) + mode = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE; + + if (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) { + log_error_write(srv, __FILE__, __LINE__, "s", + "failed to open GeoIP database!!!"); + + return HANDLER_ERROR; + } + + /* is the db supported ? */ + if (s->gi->databaseType != GEOIP_COUNTRY_EDITION && + s->gi->databaseType != GEOIP_CITY_EDITION_REV0 && + s->gi->databaseType != GEOIP_CITY_EDITION_REV1) { + log_error_write(srv, __FILE__, __LINE__, "s", + "GeoIP database is of unsupported type!!!"); + } + } + } + + return HANDLER_GO_ON; +} + +#define PATCH(x) \ + p->conf.x = s->x; +static int mod_geoip_patch_connection(server *srv, connection *con, plugin_data *p) { + size_t i, j; + plugin_config *s = p->config_storage[0]; + + PATCH(db_name); + PATCH(mem_cache); + PATCH(gi); + + /* skip the first, the global context */ + for (i = 1; i < srv->config_context->used; i++) { + data_config *dc = (data_config *)srv->config_context->data[i]; + s = p->config_storage[i]; + + /* condition didn't match */ + if (!config_check_cond(srv, con, dc)) continue; + + /* merge config */ + for (j = 0; j < dc->value->used; j++) { + data_unset *du = dc->value->data[j]; + + if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.db-filename"))) { + PATCH(db_name); + } + + if (buffer_is_equal_string(du->key, CONST_STR_LEN("geoip.memory-cache"))) { + PATCH(mem_cache); + } + } + } + + return 0; +} +#undef PATCH + +URIHANDLER_FUNC(mod_geoip_subrequest) { + plugin_data *p = p_d; + + mod_geoip_patch_connection(srv, con, p); + + if (!buffer_is_empty(p->conf.db_name)) { + const char *remote_ip; + GeoIP *gi; + data_string *ds; + const char *returnedCountry; + + remote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr)); + + if (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) { + /* get the country code 2 chars */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { + if (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); + buffer_copy_string(ds->value, returnedCountry); + array_insert_unique(con->environment, (data_unset *)ds); + } + } + + /* get the country code 3 chars */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { + if (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); + buffer_copy_string(ds->value, returnedCountry); + array_insert_unique(con->environment, (data_unset *)ds); + } + } + + /* get the country name */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { + if (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); + buffer_copy_string(ds->value, returnedCountry); + array_insert_unique(con->environment, (data_unset *)ds); + } + } + + /* go on... */ + return HANDLER_GO_ON; + } + + /* if we are here, geo city is in use */ + GeoIPRecord * gir; + + if (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) { + /* get the country code 2 chars */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE"); + buffer_copy_string(ds->value, gir->country_code); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the country code 3 chars */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_CODE3"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE3"); + buffer_copy_string(ds->value, gir->country_code3); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the country name */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_COUNTRY_NAME"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_COUNTRY_NAME"); + buffer_copy_string(ds->value, gir->country_name); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the city region */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_REGION"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_CITY_REGION"); + buffer_copy_string(ds->value, gir->region); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the city */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_NAME"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_CITY_NAME"); + buffer_copy_string(ds->value, gir->city); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the postal code */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_POSTAL_CODE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + buffer_copy_string(ds->key, "GEOIP_CITY_POSTAL_CODE"); + buffer_copy_string(ds->value, gir->postal_code); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the latitude */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LATITUDE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + char latitude[32]; + sprintf(&latitude, "%f", gir->latitude); + buffer_copy_string(ds->key, "GEOIP_CITY_LATITUDE"); + buffer_copy_string(ds->value, latitude); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the long latitude */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_LONG_LATITUDE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + char long_latitude[32]; + sprintf(&long_latitude, "%f", gir->longitude); + buffer_copy_string(ds->key, "GEOIP_CITY_LONG_LATITUDE"); + buffer_copy_string(ds->value, long_latitude); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the dma code */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_DMA_CODE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + char dc[5]; + sprintf(&dc, "%i", gir->dma_code); + buffer_copy_string(ds->key, "GEOIP_CITY_DMA_CODE"); + buffer_copy_string(ds->value, dc); + array_insert_unique(con->environment, (data_unset *)ds); + } + + /* get the area code */ + if (NULL == (ds = (data_string *)array_get_element(con->environment, "GEOIP_CITY_AREA_CODE"))) { + if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) { + ds = data_string_init(); + } + + char ac[5]; + sprintf(&ac, "%i", gir->area_code); + buffer_copy_string(ds->key, "GEOIP_CITY_AREA_CODE"); + buffer_copy_string(ds->value, ac); + array_insert_unique(con->environment, (data_unset *)ds); + } + } + } + + /* keep walking... (johnnie walker style ;) */ + return HANDLER_GO_ON; +} + +/* this function is called at dlopen() time and inits the callbacks */ + +int mod_geoip_plugin_init(plugin *p) { + p->version = LIGHTTPD_VERSION_ID; + p->name = buffer_init_string("geoip"); + + p->init = mod_geoip_init; + p->handle_subrequest_start = mod_geoip_subrequest; + p->set_defaults = mod_geoip_set_defaults; + p->cleanup = mod_geoip_free; + + p->data = NULL; + + return 0; +} Index: doc/geoip.txt =================================================================== --- /dev/null +++ doc/geoip.txt @@ -0,0 +1,148 @@ +{{{ +#!rst +============================== +ip based geographic lookups... +============================== + +----------------- +Module: mod_geoip +----------------- + + + +.. contents:: Table of Contents + +Requirements +============ + +:Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/) + +Overview +======== + +mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / +GeoCity databases. +If the ip was found in the database the module sets the appropriate +environments variables to the request, thus making other modules/fcgi be +informed. + +.. note:: + + Currently only country/city databases are supported because they have a free + version that i can test. + +Configuration Options +======================== + +mod_geoip uses two configuration options. + +1) geoip.db-filename = <path to the geoip or geocity database> +2) geoip.memory-cache = <enable|disable> : default disabled + +if enabled, mod_geoip will load the database binary file to +memory for very fast lookups. the only penalty is memory usage. + +.. note:: + + mod_geoip will determine the database type automatically so if you enter + GeoCity databse path it will load GeoCity Env. + +Environment +=========== + +Every database sets it's own ENV: + +GeoIP (Country): +---------------- + +:: + + GEOIP_COUNTRY_CODE + GEOIP_COUNTRY_CODE3 + GEOIP_COUNTRY_NAME + +GeoCity: +-------- + +:: + + GEOIP_COUNTRY_CODE + GEOIP_COUNTRY_CODE3 + GEOIP_COUNTRY_NAME + GEOIP_CITY_NAME + GEOIP_CITY_POSTAL_CODE + GEOIP_CITY_LATITUDE + GEOIP_CITY_LONG_LATITUDE + GEOIP_CITY_DMA_CODE + GEOIP_CITY_AREA_CODE + +Examples +======== + +mod_geoip + php +--------------- + +when using fastcgi (not only php) you can access mod_geoip env and do as you +please. this example just prints all mod_geoip envs to the client, html. + +Config-file :: + + geoip.db-filename = "/your-geoip-db-path/GeoCityLite.dat" + geoip.memory-cache = "enable" + +index.php :: + + <?php + $country_code = $_SERVER['GEOIP_COUNTRY_CODE']; + $country_code3 = $_SERVER['GEOIP_COUNTRY_CODE3']; + $country_name = $_SERVER['GEOIP_COUNTRY_NAME']; + + $city_region = $_SERVER['GEOIP_CITY_REGION']; + $city_name = $_SERVER['GEOIP_CITY_NAME']; + $city_postal_code = $_SERVER['GEOIP_CITY_POSTAL_CODE']; + $city_latitude = $_SERVER['GEOIP_CITY_LATITUDE']; + $city_long_latitude = $_SERVER['GEOIP_CITY_LONG_LATITUDE']; + $city_dma_code = $_SERVER['GEOIP_CITY_DMA_CODE']; + $city_area_code = $_SERVER['GEOIP_CITY_AREA_CODE']; + + echo "<html>\n<body>\n\t \n"; + echo 'Country Code: ' . $country_code . ' '; + echo 'Country Code 3: ' . $country_code3 . ' '; + echo 'Country Name: ' . $country_name . ' '; + echo ' '; + echo 'City Region: ' . $city_region . ' '; + echo 'City Name: ' . $city_name . ' '; + echo 'City Postal Code: ' . $city_postal_code . ' '; + echo 'City Latitude: ' . $city_latitude . ' '; + echo 'City Long Latitude: ' . $city_long_latitude . ' '; + echo 'City DMA Code: ' . $city_dma_code . ' '; + echo 'City Area Code: ' . $city_area_code . ' '; + echo "</html>\n</body>"; + ?> + +country based redirect +---------------------- + +Config-file :: + + $HTTP["host"] =~ "www.domain.com" { + url.rewrite = ( "" => "/redirect.php") + } + +redirect.php :: + + <?php + $country_code = $_SERVER['GEOIP_COUNTRY_CODE']; + header ('Location: http://' . $country_code . '.domain.com/'); + ?> + +.. note:: + + Currently it is not possible to redirect based on mod_geoip directly in +lighttpd config file. But i believe with the relase of lighttpd mod_magnet +it would be. (mod_magnet will be available in lighttpd 1.4.12+) + +Downloads +========= +mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c) +}}} ++++++ lighttpd-1.4.13.tar.bz2 -> lighttpd-1.4.16.tar.bz2 ++++++ ++++ 41168 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pylint
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package pylint checked in at Mon Jul 30 21:43:32 CEST 2007. -------- --- pylint/pylint.changes 2006-09-26 14:59:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/pylint/pylint.changes 2007-07-30 17:48:05.436209000 +0200 @@ -1,0 +2,55 @@ +Tue Jul 17 01:59:42 CEST 2007 - garloff(a)suse.de + +- Update to pylint 0.13.2: + * fix disable-checker option so that it won't accidentally enable the + rpython checker which is disabled by default + * added note about the gedit plugin into documentation +- Update to pylint 0.13.1: + * fix some unexplained 0.13.0 packaging issue which led a bunch of + files missing from the distribution +- Update to pylint 0.13.0: + * new RPython (Restricted Python) checker for PyPy felow or people + wanting to get a compiled version of their python program using the + translator of the PyPy project. For more information about PyPy or + RPython, visit http://codespeak.net/pypy/ + * new E0104 and E0105 messages introduced to respectivly warn about + "return" and "yield" outside function or method + * new E0106 message when "yield" and "return something" are mixed in a + function or method + * new W0107 message for unnecessary pass statement + * new W0614 message to differentiate between unused 'import X' and + unused 'from X import *" (#3209, patch submitted by Daniel Drake) + * included Daniel Drake's patch to have a different message E1003 instead of + E1001 when a missing member is found but an inference failure has been + detected + * msvs reporter for Visual Studio line number reporting (#3285) + * allow disable-all option inline (#3218, patch submitted by Daniel Drake) + * --init-hook option to call arbitray code necessary to set + environment (eg sys.path) (#3156) + * One more Daniel's patch fixing a command line option parsing + problem, this'll definitly be the DDrake release :) + * fix #3184: crashes on "return" outside function + * fix #3205: W0704 false positive + * fix #3123: W0212 false positive on static method + * fix #2485: W0222 false positive + * fix #3259: when a message is explicitly enabled, check the checker + emitting it is enabled +- Update to pylint 0.12.2: + * fix #3143: W0233 bug w/ YES objects + * fix #3119: Off-by-one error counting lines in a file + * fix #3117: ease sys.stdout overriding for reporters + * fix #2508: E0601 false positive with lambda + * fix #3125: E1101 false positive and a message duplication. Only the last part + is actually fixed since the initial false positive is due to dynaming setting of + attributes on the decimal.Context class. + * fix #3149: E0101 false positives and introduced E0100 for generator __init__ + methods + * fixed some format checker false positives +- Update to pylint 0.12.1: + * fixed python >= 2.4 format false positive with multiple lines statement + * fixed some 2.5 issues + * fixed generator expression scope bug (depends on astng 0.16.1) + * stop requiring __revision__ + + +------------------------------------------------------------------- Old: ---- pylint-0.12.0.tar.bz2 New: ---- pylint-0.13.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pylint.spec ++++++ --- /var/tmp/diff_new_pack.F13131/_old 2007-07-30 21:42:14.000000000 +0200 +++ /var/tmp/diff_new_pack.F13131/_new 2007-07-30 21:42:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pylint (Version 0.12.0) +# spec file for package pylint (Version 0.13.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,11 +13,11 @@ Name: pylint BuildRequires: python-devel Summary: Syntax and style checker for Python code -Version: 0.12.0 +Version: 0.13.2 Release: 1 Source: %{name}-%{version}.tar.bz2 #Patch: %{name}-%{version}.patch -License: GPL +License: GPL v2 or later Group: Development/Languages/Python URL: http://www.logilab.org/projects/pylint/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +75,58 @@ %{py_sitedir}/pylint %{py_sitedir}/*egg-info -%changelog -n pylint +%changelog +* Tue Jul 17 2007 - garloff(a)suse.de +- Update to pylint 0.13.2: + * fix disable-checker option so that it won't accidentally enable the + rpython checker which is disabled by default + * added note about the gedit plugin into documentation +- Update to pylint 0.13.1: + * fix some unexplained 0.13.0 packaging issue which led a bunch of + files missing from the distribution +- Update to pylint 0.13.0: + * new RPython (Restricted Python) checker for PyPy felow or people + wanting to get a compiled version of their python program using the + translator of the PyPy project. For more information about PyPy or + RPython, visit http://codespeak.net/pypy/ + * new E0104 and E0105 messages introduced to respectivly warn about + "return" and "yield" outside function or method + * new E0106 message when "yield" and "return something" are mixed in a + function or method + * new W0107 message for unnecessary pass statement + * new W0614 message to differentiate between unused 'import X' and + unused 'from X import *" (#3209, patch submitted by Daniel Drake) + * included Daniel Drake's patch to have a different message E1003 instead of + E1001 when a missing member is found but an inference failure has been + detected + * msvs reporter for Visual Studio line number reporting (#3285) + * allow disable-all option inline (#3218, patch submitted by Daniel Drake) + * --init-hook option to call arbitray code necessary to set + environment (eg sys.path) (#3156) + * One more Daniel's patch fixing a command line option parsing + problem, this'll definitly be the DDrake release :) + * fix #3184: crashes on "return" outside function + * fix #3205: W0704 false positive + * fix #3123: W0212 false positive on static method + * fix #2485: W0222 false positive + * fix #3259: when a message is explicitly enabled, check the checker + emitting it is enabled +- Update to pylint 0.12.2: + * fix #3143: W0233 bug w/ YES objects + * fix #3119: Off-by-one error counting lines in a file + * fix #3117: ease sys.stdout overriding for reporters + * fix #2508: E0601 false positive with lambda + * fix #3125: E1101 false positive and a message duplication. Only the last part + is actually fixed since the initial false positive is due to dynaming setting of + attributes on the decimal.Context class. + * fix #3149: E0101 false positives and introduced E0100 for generator __init__ + methods + * fixed some format checker false positives +- Update to pylint 0.12.1: + * fixed python >= 2.4 format false positive with multiple lines statement + * fixed some 2.5 issues + * fixed generator expression scope bug (depends on astng 0.16.1) + * stop requiring __revision__ * Tue Sep 26 2006 - cthiel(a)suse.de - fix build with python 2.5 - update to version 0.12.0 @@ -173,7 +224,7 @@ * print a warning (W0212) for methods that could be a function. * new --defining-attr-methods option on classes checker. * new --acquired-members option on the classes checker, used when ---zope=yes to avoid false positive on acquired attributes (listed + --zope=yes to avoid false positive on acquired attributes (listed using this new option). * generate one E0602 for each use of an undefined variable (previously, only one for the first use but not for the following). ++++++ pylint-0.12.0.tar.bz2 -> pylint-0.13.2.tar.bz2 ++++++ ++++ 8040 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-logilab-common
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package python-logilab-common checked in at Mon Jul 30 21:40:26 CEST 2007. -------- --- python-logilab-common/python-logilab-common.changes 2006-09-26 15:56:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-logilab-common/python-logilab-common.changes 2007-07-30 17:44:59.302527000 +0200 @@ -1,0 +2,80 @@ +Tue Jul 17 01:31:39 CEST 2007 - garloff(a)suse.de + +- Update to 0.22.2: + * new 'typechanged' action for configuration.read_old_config +- Update to 0.22.1: + * important bug fix in bd.py + * added history in pytest debugger sessions + * fix pytest coverage bug + * fix textutils test + * fix a bug which provoqued a crash if devtools was not installed +- Update to 0.22.0: + * pytest improvements + * shellutils: use shutil.move instead of os.rename as default + action of mv + * db: new `list_users` and `sql_drop_unique_constraint` methods i + on advanced helpers + * deprecation: new `obsolete` decorator +- Update to 0.21.3: + * fixed cached decorator to use __dict__ instead of attribute lookup, + avoiding potential bugs with inheritance when using cached class + methods +- Update to 0.21.2: + * fix ReST normalization (#3471) +- Update to 0.21.1: + * tree: make Node iterable (iter on its children) + * configuration: fix #3197 (OptionsManagerMixin __init__ isn't passing + correctly its "version" argument) + * textutils: new 'rest' argument to normalize_text to better deal with + ReST formated text + * some packaging fixes +- Update to 0.21.0: + * db: + - new optional keepownership argument to backup|restore_database methods + - only register mxDatetime converters on psycopg2 adapter if + mx.DateTime is available + * moved some stuff which was in common __init__ file into specific + module. At this occasion new "decorators" and "deprecation" modules + has been added + * deprecated fileutils.[files_by_ext,include_files_by_ext,exclude_files_by_ext] + functions in favor of new function shellutils.find + * mark the following modules for deprecation, they will be removed in a + near version: + - astutils: moved to astng + - bind (never been used) + - html: deprecated + - logger/logservice: use logging module + - monclient/monserver (not used anymore) + - patricia (never been used) + - twisted_distutils (not used anymore) + * removed the following functions/methods which have been deprecated for a + while now: + - modutils.load_module_from_parts + - textutils.searchall + - tree.Node.leafs + - fileutils.get_by_ext, filetutils.get_mode, fileutils.ensure_mode + - umessage: more robust charset handling +- Update to 0.20.2: + * fileutils: new remove_dead_links function + * date: add missing strptime import +- Update to 0.20.1: + * umessage: + - new message_from_string function + - fixed get_payload encoding bug + * db: default postgres module is now psycopg2, which has been customized + to return mx.Datetime objects for date/time related types +- Update to 0.20.0: + * db: + - fixed date handling + - new methods on advanced helper to generate backup commands + * configuration: basic deprecated config handling support + * new implementation of pytest + * backport a dot backend from yams into a new "graph" module +- Update to 0.19.3: + * fixed bug in textutils.normalise_[text|paragraph] with unsplitable + word larger than the maximum line size + * added pytest.bat for windows installation + * changed configuration.generate_config to include None values into the + generated file + +------------------------------------------------------------------- Old: ---- common-0.19.2.tar.bz2 New: ---- logilab-common-0.22.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-logilab-common.spec ++++++ --- /var/tmp/diff_new_pack.K32157/_old 2007-07-30 21:39:28.000000000 +0200 +++ /var/tmp/diff_new_pack.K32157/_new 2007-07-30 21:39:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-logilab-common (Version 0.19.2) +# spec file for package python-logilab-common (Version 0.22.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,11 +12,11 @@ Name: python-logilab-common Summary: Python lowlevel functionality shared by logilab projects -Version: 0.19.2 +Version: 0.22.2 Release: 1 BuildRequires: python-devel -Source: common-%{version}.tar.bz2 -License: GPL +Source: logilab-common-%{version}.tar.bz2 +License: GPL v2 or later Group: Development/Languages/Python URL: http://www.logilab.org/projects/common/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,14 +62,94 @@ %files -f INSTALLED_FILES %defattr(-,root,root) -%doc doc/* ChangeLog README +%doc ChangeLog README +# %doc ureports +# %doc test # FIXME: Why are these not part of INSTALLED_FILES ? %{py_sitedir}/logilab/__init__.py %{py_sitedir}/logilab/common/test/data/*.txt %{py_sitedir}/logilab/common/test/data/*.msg %{py_sitedir}/logilab/common/test/data/sub +%{py_sitedir}/logilab/common/test/data/test.ini -%changelog -n python-logilab-common +%changelog +* Tue Jul 17 2007 - garloff(a)suse.de +- Update to 0.22.2: + * new 'typechanged' action for configuration.read_old_config +- Update to 0.22.1: + * important bug fix in bd.py + * added history in pytest debugger sessions + * fix pytest coverage bug + * fix textutils test + * fix a bug which provoqued a crash if devtools was not installed +- Update to 0.22.0: + * pytest improvements + * shellutils: use shutil.move instead of os.rename as default + action of mv + * db: new `list_users` and `sql_drop_unique_constraint` methods i + on advanced helpers + * deprecation: new `obsolete` decorator +- Update to 0.21.3: + * fixed cached decorator to use __dict__ instead of attribute lookup, + avoiding potential bugs with inheritance when using cached class + methods +- Update to 0.21.2: + * fix ReST normalization (#3471) +- Update to 0.21.1: + * tree: make Node iterable (iter on its children) + * configuration: fix #3197 (OptionsManagerMixin __init__ isn't passing + correctly its "version" argument) + * textutils: new 'rest' argument to normalize_text to better deal with + ReST formated text + * some packaging fixes +- Update to 0.21.0: + * db: + - new optional keepownership argument to backup|restore_database methods + - only register mxDatetime converters on psycopg2 adapter if + mx.DateTime is available + * moved some stuff which was in common __init__ file into specific + module. At this occasion new "decorators" and "deprecation" modules + has been added + * deprecated fileutils.[files_by_ext,include_files_by_ext,exclude_files_by_ext] + functions in favor of new function shellutils.find + * mark the following modules for deprecation, they will be removed in a + near version: + - astutils: moved to astng + - bind (never been used) + - html: deprecated + - logger/logservice: use logging module + - monclient/monserver (not used anymore) + - patricia (never been used) + - twisted_distutils (not used anymore) + * removed the following functions/methods which have been deprecated for a + while now: + - modutils.load_module_from_parts + - textutils.searchall + - tree.Node.leafs + - fileutils.get_by_ext, filetutils.get_mode, fileutils.ensure_mode + - umessage: more robust charset handling +- Update to 0.20.2: + * fileutils: new remove_dead_links function + * date: add missing strptime import +- Update to 0.20.1: + * umessage: + - new message_from_string function + - fixed get_payload encoding bug + * db: default postgres module is now psycopg2, which has been customized + to return mx.Datetime objects for date/time related types +- Update to 0.20.0: + * db: + - fixed date handling + - new methods on advanced helper to generate backup commands + * configuration: basic deprecated config handling support + * new implementation of pytest + * backport a dot backend from yams into a new "graph" module +- Update to 0.19.3: + * fixed bug in textutils.normalise_[text|paragraph] with unsplitable + word larger than the maximum line size + * added pytest.bat for windows installation + * changed configuration.generate_config to include None values into the + generated file * Tue Sep 26 2006 - cthiel(a)suse.de - fix build with python 2.5 - update to version 0.19.2 @@ -149,8 +229,8 @@ - Update to 0.13.0: * testlib: ability to skip a test * configuration: -- cleaner configuration file generation -- refactoring so that we can have more control on file + - cleaner configuration file generation + - refactoring so that we can have more control on file configuration loading using read_config_file and load_config_file instead of load_file_configuration * modutils: fix is_relative to return False when from_file is a file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit psqlODBC
by root＠Hilbert.suse.de 30 Jul '07

30 Jul '07

Hello community, here is the log from the commit of package psqlODBC checked in at Mon Jul 30 21:34:31 CEST 2007. -------- --- psqlODBC/psqlODBC.changes 2006-12-13 15:55:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/psqlODBC/psqlODBC.changes 2007-07-30 21:32:44.141363000 +0200 @@ -1,0 +2,36 @@ +Mon Jul 30 16:08:23 CEST 2007 - max(a)suse.de + +- New version: 08.02.0400. Changes include: + * Ditinguish the indicaitor and the octet_length field of APD + clearly. + * Handle @@IDENTITY more generally. + * Take outer join into account so as to evaluate nullability. + * Fix a bug about Keyset-driven cursors. + * Change to use NULL indicator instead of the length buffer in + SQLFetch. + * Fix a bug which forgets unnamed plans too early especially when + handling large objects. + * Don't treat charcters whose value >= 128 as alphanumeric in case + of conversion of binary data to bytea. + * Change ConfigDSN() so that it takes the options in Setup Dialog + page 1 into account. + * Simplify the memory management of statements'columns info so as to + prevent memory leaks or a crash in parse_statement etc. + * SQLTables("", SQL_ALL_SCHEMAS. "", ..) now returns a list of valid + schemas. + * SQLTables("", "", "", SQL_ALL_TABLE_TYPES) now returns a list of + valid table types. + * SQLGetInfo SQL_DATABASE_NAME now returns the database name. + * Treat the tables in information_schema as system tables. + * Correct the precision of SQL_NUMERIC_STRUCT. + * Change the default max varchar size from 254 to 255. + * Reset the fields information properly in case of SQLMoreResults. + * Implement SQLDescribeParam() also in case of multi-command queries. + * Handle dollar-quotes more properly. + * Append DETAIL messages to GetDiag...() messages. + * Remove WSAStartup() and WSACleanup() from DllMain. + * Load libpq from the driver's folder. + * Improve the implemetation of SQLSetPos(.., SQL_ADD/SQL_UPDATE) + using the 8.2 new feature INSERT/UPDATE .. returning. + +------------------------------------------------------------------- Old: ---- psqlodbc-08.02.0200.tar.bz2 New: ---- psqlodbc-08.02.0400.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psqlODBC.spec ++++++ --- /var/tmp/diff_new_pack.D23968/_old 2007-07-30 21:33:54.000000000 +0200 +++ /var/tmp/diff_new_pack.D23968/_new 2007-07-30 21:33:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package psqlODBC (Version 08.02.0200) +# spec file for package psqlODBC (Version 08.02.0400) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,9 +15,9 @@ URL: http://pgfoundry.org/projects/psqlodbc %define tarname psqlodbc Summary: ODBC Driver for PostgreSQL -Version: 08.02.0200 +Version: 08.02.0400 Release: 1 -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: LGPL v2 or later Group: Productivity/Databases/Clients Source0: %tarname-%{version}.tar.bz2 Patch1: psqlODBC-literal.patch @@ -69,7 +69,40 @@ %doc *.txt docs/* %_libdir/psql* -%changelog -n psqlODBC +%changelog +* Mon Jul 30 2007 - max(a)suse.de +- New version: 08.02.0400. Changes include: + * Ditinguish the indicaitor and the octet_length field of APD + clearly. + * Handle @@IDENTITY more generally. + * Take outer join into account so as to evaluate nullability. + * Fix a bug about Keyset-driven cursors. + * Change to use NULL indicator instead of the length buffer in + SQLFetch. + * Fix a bug which forgets unnamed plans too early especially when + handling large objects. + * Don't treat charcters whose value >= 128 as alphanumeric in case + of conversion of binary data to bytea. + * Change ConfigDSN() so that it takes the options in Setup Dialog + page 1 into account. + * Simplify the memory management of statements'columns info so as to + prevent memory leaks or a crash in parse_statement etc. + * SQLTables("", SQL_ALL_SCHEMAS. "", ..) now returns a list of valid + schemas. + * SQLTables("", "", "", SQL_ALL_TABLE_TYPES) now returns a list of + valid table types. + * SQLGetInfo SQL_DATABASE_NAME now returns the database name. + * Treat the tables in information_schema as system tables. + * Correct the precision of SQL_NUMERIC_STRUCT. + * Change the default max varchar size from 254 to 255. + * Reset the fields information properly in case of SQLMoreResults. + * Implement SQLDescribeParam() also in case of multi-command queries. + * Handle dollar-quotes more properly. + * Append DETAIL messages to GetDiag...() messages. + * Remove WSAStartup() and WSACleanup() from DllMain. + * Load libpq from the driver's folder. + * Improve the implemetation of SQLSetPos(.., SQL_ADD/SQL_UPDATE) + using the 8.2 new feature INSERT/UPDATE .. returning. * Wed Dec 13 2006 - max(a)suse.de - Avoid literal string comparison (#228225) - New version: 08.02.0200 ++++++ psqlodbc-08.02.0200.tar.bz2 -> psqlodbc-08.02.0400.tar.bz2 ++++++ ++++ 48657 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0