Add GPL to the directory.

svn path=/trunk/webapp-config/; revision=54

4 files changed, 386 insertions, 100 deletions

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 70669c6..10f45c8 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -9,7 +9,7 @@ Code authors:
 
         Stuart Herbert <stuart@gentoo.org>
         Renat Lumpau <rl03@gentoo.org>
-        Gunnar Wrobel  <php@gunnarwrobel.de>
+        Gunnar Wrobel  <wrobel@gentoo.org>
 
 Significant contributors (testing, review, design suggestions):
 	
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..5a965fb
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/ChangeLog b/ChangeLog
index 440d066..50c8a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,47 +1,55 @@
+2007-09-12  Gunnar Wrobel  <p@rdus.de>
+
+	* sbin/webapp-cleaner:
+
+	Merge fix from rl03 for #177775.
+	http://bugs.gentoo.org/show_bug.cgi?id=177775
+	svn merge -r51:52 branches/rl03/trunk/ trunk/
+
 2007-05-11  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/config.py (Config): 
+	* WebappConfig/config.py (Config):
 
 	Fixed the way the target directory for a portage install is set.
 
 
 2007-04-28  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/*.py: 
+	* WebappConfig/*.py:
 
 	Support categories, support paludis.  Allow absolute paths, fix
 	config variable import, updated sandbox.
 
-2006-12-30  Gunnar Wrobel  <wrobel@pardus.de>
+2006-12-30  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/*.py: 
+	* WebappConfig/*.py:
 
 	Fixed copyright years.
-	
-	* WebappConfig/content.py (Contents.get_canremove): 
+
+	* WebappConfig/content.py (Contents.get_canremove):
 
 	Fixed doc testing for older get_canremove fix.
 
-	* WebappConfig/ebuild.py (Ebuild.run_vars): 
+	* WebappConfig/ebuild.py (Ebuild.run_vars):
 
 	Fixed doc testing for uid/gid fixes.
 
-	* WebappConfig/config.py (Config.__init__, Config.get_perm): 
+	* WebappConfig/config.py (Config.__init__, Config.get_perm):
 
 	Fixed uid/gid BDS problems (bugs #104652 and #149939)
 
 	Fixed type in get_perm (bug #133530)
-	
-	* WebappConfig/permissions.py (PermissionMap): 
+
+	* WebappConfig/permissions.py (PermissionMap):
 
 	Fixed permission map parsing (bug #146059)
 
-	* WebappConfig/wrapper.py (package_installed): 
+	* WebappConfig/wrapper.py (package_installed):
 
 	Added support for package.provided when detecting installed
 	packages (bug #139965)
-	
-2006-04-21    <post@gunnarwrobel.de>
+
+2006-04-21  Gunnar Wrobel  <p@rdus.de>
 
 	* doc/webapp-config.8.xml: Added -D and -E description.
 	Fixed upgrade instructions. Bug #129167
@@ -56,18 +64,18 @@
 	* WebappConfig/server.py (Cherokee): Added cherokee
 	support. Bug #129359
 
-	* WebappConfig/config.py (Config.split_hostname): 
+	* WebappConfig/config.py (Config.split_hostname):
 	Added support for splitting hostnames into subdomains.
 	Bug #126486
 
-	* WebappConfig/wrapper.py: Added types import. 
+	* WebappConfig/wrapper.py: Added types import.
 	Bug #126534
 
-2006-03-06    <post@gunnarwrobel.de>
+2006-03-06  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/version.py: Version bump to 1.50.13
 
-	* WebappConfig/wrapper.py: Fix for the libdir 
+	* WebappConfig/wrapper.py: Fix for the libdir
 	problem (see bug #125156)
 
 	* WebappConfig/sandbox.py (Sandbox.__init__): Second
@@ -81,55 +89,55 @@
 	* WebappConfig/sandbox.py (Sandbox.__init__): Added
 	possible amd64 libdir fix
 
-2006-02-28    <post@gunnarwrobel.de>
+2006-02-28  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/db.py (WebappSource.packageavail): 
+	* WebappConfig/db.py (WebappSource.packageavail):
 	Adapted to change in package_installed
 
-	* WebappConfig/wrapper.py (package_installed): 
+	* WebappConfig/wrapper.py (package_installed):
 	Fixed logic to allow for non-exact checks
 
 	* WebappConfig/server.py (Basic.__init__): Added check
 	for installed web server.
 	(Basic.supported): Added package check.
 
-2006-01-30    <post@gunnarwrobel.de>
+2006-01-30  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/db.py (WebappSource.get_source_files): 
+	* WebappConfig/db.py (WebappSource.get_source_files):
 	Added array sorting.
-	(WebappSource.get_source_directories): 
+	(WebappSource.get_source_directories):
 	Added array sorting.
 
-	* WebappConfig/ebuild.py (Ebuild.run_vars): Fixed 
+	* WebappConfig/ebuild.py (Ebuild.run_vars): Fixed
 	pass-through of the server variable and modified
 	the uid/gid extraction to result in readable names.
 
 	* WebappConfig/server.py (Basic.install): Showing the
 	instructions now includes the server argument.
 
-2006-01-29    <post@gunnarwrobel.de>
+2006-01-29  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/config.py (Config.run): Both 
-	vhost_config_virtual_files and 
+	* WebappConfig/config.py (Config.run): Both
+	vhost_config_virtual_files and
 	vhost_config_default_dirs were ignored. Fixed.
 
-2006-01-27    <post@gunnarwrobel.de>
+2006-01-27  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/version.py: Version bump to 1.50.9
 
 	* WebappConfig/server.py (Basic): Fixed
 	behaviour for upgrades. Now shows upgrade instructions
 
-	* WebappConfig/config.py (BashConfigParser.get): 
-	Fixed error message for a problematic configuration 
+	* WebappConfig/config.py (BashConfigParser.get):
+	Fixed error message for a problematic configuration
 	configuration file.
 
-2006-01-13    <post@gunnarwrobel.de>
+2006-01-13  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/content.py (Contents.get_canremove): 
+	* WebappConfig/content.py (Contents.get_canremove):
 	Fix for recognizing config protected files
 
-	* WebappConfig/worker.py (WebappAdd.mkfile): 
+	* WebappConfig/worker.py (WebappAdd.mkfile):
 	Fix for recognizing config protected files
 
 	* WebappConfig/filetype.py (FileType.__init__): New
@@ -141,10 +149,10 @@
 	* WebappConfig/server.py (Basic.__init__): Setting
 	server permissions for config-server-owned
 
-	* WebappConfig/config.py (Config.create_permissions): 
+	* WebappConfig/config.py (Config.create_permissions):
 	Added permissions for config-server-owned
 
-2006-01-09    <post@gunnarwrobel.de>
+2006-01-09  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/version.py: Releasing .7
 
@@ -157,14 +165,14 @@
 	* WebappConfig/ebuild.py (Ebuild.run_vars): Fixed
 	VHOST_SERVER_UID (see ticket #40 -> www.vhost-tools.org)
 
-2006-01-05    <post@gunnarwrobel.de>
+2006-01-05  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/worker.py (WebappAdd.mkfile): Fix to 
+	* WebappConfig/worker.py (WebappAdd.mkfile): Fix to
 	support broken symlinks.
 
-2006-01-04    <post@gunnarwrobel.de>
+2006-01-04  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/db.py (WebappSource.reportpackageavail): 
+	* WebappConfig/db.py (WebappSource.reportpackageavail):
 	Removed problematic doc tests.
 
 	* WebappConfig/version.py: Version 1.50.5
@@ -183,82 +191,82 @@
 	* ebuild/webapp-config-1.50.4.ebuild (src_test): Added
 	testing function.
 
-2005-12-28    <post@gunnarwrobel.de>
+2005-12-28  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/content.py (Contents.read): Fixed a 
+	* WebappConfig/content.py (Contents.read): Fixed a
 	problem that I introduced with 1.50.3. The cleaning of
 	the hostroot dir did not work anymore.
 
 	* WebappConfig/version.py: Version 1.50.4
 
-	* WebappConfig/db.py (WebappSource.get_source_files): 
+	* WebappConfig/db.py (WebappSource.get_source_files):
 	Tried to fix the symlinking problem.
 
-	* WebappConfig/config.py (Config.setinstalldir): 
+	* WebappConfig/config.py (Config.setinstalldir):
 	Fixed trailing slashes for the installdir (bug #115765)
 
-2005-12-09    <post@gunnarwrobel.de>
+2005-12-09  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/content.py (Contents.write): Fixed
 	handling of content file between upgrades.
 
-2005-12-07    <post@gunnarwrobel.de>
+2005-12-07  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/config.py (Config.create_permissions): 
+	* WebappConfig/config.py (Config.create_permissions):
 	Removed "root" reference and modified group owner
 	from "root" to config user gid. Unclear why the bash
 	version used root here.
 
-	* WebappConfig/server.py (Basic.set_server_user): 
+	* WebappConfig/server.py (Basic.set_server_user):
 	Removed "root" reference.
 
-2005-11-30    <post@gunnarwrobel.de>
+2005-11-30  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/ebuild.py (Ebuild.run_vars): Added 
+	* WebappConfig/ebuild.py (Ebuild.run_vars): Added
 	MY_HOSTROOTDIR to the exported variables.
 
 	Added doctests for the last two changes.
 
-2005-11-27    <post@gunnarwrobel.de>
+2005-11-27  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/ebuild.py (Ebuild.run_hooks): Reverted 
+	* WebappConfig/ebuild.py (Ebuild.run_hooks): Reverted
 	hook logic. Stupid mistake. Thanks Renat!
 
-2005-11-07    <post@gunnarwrobel.de>
+2005-11-07  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/db.py (AppHierarchy.list_locations): 
+	* WebappConfig/db.py (AppHierarchy.list_locations):
 	Improved handling of situations where the user only
 	specifies the project name.
-	(AppHierarchy.list_locations): 
-	Fixes for --listunsed which did not report unused 
+	(AppHierarchy.list_locations):
+	Fixes for --listunsed which did not report unused
 	packages.
 
-	* WebappConfig/config.py (Config.run): Fixed call for 
+	* WebappConfig/config.py (Config.run): Fixed call for
 	list-installs
 
 	* WebappConfig/server.py (Basic.upgrade): Added support
 	for switching packages during upgrading
 
-	* WebappConfig/config.py: Removed upgrade check, added 
+	* WebappConfig/config.py: Removed upgrade check, added
 	warnings.
 
 	* Many changes to remove --force-virtual support
 
-2005-11-06    <post@gunnarwrobel.de>
+2005-11-06  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/server.py (Basic.install): Fixed
 	creation of the root directory
 
-	* WebappConfig/content.py (Contents.check_installdir): 
+	* WebappConfig/content.py (Contents.check_installdir):
 	Moved check for the installation directory to a better
 	place
 
 	* WebappConfig/config.py: Fixed permission issues
 
-	* WebappConfig/worker.py (WebappAdd.mkfile): Fixed 
+	* WebappConfig/worker.py (WebappAdd.mkfile): Fixed
 	messages while linking.
 
-	* WebappConfig/config.py (Config.create_server): 
+	* WebappConfig/config.py (Config.create_server):
 	Fixed soft linking.
 
 	* WebappConfig/protect.py: Fixed some bugs concerning
@@ -269,47 +277,47 @@
 
 	* WebappConfig/filetype.py: Fixed double slashes.
 
-	* WebappConfig/server.py: Adapted to the new user/group 
+	* WebappConfig/server.py: Adapted to the new user/group
 	handliing
 
-	* WebappConfig/wrapper.py: Fixed import statement from 
+	* WebappConfig/wrapper.py: Fixed import statement from
 	gentoolkit
 
-	* WebappConfig/config.py: Adapted to the new user/group 
+	* WebappConfig/config.py: Adapted to the new user/group
 	handliing
 
-	* WebappConfig/worker.py: Adapted to the new user/group 
+	* WebappConfig/worker.py: Adapted to the new user/group
 	handliing
 
 	* WebappConfig/permissions.py: Added functions get_user and
 	get_group to handle numerical uid's and gid's
 
-	* doc/webapp-config.8.xml: Fixed instructions concerning 
+	* doc/webapp-config.8.xml: Fixed instructions concerning
 	numerical uid and gid
 
 	* config/webapp-config: Removed fixmes concerning numerical
 	uid and gid
 
-2005-11-05    <post@gunnarwrobel.de>
+2005-11-05  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/permissions.py: Added the permission handler.
 
 	* sbin/webapp-config: pylintification.
 
-2005-11-03    <post@gunnarwrobel.de>
+2005-11-03  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/content.py: Removed pretend check for file 
+	* WebappConfig/content.py: Removed pretend check for file
 	operations.
 	(Contents.read): Incorrect check for relative flag fixed.
 
-	* WebappConfig/config.py (Config.create_permissions): 
+	* WebappConfig/config.py (Config.create_permissions):
 	Incorrect permissions fixed.
 
 	* WebappConfig/dotconfig.py (DotConfig.write): Added quotes
 	that I forgot before
 
 	* WebappConfig/db.py: Doctest fix.
-	(WebappDB.add):  Fixed handling of newlines in the "install" 
+	(WebappDB.add):  Fixed handling of newlines in the "install"
 	files
 
 	* WebappConfig/content.py (Contents.add): Handling absoulte
@@ -317,13 +325,13 @@
 
 	* WebappConfig/worker.py: Fixed handling absolute paths.
 
-	* WebappConfig/server.py (Basic.install): Fixed handling 
+	* WebappConfig/server.py (Basic.install): Fixed handling
 	absolute paths.
 
 	* WebappConfig/config.py (Config.run): Fixed creating the
 	virtual install location.
 
-2005-11-02    <post@gunnarwrobel.de>
+2005-11-02  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/db.py: Another doctest fix.
 
@@ -339,7 +347,7 @@
 	variables, extended status message function (not needed
 	by w-c)
 
-2005-11-01    <post@gunnarwrobel.de>
+2005-11-01  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/version.py: Version 1.22
 
@@ -349,23 +357,23 @@
 	* WebappConfig/server.py: Pretending to install and clean
 	runs through now but still has bugs.
 
-	* WebappConfig/worker.py 
-	(WebappRemove.remove_dirs) 
-	(WebappRemove.remove_files): 
+	* WebappConfig/worker.py
+	(WebappRemove.remove_dirs)
+	(WebappRemove.remove_files):
 	Fixed return value (anything left behind)
-	
+
 	* WebappConfig/dotconfig.py (DotConfig.__getitem__): Added
 	function to retrieve red values.
 
-	* WebappConfig/server.py: Adapted to the new source 
+	* WebappConfig/server.py: Adapted to the new source
 	organization.
 
-	* WebappConfig/config.py: Adapted to the new source 
+	* WebappConfig/config.py: Adapted to the new source
 	organization.
 
-2005-10-31    <post@gunnarwrobel.de>
+2005-10-31  Gunnar Wrobel  <p@rdus.de>
 
-	* WebappConfig/content.py (Contents.add): Fixed action 
+	* WebappConfig/content.py (Contents.add): Fixed action
 	when pretending.
 	(Contents.kill): Added function to remove the content file.
 
@@ -378,23 +386,23 @@
 
 	* WebappConfig/content.py:  Fixed variable typo.
 
-	* WebappConfig/db.py 
-	(WebappSource.source_exists): 
-	(WebappSource.get_source_directories): 
-	(WebappSource.get_source_files): 
+	* WebappConfig/db.py
+	(WebappSource.source_exists):
+	(WebappSource.get_source_directories):
+	(WebappSource.get_source_files):
 	Added functions.
-	
-	(WebappSource.read): 
+
+	(WebappSource.read):
 	Added support for filetypes from whithin the source handler.
 
 	* WebappConfig/worker.py: Splitted the worker in adding and
 	removing. Nearly finished doctesting.
 
-2005-10-30    <post@gunnarwrobel.de>
+2005-10-30  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/content.py: Finished doctesting the module.
 
-2005-10-29    <post@gunnarwrobel.de>
+2005-10-29  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/tests/testfiles: Added a number of test
 	files for the doc tests.
@@ -402,24 +410,24 @@
 	* WebappConfig/content.py: Handler for the contents
 	file (split from worker.py)
 
-	* WebappConfig/db.py: Moved functions for package 
+	* WebappConfig/db.py: Moved functions for package
 	availability into the Webapps handler
 
-	* WebappConfig/protect.py: Handler for config protected 
+	* WebappConfig/protect.py: Handler for config protected
 	files (split from worker.py)
-	
+
 	* WebappConfig/dotconfig.py: Handler for the dotConfig file
 	in virtual install locations (split from worker.py/config.py)
 
 	* WebappConfig/ebuild.py: Handler for the ebuild postinstall
 	files and script hooks. (split from worker.py)
 
-2005-10-28    <post@gunnarwrobel.de>
+2005-10-28  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/content.py: Handler for the contents of
 	a virtual install. (split from worker.py)
 
-	* WebappConfig/db.py: Handler for /var/db/webapps and 
+	* WebappConfig/db.py: Handler for /var/db/webapps and
 	/usr/share/webapps (split from worker.py)
 
 	* WebappConfig/filetype.py: Handler for different file types.
@@ -441,7 +449,7 @@
 
 	* TODO.txt: Merged in revision (r45:47)
 
-2005-10-27    <post@gunnarwrobel.de>
+2005-10-27  Gunnar Wrobel  <p@rdus.de>
 
 	* WebappConfig/config.py: Merged revisions (r41:42)
 
@@ -453,5 +461,3 @@
 	branch.
 
 	* branch/gunnar: Created separate branch based on revision 36.
-	
-
diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
index 2d8447e..20ca8bd 100755
--- a/sbin/webapp-cleaner
+++ b/sbin/webapp-cleaner
@@ -11,7 +11,7 @@ CMD="emerge -Cav"
 WEBAPP_DIR="/usr/share/webapps"
 WEBAPP_CONFIG=
 
-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh
+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
 
 function help() {
 	echo "Remove obsolete and unused versions of web applications"