Merge remote branch 'origin/master' into wardenweb

packages/TODO.zcu

-* sjednotit warden-client.conf a warden-server.conf 
-* ipv6
-* zrusit vsude licence a nahradit jedinym radkem s odkazem
-* generovani konfiguracnich souboru z template z balicku a ne primo ze shell skriptu
-* verze klienta a serveru jsou mimo sync coz je osklive, proc mam pouzivat c1.1.1 a s0.1.1 ? to nedava smysl ...
-

packages/build-client.sh

@@ -3,35 +3,10 @@
 # build-client.sh
 #
 # Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s):    Tomas PLESNIK   <plesnik@ics.muni.cz>
-#               Jan SOUKAL      <soukal@ics.muni.cz>
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the Cesnet z.s.p.o nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#     this software without specific prior written permission.
-#
-# This software is provided ``as is'', and any express or implied
-# warranties, including, but not limited to, the implied warranties of
-# merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Cesnet z.s.p.o or contributors be liable for
-# any direct, indirect, incidental, special, exemplary, or consequential
-# damages (including, but not limited to, procurement of substitute
-# goods or services; loss of use, data, or profits; or business
-# interruption) however caused and on any theory of liability, whether
-# in contract, strict liability, or tort (including negligence or
-# otherwise) arising in any way out of the use of this software, even
-# if advised of the possibility of such damage.
-
-VERSION="1.1"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="1.2"
 
 #-------------------------------------------------------------------------------
 #				FUNCTIONS
@@ -52,17 +27,17 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="2.0.0-beta"
+version="2.1-beta"
 
 package_name="warden-client"
-package="$package_name-$version"
-doc="$package/$package_name/doc"
-etc="$package/$package_name/etc"
-lib="$package/$package_name/lib"
-var="$package/$package_name/var"
-tar="$package.tar.gz"
-sig="$tar.sig"
-err="/tmp/$package-err"
+package="${package_name}-${version}"
+doc="${package}/${package_name}/doc"
+etc="${package}/${package_name}/etc"
+lib="${package}/${package_name}/lib"
+var="${package}/${package_name}/var"
+tar="${package}.tar.gz"
+sig="${tar}.sig"
+err="/tmp/${package}-err"
 
 # make directory structure
 echo "Building $package_name package version $version ..."
@@ -70,34 +45,34 @@ echo
 
 echo -n "Building 'base' directory ... "
 mkdir -p $package 2> $err || err
-cp -R ../src/$package_name/sh/* $package 2> $err || err
-cp ../src/$package_name/doc/CHANGELOG $package 2> $err || err
-cp ../src/$package_name/doc/INSTALL $package 2> $err || err
-cp ../src/$package_name/doc/LICENSE $package 2> $err || err
-cp ../src/$package_name/doc/README $package 2> $err || err
-cp ../src/$package_name/doc/README.cesnet $package 2> $err || err
+cp -R ../src/${package_name}/sh/* $package 2> $err || err
+cp ../src/${package_name}/doc/CHANGELOG $package 2> $err || err
+cp ../src/${package_name}/doc/INSTALL $package 2> $err || err
+cp ../src/${package_name}/doc/LICENSE $package 2> $err || err
+cp ../src/${package_name}/doc/README $package 2> $err || err
+cp ../src/${package_name}/doc/README.cesnet $package 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$doc' directory ... "
+echo -n "Building '${doc}' directory ... "
 mkdir -p $doc 2> $err || err
-cp -R ../src/$package_name/doc/* $doc 2> $err || err
+cp -R ../src/${package_name}/doc/* $doc 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$etc' directory ... "
+echo -n "Building '${etc}' directory ... "
 mkdir -p $etc 2> $err || err
-cp ../src/$package_name/etc/package_version $etc 2> $err || err
+cp ../src/${package_name}/etc/package_version $etc 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$lib' directory ... "
+echo -n "Building '${lib}' directory ... "
 mkdir -p $lib 2> $err || err
-cp -R ../src/$package_name/lib/* $lib 2> $err || err
+cp -R ../src/${package_name}/lib/*.pm $lib 2> $err || err
 echo "OK"
 
 
-echo -n "Building '$var' directory ... "
+echo -n "Building '${var}' directory ... "
 mkdir -p $var 2> $err || err
 echo "OK"
 

packages/build-server.sh

@@ -3,35 +3,10 @@
 # build-server.sh
 #
 # Copyright (C) 2011-2012 Cesnet z.s.p.o
-# Author(s):    Tomas PLESNIK   <plesnik@ics.muni.cz>
-#               Jan SOUKAL      <soukal@ics.muni.cz>
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the Cesnet z.s.p.o nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#     this software without specific prior written permission.
-#
-# This software is provided ``as is'', and any express or implied
-# warranties, including, but not limited to, the implied warranties of
-# merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Cesnet z.s.p.o or contributors be liable for
-# any direct, indirect, incidental, special, exemplary, or consequential
-# damages (including, but not limited to, procurement of substitute
-# goods or services; loss of use, data, or profits; or business
-# interruption) however caused and on any theory of liability, whether
-# in contract, strict liability, or tort (including negligence or
-# otherwise) arising in any way out of the use of this software, even
-# if advised of the possibility of such damage.
-
-VERSION="1.0"
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+VERSION="2.1"
 
 err()
 {
@@ -49,18 +24,17 @@ err()
 #-------------------------------------------------------------------------------
 
 # edit when you build new package
-version="0.1.1"
+version="2.1-beta6"
 
 package_name="warden-server"
-package="$package_name-$version"
-bin="$package/$package_name/bin"
-doc="$package/$package_name/doc"
-etc="$package/$package_name/etc"
-lib="$package/$package_name/lib"
-var="$package/$package_name/var"
-tar="$package.tar.gz"
-sig="$tar.sig"
-err="/tmp/$package-err"
+package="${package_name}-${version}"
+bin="${package}/${package_name}/bin"
+doc="${package}/${package_name}/doc"
+etc="${package}/${package_name}/etc"
+lib="${package}/${package_name}/lib"
+tar="${package}.tar.gz"
+sig="${tar}.sig"
+err="/tmp/${package}-err"
 
 # make directory structure
 echo "Building $package_name package version $version ..."
@@ -68,40 +42,38 @@ echo
 
 echo -n "Building 'base' directory ... "
 mkdir -p $package 2> $err || err
-cp ../src/$package_name/sh/install.sh $package 2> $err || err
-cp ../src/$package_name/sh/uninstall.sh $package 2> $err || err
-cp ../src/$package_name/doc/CHANGELOG $package 2> $err || err
-cp ../src/$package_name/doc/INSTALL $package 2> $err || err
-cp ../src/$package_name/doc/LICENSE $package 2> $err || err
-cp ../src/$package_name/doc/README $package 2> $err || err
-cp ../src/$package_name/doc/README.warden-apache $package 2> $err || err
+cp ../src/${package_name}/sh/install.sh $package 2> $err || err
+cp ../src/${package_name}/sh/update.sh $package 2> $err || err
+cp ../src/${package_name}/sh/uninstall.sh $package 2> $err || err
+cp ../src/${package_name}/doc/AUTHORS $package 2> $err || err
+cp ../src/${package_name}/doc/CHANGELOG $package 2> $err || err
+cp ../src/${package_name}/doc/INSTALL $package 2> $err || err
+cp ../src/${package_name}/doc/LICENSE $package 2> $err || err
+cp ../src/${package_name}/doc/README $package 2> $err || err
+cp ../src/${package_name}/doc/UNINSTALL $package 2> $err || err
+cp ../src/${package_name}/doc/UPDATE $package 2> $err || err
 
 echo "OK"
 
-echo -n "Building '$bin' directory ... "
+echo -n "Building '${bin}' directory ... "
 mkdir -p $bin 2> $err || err
-cp -R ../src/$package_name/bin/* $bin 2> $err || err
-cp -R ../src/$package_name/sh/create_tables.sh $bin 2> $err || err
+cp -R ../src/${package_name}/bin/* $bin 2> $err || err
 echo "OK"
 
-echo -n "Building '$doc' directory ... "
+echo -n "Building '${doc}' directory ... "
 mkdir -p $doc 2> $err || err
-cp -R ../src/$package_name/doc/* $doc 2> $err || err
+cp -R ../src/${package_name}/doc/* $doc 2> $err || err
 echo "OK"
 
-echo -n "Building '$etc' directory ... "
+echo -n "Building '${etc}' directory ... "
 mkdir -p $etc 2> $err || err
-cp ../src/$package_name/etc/package_version $etc 2> $err || err
-cp ../src/$package_name/etc/warden-apache.conf $etc 2> $err || err
+cp ../src/${package_name}/etc/package_version $etc 2> $err || err
 echo "OK"
 
-echo -n "Building '$lib' directory ... "
+echo -n "Building '${lib}' directory ... "
 mkdir -p $lib 2> $err || err
-cp -R ../src/$package_name/lib/* $lib 2> $err || err
-echo "OK"
-
-echo -n "Building '$var' directory ... "
-mkdir -p $var 2> $err || err
+cp -R ../src/${package_name}/lib/* $lib 2> $err || err
+rm -rf ${lib}/*.t 2> $err || err
 echo "OK"
 
 

packages/chck_modules_version.sh

@@ -2,9 +2,8 @@
 #
 # Script obtain Perl package version
 #
-modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::TCP FindBin DateTime)
-#modules=(SOAP::Lite SOAP::Transport::TCP File::Pid POSIX DBI Format::Human::Bytes Sys::Syslog File::Basename FindBin Net::CIDR::Lite DateTime)
-#modules=(SOAP::Lite SOAP::Transport::TCP File::Pid POSIX DBI DBD::SQLite Format::Human::Bytes Sys::Syslog File::Basename FindBin Net::CIDR::Lite DateTime Getopt::Std Switch IO::Socket::SSL)
+#modules=(LWP::Protocol::https)
+modules=(SOAP::Lite SOAP::Transport::HTTP DBI DBD::mysql Format::Human::Bytes Sys::Syslog File::Basename Net::CIDR::Lite DateTime Getopt::Std Switch IO::Socket::SSL MIME::Base64 Crypt::X509 Carp)
 
 for module in ${modules[@]}
 do

packages/warden-client-2.0.0-beta2.tar.gz.sig

+9bca641d8c71f24a0010576fec2808a7ed055594  warden-client-2.0.0-beta2.tar.gz

packages/warden-client-2.0.tar.gz.sig

+72dafef0ed1a625f11cda121abf3c2d970c26ca0  warden-client-2.0.tar.gz

packages/warden-client-2.1-beta.tar.gz.sig

+24cc18c69a7fdb6f59bc31bf00a046a396eae3ba  warden-client-2.1-beta.tar.gz

packages/warden-server-2.0.0-beta.tar.gz.sig

+01bfc44ba12f04f1a56386e4efca8e626f1cdbd1  warden-server-2.0.0-beta.tar.gz

packages/warden-server-2.0.tar.gz.sig

+9ad83d6d136358179d68c49255af0f426b564edc  warden-server-2.0.tar.gz

packages/warden-server-2.1-beta4.tar.gz.sig

+3bf719d1f0887f7feb394aafc8a85b48a66e2498  warden-server-2.1-beta4.tar.gz

packages/warden-server-2.1-beta5.tar.gz.sig

+e4e6cd82c07aa02f4a73aa37f5da13e7d04ab0fe  warden-server-2.1-beta5.tar.gz

packages/warden-server-2.1-beta6.tar.gz.sig

+47f95f7e738cf5eb2d8faf3a98e7db6decb1c936  warden-server-2.1-beta6.tar.gz