From git at mathias-kettner.de Thu Jan 8 19:30:33 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 08 Jan 2015 19:30:33 +0100 Subject: [omd-commits] OMD Git: omd: thruk: update 1.86 Message-ID: <20150108183033.A7D0D818DB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0a82107dfb3a6ed64dc30cc4242d080822681bc5 URL: http://omdistro.org/projects/omd/repository/revisions/0a82107dfb3a6ed64dc30cc4242d080822681bc5 Author: Sven Nierlein Date: Thu Jan 8 19:30:21 2015 +0100 Commiter: Sven Nierlein Date: Thu Jan 8 19:30:21 2015 +0100 thruk: update 1.86 Signed-off-by: Sven Nierlein --- Changelog | 49 ++++++++++++++++++------------------ packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.84-6.tar.gz | Bin 8803965 -> 0 bytes packages/thruk/Thruk-1.86.tar.gz | Bin 0 -> 5151951 bytes 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Changelog b/Changelog index 8611b40..fcad838 100644 --- a/Changelog +++ b/Changelog @@ -2,41 +2,42 @@ This file documents the revision history for the Open Monitoring Distribution 1.30 - omd: - - Added backup/restore modes to backup and restore sites completely - You can backup your sites and restore them with the same or a - different name. - - Example: - omd backup mysite /tmp/backup.tgz + - Added backup/restore modes to backup and restore sites completely + You can backup your sites and restore them with the same or a + different name. - And for restore use: - omd restore restored /tmp/backup.tgz + Example: + omd backup mysite /tmp/backup.tgz - You need to ensure you have the OMD version installed during - restore, which the site was using during backup. + And for restore use: + omd restore restored /tmp/backup.tgz - You can also backup to stdout and restore from stdin which means - you can stream a backup cross the network. This might not only - be useful for backups, but also for migrations across servers. + You need to ensure you have the OMD version installed during + restore, which the site was using during backup. + + You can also backup to stdout and restore from stdin which means + you can stream a backup cross the network. This might not only + be useful for backups, but also for migrations across servers. - NagVis: - Update to version 1.8rc1 - Removed deprecated directory var/nagvis/userfiles. This was - deprecated since version 0.52. During the update to 1.30, the - directory and all its contents will be removed. This should be - no problem for most users, because the directory is not used - anymore since a long time. - If you update from OMD 0.52 or below, you need to manually backup - files from var/nagvis/userfiles and copy them to - local/share/nagvis/htdocs/userfiles after the update to make them - available again. - Note: If you decide to downgrade from this or a following - version to version 0.52 or older, you will again need to care - about these files manually. + deprecated since version 0.52. During the update to 1.30, the + directory and all its contents will be removed. This should be + no problem for most users, because the directory is not used + anymore since a long time. + If you update from OMD 0.52 or below, you need to manually backup + files from var/nagvis/userfiles and copy them to + local/share/nagvis/htdocs/userfiles after the update to make them + available again. + Note: If you decide to downgrade from this or a following + version to version 0.52 or older, you will again need to care + about these files manually. - Check_MK: moved log dir to var/log - Added build support for SLES 12 - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - Mod-Gearman: Update 1.4.18 + - Thruk: Update to 1.86 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 7f8607b..2a7367c 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.84-6 +VERSION = 1.86 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.84-6.tar.gz b/packages/thruk/Thruk-1.84-6.tar.gz deleted file mode 100644 index 9cb0b37..0000000 Binary files a/packages/thruk/Thruk-1.84-6.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.86.tar.gz b/packages/thruk/Thruk-1.86.tar.gz new file mode 100644 index 0000000..9efe286 Binary files /dev/null and b/packages/thruk/Thruk-1.86.tar.gz differ From git at mathias-kettner.de Fri Jan 9 13:06:55 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 09 Jan 2015 13:06:55 +0100 Subject: [omd-commits] OMD Git: omd: SLES12: Changed wrong dependency from libevent-1_4-2 to libevent-2_0-5 Message-ID: <20150109120655.6291980E69@mail.mathias-kettner.de> Module: omd Branch: master Commit: 91c0db4ec75e346f3523a9d298ea747258fa27df URL: http://omdistro.org/projects/omd/repository/revisions/91c0db4ec75e346f3523a9d298ea747258fa27df Author: Lars Michelsen Date: Fri Jan 9 13:06:51 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 9 13:06:51 2015 +0100 SLES12: Changed wrong dependency from libevent-1_4-2 to libevent-2_0-5 --- distros/Makefile.SLES_12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index 15d0f39..1ba2d40 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -50,7 +50,7 @@ OS_PACKAGES += fping OS_PACKAGES += graphviz OS_PACKAGES += libboost_program_options1_36_0 OS_PACKAGES += libpng12-0 -OS_PACKAGES += libevent-1_4-2 +OS_PACKAGES += libevent-2_0-5 OS_PACKAGES += libltdl7 OS_PACKAGES += libreadline5 OS_PACKAGES += libuuid1 From git at mathias-kettner.de Tue Jan 13 15:17:15 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 13 Jan 2015 15:17:15 +0100 Subject: [omd-commits] OMD Git: omd: FIX: Update mechanism handles obsolete but non empty directories correctly Message-ID: <20150113141715.84FF280814@mail.mathias-kettner.de> Module: omd Branch: master Commit: 22d788f91efab2fca385833723c7c347abfeba6c URL: http://omdistro.org/projects/omd/repository/revisions/22d788f91efab2fca385833723c7c347abfeba6c Author: Lars Michelsen Date: Tue Jan 13 15:17:09 2015 +0100 Commiter: Lars Michelsen Date: Tue Jan 13 15:17:09 2015 +0100 FIX: Update mechanism handles obsolete but non empty directories correctly --- Changelog | 2 ++ packages/omd/omd | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index fcad838..d12500c 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,8 @@ This file documents the revision history for the Open Monitoring Distribution You can also backup to stdout and restore from stdin which means you can stream a backup cross the network. This might not only be useful for backups, but also for migrations across servers. + - FIX: Update mechanism detects obsolete but non empty directories + correctly and asks the user whether or not to delete them - NagVis: - Update to version 1.8rc1 - Removed deprecated directory var/nagvis/userfiles. This was diff --git a/packages/omd/omd b/packages/omd/omd index 24dfaf1..b1e37fa 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -1334,6 +1334,8 @@ def update_file(relpath, old_version, new_version, userdir, old_perms): # compare our old with our new version we_changed_type, we_changed_content, we_changed = file_status(old_path, new_path) + non_empty_directory = os.path.isdir(user_path) and bool(os.listdir(user_path)) + # if opt_verbose: # sys.stdout.write("%s%s%s:\n" % (tty_bold, relpath, tty_normal)) # sys.stdout.write(" you : %s\n" % user_type) @@ -1408,7 +1410,22 @@ def update_file(relpath, old_version, new_version, userdir, old_perms): delete_user_file(user_path) sys.stdout.write(warn + " Deleted %s\n" % fn) - # 3d) same, but user hasn't changed anything -> silently delete + # 3d) same, but it is a directory which is not empty + elif not new_type and non_empty_directory: + if user_confirms("Non empty obsolete directory %s" % (relpath), + "The directory %s has become obsolete in " + "the new version, but you have contents in it. " + "Do you want to keep your directory or " + "may I delete it for you, please?" % (relpath), + relpath, + "keep", "keep your directory, though it is obsolete", + "delete", "delete your directory"): + sys.stdout.write(warn + " Keeping your %s\n" % fn) + else: + delete_user_file(user_path) + sys.stdout.write(warn + " Deleted %s\n" % fn) + + # 3e) same, but user hasn't changed anything -> silently delete elif not new_type: delete_user_file(user_path) sys.stdout.write(good + " Vanished %s\n" % fn) From git at mathias-kettner.de Wed Jan 14 10:29:15 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 14 Jan 2015 10:29:15 +0100 Subject: [omd-commits] OMD Git: omd: Fixed bug with "omd restore" not restoring sym/ Message-ID: <20150114092915.7018180E1E@mail.mathias-kettner.de> hard links correctly User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: omd Branch: master Commit: 035b38b2800e8ad0dd32778f8fba68e06667a092 URL: http://omdistro.org/projects/omd/repository/revisions/035b38b2800e8ad0dd32778f8fba68e06667a092 Author: Lars Michelsen Date: Wed Jan 14 10:29:09 2015 +0100 Commiter: Lars Michelsen Date: Wed Jan 14 10:29:09 2015 +0100 Fixed bug with "omd restore" not restoring sym/hard links correctly --- packages/omd/omd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/omd/omd b/packages/omd/omd index b1e37fa..86183fb 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -3014,7 +3014,7 @@ def main_restore(args, options={}): # Get the first file of the tar archive (expecting site directory) sitename = tar.next().name - # Restore sit with its original name, or specify a new one + # Restore site with its original name, or specify a new one new_sitename = sitename if len(args) == 2: new_sitename = args[0] @@ -3067,6 +3067,11 @@ def main_restore(args, options={}): for tarinfo in tar: # remove leading site name from paths tarinfo.name = '/'.join(tarinfo.name.split('/')[1:]) + if tarinfo.issym() or tarinfo.islnk(): + parts = tarinfo.linkname.split('/') + if parts[0] == sitename: + parts = parts[1:] + tarinfo.linkname = '/'.join(parts) tar.extract(tarinfo, path=g_sitedir) # give new user all files From git at mathias-kettner.de Fri Jan 16 09:06:36 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 09:06:36 +0100 Subject: [omd-commits] OMD Git: omd: SLES12: Fixed readline dependency Message-ID: <20150116080637.037908071A@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6a3945958520f14646c498e8967c3d32ec251db2 URL: http://omdistro.org/projects/omd/repository/revisions/6a3945958520f14646c498e8967c3d32ec251db2 Author: Lars Michelsen Date: Fri Jan 16 09:06:31 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 09:06:31 2015 +0100 SLES12: Fixed readline dependency --- distros/Makefile.SLES_12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index 1ba2d40..b9949fe 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -52,7 +52,7 @@ OS_PACKAGES += libboost_program_options1_36_0 OS_PACKAGES += libpng12-0 OS_PACKAGES += libevent-2_0-5 OS_PACKAGES += libltdl7 -OS_PACKAGES += libreadline5 +OS_PACKAGES += libreadline6 OS_PACKAGES += libuuid1 OS_PACKAGES += mysql OS_PACKAGES += net-snmp From git at mathias-kettner.de Fri Jan 16 12:21:27 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 12:21:27 +0100 Subject: [omd-commits] OMD Git: omd: SLES12: Fixed php5 dependencies ( you will need to register your host and subscribe to "Web and Scripting" module) Message-ID: <20150116112127.1D81C82277@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1828043cae36bc43711a252dbb1620ecb44c76e3 URL: http://omdistro.org/projects/omd/repository/revisions/1828043cae36bc43711a252dbb1620ecb44c76e3 Author: Lars Michelsen Date: Fri Jan 16 12:21:21 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 12:21:21 2015 +0100 SLES12: Fixed php5 dependencies (you will need to register your host and subscribe to "Web and Scripting" module) --- distros/Makefile.SLES_12 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index b9949fe..a3ee4bd 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -60,14 +60,14 @@ OS_PACKAGES += pango OS_PACKAGES += patch OS_PACKAGES += perl-Net-SNMP OS_PACKAGES += perl-SNMP -OS_PACKAGES += php53-fastcgi -OS_PACKAGES += php53-gd -OS_PACKAGES += php53-iconv -OS_PACKAGES += php53-mbstring -OS_PACKAGES += php53-mcrypt -OS_PACKAGES += php53-pear -OS_PACKAGES += php53-sockets -OS_PACKAGES += php53-sqlite +OS_PACKAGES += php5-fastcgi +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-iconv +OS_PACKAGES += php5-mbstring +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-pear +OS_PACKAGES += php5-sockets +OS_PACKAGES += php5-sqlite OS_PACKAGES += rsync OS_PACKAGES += samba-client OS_PACKAGES += unzip From git at mathias-kettner.de Fri Jan 16 13:41:22 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 13:41:22 +0100 Subject: [omd-commits] OMD Git: omd: SLES12: Fixes for the apache config Message-ID: <20150116124122.2260A80020@mail.mathias-kettner.de> Module: omd Branch: master Commit: dab41c09ea3abf4374df3a5b14b3e743fab01e19 URL: http://omdistro.org/projects/omd/repository/revisions/dab41c09ea3abf4374df3a5b14b3e743fab01e19 Author: Lars Michelsen Date: Fri Jan 16 13:41:19 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 13:41:19 2015 +0100 SLES12: Fixes for the apache config --- distros/Makefile.SLES_12 | 2 +- omd.spec.in | 3 +++ packages/apache-omd/Makefile | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index a3ee4bd..f10887b 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -77,7 +77,7 @@ OS_PACKAGES += xorg-x11-server-extra # used for thruks pdf generator OS_PACKAGES += python-ldap # needed for ldap support in multisite OS_PACKAGES += freeradius-client-libs USERADD_OPTIONS = -M -ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s PACKAGE_INSTALL = zypper -n refresh ; zypper -n install ACTIVATE_INITSCRIPT = chkconfig --add %s APACHE_CONF_DIR = /etc/apache2/conf.d diff --git a/omd.spec.in b/omd.spec.in index ec06a10..a2cd7ec 100644 --- a/omd.spec.in +++ b/omd.spec.in @@ -93,6 +93,9 @@ then a2enmod proxy 2>/dev/null || true a2enmod proxy_http 2>/dev/null || true a2enmod rewrite 2>/dev/null || true + # Only relevant for SLES12 or newer (having apache 2.4) + # This still allows old permission configs like "Order: ..." + awenmod mod_access_compat 2>/dev/null || true fi # SLES: make sure that the following file exists: diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile index e73ff82..04c778c 100644 --- a/packages/apache-omd/Makefile +++ b/packages/apache-omd/Makefile @@ -75,10 +75,18 @@ skel: rm $(SKEL)/etc/apache/apache24.conf ; \ fi + if [ + # Replace macros sed -i -e 's|###APACHE_MODULE_DIR###|$(MODULE_DIR)|g' \ $(SKEL)/etc/apache/apache.conf + # SLES12 has apache 2.4 but does not have the prefork module to be loaded, + # so remove this load line for this distro from the apache config + if [ ! -e $(MODULE_DIR)/mod_mpm_prefork.so ]; then \ + sed -i '/^LoadModule mpm_prefork_module/d' $(SKEL)/etc/apache/apache.conf + fi + sed -i -e 's|###APACHE_FCGID_MODULE###|$(APACHE_FCGID_PATH)|g' \ $(SKEL)/etc/apache/conf.d/02_fcgid.conf From git at mathias-kettner.de Fri Jan 16 14:15:54 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 14:15:54 +0100 Subject: [omd-commits] OMD Git: omd: apache: Fixed broken config Message-ID: <20150116131554.A81B7807EB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 61be6caa12f8bacb79ade0db1b1deed350925017 URL: http://omdistro.org/projects/omd/repository/revisions/61be6caa12f8bacb79ade0db1b1deed350925017 Author: Lars Michelsen Date: Fri Jan 16 14:15:52 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 14:15:52 2015 +0100 apache: Fixed broken config --- packages/apache-omd/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile index 04c778c..84ca619 100644 --- a/packages/apache-omd/Makefile +++ b/packages/apache-omd/Makefile @@ -75,8 +75,6 @@ skel: rm $(SKEL)/etc/apache/apache24.conf ; \ fi - if [ - # Replace macros sed -i -e 's|###APACHE_MODULE_DIR###|$(MODULE_DIR)|g' \ $(SKEL)/etc/apache/apache.conf From git at mathias-kettner.de Fri Jan 16 14:30:40 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 14:30:40 +0100 Subject: [omd-commits] OMD Git: omd: apache: Fixed broken config Message-ID: <20150116133040.C21438087F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 11a06174aa53c09689b4e300bb6c6a1ad3f28a7e URL: http://omdistro.org/projects/omd/repository/revisions/11a06174aa53c09689b4e300bb6c6a1ad3f28a7e Author: Lars Michelsen Date: Fri Jan 16 14:30:38 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 14:30:38 2015 +0100 apache: Fixed broken config --- packages/apache-omd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile index 84ca619..f751e49 100644 --- a/packages/apache-omd/Makefile +++ b/packages/apache-omd/Makefile @@ -82,7 +82,7 @@ skel: # SLES12 has apache 2.4 but does not have the prefork module to be loaded, # so remove this load line for this distro from the apache config if [ ! -e $(MODULE_DIR)/mod_mpm_prefork.so ]; then \ - sed -i '/^LoadModule mpm_prefork_module/d' $(SKEL)/etc/apache/apache.conf + sed -i '/^LoadModule mpm_prefork_module/d' $(SKEL)/etc/apache/apache.conf ; \ fi sed -i -e 's|###APACHE_FCGID_MODULE###|$(APACHE_FCGID_PATH)|g' \ From git at mathias-kettner.de Fri Jan 16 15:02:28 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 16 Jan 2015 15:02:28 +0100 Subject: [omd-commits] OMD Git: omd: SLES12: finally working Message-ID: <20150116140228.8AD1D807FE@mail.mathias-kettner.de> Module: omd Branch: master Commit: eda16d83c935101b218b1ba8b6ab493f406ee64b URL: http://omdistro.org/projects/omd/repository/revisions/eda16d83c935101b218b1ba8b6ab493f406ee64b Author: Lars Michelsen Date: Fri Jan 16 15:02:26 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 16 15:02:26 2015 +0100 SLES12: finally working --- distros/Makefile.SLES_12 | 2 +- omd.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index f10887b..2b012ba 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -93,4 +93,4 @@ PHP_FCGI_BIN = /usr/bin/php-cgi APACHE_ENMOD = a2enmod %s BECOME_ROOT = su -c MOUNT_OPTIONS = -INIT_CMD = /etc/init.d/%(name)s %(action)s +INIT_CMD = /usr/bin/systemctl %(action)s %(name)s.service diff --git a/omd.spec.in b/omd.spec.in index a2cd7ec..d0d3366 100644 --- a/omd.spec.in +++ b/omd.spec.in @@ -95,7 +95,7 @@ then a2enmod rewrite 2>/dev/null || true # Only relevant for SLES12 or newer (having apache 2.4) # This still allows old permission configs like "Order: ..." - awenmod mod_access_compat 2>/dev/null || true + a2enmod mod_access_compat 2>/dev/null || true fi # SLES: make sure that the following file exists: From git at mathias-kettner.de Mon Jan 19 13:43:27 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 19 Jan 2015 13:43:27 +0100 Subject: [omd-commits] OMD Git: omd: mod-gearman update 1.5.0 Message-ID: <20150119124327.2F95481001@mail.mathias-kettner.de> Module: omd Branch: master Commit: b05af07d0ab41db1bd151986d9eba408ab97b0ea URL: http://omdistro.org/projects/omd/repository/revisions/b05af07d0ab41db1bd151986d9eba408ab97b0ea Author: Sven Nierlein Date: Sun Jan 18 20:36:27 2015 +0100 Commiter: Sven Nierlein Date: Sun Jan 18 20:36:27 2015 +0100 mod-gearman update 1.5.0 --- Changelog | 2 +- packages/mod-gearman/Makefile | 2 +- packages/mod-gearman/mod_gearman-1.4.16.tar.gz | Bin 317666 -> 0 bytes packages/mod-gearman/mod_gearman-1.4.18.tar.gz | Bin 317708 -> 0 bytes packages/mod-gearman/mod_gearman-1.5.0.tar.gz | Bin 0 -> 321882 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index d12500c..9005878 100644 --- a/Changelog +++ b/Changelog @@ -38,7 +38,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for SLES 12 - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - - Mod-Gearman: Update 1.4.18 + - Mod-Gearman: Update 1.5.0 - Thruk: Update to 1.86 1.20 Aug 25 2014 diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 1c2a3af..6196f32 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mod_gearman -VERSION = 1.4.18 +VERSION = 1.5.0 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }') DIR = mod_gearman-$(VERSION) diff --git a/packages/mod-gearman/mod_gearman-1.4.16.tar.gz b/packages/mod-gearman/mod_gearman-1.4.16.tar.gz deleted file mode 100644 index 4e90fb3..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.4.16.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.4.18.tar.gz b/packages/mod-gearman/mod_gearman-1.4.18.tar.gz deleted file mode 100644 index 0a26952..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.4.18.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.5.0.tar.gz b/packages/mod-gearman/mod_gearman-1.5.0.tar.gz new file mode 100644 index 0000000..b435cf5 Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.5.0.tar.gz differ From git at mathias-kettner.de Mon Jan 19 13:43:27 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 19 Jan 2015 13:43:27 +0100 Subject: [omd-commits] OMD Git: omd: enable mod_access_compat only on suse 12 Message-ID: <20150119124327.6B92E8100C@mail.mathias-kettner.de> Module: omd Branch: master Commit: b7cc9bb0003d21582bc3225ed826afe485c9a4d0 URL: http://omdistro.org/projects/omd/repository/revisions/b7cc9bb0003d21582bc3225ed826afe485c9a4d0 Author: Sven Nierlein Date: Mon Jan 19 10:37:40 2015 +0100 Commiter: Sven Nierlein Date: Mon Jan 19 10:37:40 2015 +0100 enable mod_access_compat only on suse 12 This leads to errors on other platforms: Module "mod_access_compat" is not installed, ignoring. Check the APACHE_MODULES setting in /etc/sysconfig/apache2. Signed-off-by: Sven Nierlein --- omd.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/omd.spec.in b/omd.spec.in index d0d3366..df583fa 100644 --- a/omd.spec.in +++ b/omd.spec.in @@ -93,9 +93,11 @@ then a2enmod proxy 2>/dev/null || true a2enmod proxy_http 2>/dev/null || true a2enmod rewrite 2>/dev/null || true +%if 0%{?suse_version} > 1200 # Only relevant for SLES12 or newer (having apache 2.4) # This still allows old permission configs like "Order: ..." a2enmod mod_access_compat 2>/dev/null || true +%endif fi # SLES: make sure that the following file exists: From git at mathias-kettner.de Mon Jan 19 13:43:27 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 19 Jan 2015 13:43:27 +0100 Subject: [omd-commits] OMD Git: omd: thruk update 1.86-2 Message-ID: <20150119124327.8390181001@mail.mathias-kettner.de> Module: omd Branch: master Commit: c3ae3b1303b203769ee5dba9443c54865d60ade0 URL: http://omdistro.org/projects/omd/repository/revisions/c3ae3b1303b203769ee5dba9443c54865d60ade0 Author: Sven Nierlein Date: Sun Jan 18 20:40:21 2015 +0100 Commiter: Sven Nierlein Date: Sun Jan 18 20:40:21 2015 +0100 thruk update 1.86-2 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.86-2.tar.gz | Bin 0 -> 5158742 bytes packages/thruk/Thruk-1.86.tar.gz | Bin 5151951 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 9005878..964f645 100644 --- a/Changelog +++ b/Changelog @@ -39,7 +39,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - Mod-Gearman: Update 1.5.0 - - Thruk: Update to 1.86 + - Thruk: Update to 1.86-2 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index 2a7367c..aaf645a 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.86 +VERSION = 1.86-2 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.86-2.tar.gz b/packages/thruk/Thruk-1.86-2.tar.gz new file mode 100644 index 0000000..8374aad Binary files /dev/null and b/packages/thruk/Thruk-1.86-2.tar.gz differ diff --git a/packages/thruk/Thruk-1.86.tar.gz b/packages/thruk/Thruk-1.86.tar.gz deleted file mode 100644 index 9efe286..0000000 Binary files a/packages/thruk/Thruk-1.86.tar.gz and /dev/null differ From git at mathias-kettner.de Tue Jan 20 00:44:11 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 20 Jan 2015 00:44:11 +0100 Subject: [omd-commits] OMD Git: omd: Update Monitoring-Plugins to 2.1.1 Message-ID: <20150119234411.3CA4380F1E@mail.mathias-kettner.de> Module: omd Branch: master Commit: dc4d6043e97c58340079181c249e042e7f38c22c URL: http://omdistro.org/projects/omd/repository/revisions/dc4d6043e97c58340079181c249e042e7f38c22c Author: Sven Nierlein Date: Mon Jan 19 22:31:36 2015 +0100 Commiter: Sven Nierlein Date: Mon Jan 19 22:31:36 2015 +0100 Update Monitoring-Plugins to 2.1.1 --- Changelog | 1 + packages/monitoring-plugins/Makefile | 2 +- packages/monitoring-plugins/monitoring-plugins-2.0.tar.gz | Bin 2610000 -> 0 bytes packages/monitoring-plugins/monitoring-plugins-2.1.1.tar.gz | Bin 0 -> 2612331 bytes 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 964f645..33e45f9 100644 --- a/Changelog +++ b/Changelog @@ -40,6 +40,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for Ubuntu 14.10 - Mod-Gearman: Update 1.5.0 - Thruk: Update to 1.86-2 + - Updated Monitoring-Plugins to 2.1.1 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/packages/monitoring-plugins/Makefile b/packages/monitoring-plugins/Makefile index 7a9a000..3c1e8fc 100644 --- a/packages/monitoring-plugins/Makefile +++ b/packages/monitoring-plugins/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = monitoring-plugins -VERSION = 2.0 +VERSION = 2.1.1 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/monitoring-plugins/monitoring-plugins-2.0.tar.gz b/packages/monitoring-plugins/monitoring-plugins-2.0.tar.gz deleted file mode 100644 index 535ddd2..0000000 Binary files a/packages/monitoring-plugins/monitoring-plugins-2.0.tar.gz and /dev/null differ diff --git a/packages/monitoring-plugins/monitoring-plugins-2.1.1.tar.gz b/packages/monitoring-plugins/monitoring-plugins-2.1.1.tar.gz new file mode 100644 index 0000000..4c0b9e8 Binary files /dev/null and b/packages/monitoring-plugins/monitoring-plugins-2.1.1.tar.gz differ From git at mathias-kettner.de Tue Jan 20 13:09:05 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 20 Jan 2015 13:09:05 +0100 Subject: [omd-commits] OMD Git: omd: FIX: SLES omd init-Script does not use default runlevel 4 anymore Message-ID: <20150120120905.6B9CF8001A@mail.mathias-kettner.de> Module: omd Branch: master Commit: a5376ac48748f8ce730856f49b6293ca464bece0 URL: http://omdistro.org/projects/omd/repository/revisions/a5376ac48748f8ce730856f49b6293ca464bece0 Author: Lars Michelsen Date: Tue Jan 20 13:09:02 2015 +0100 Commiter: Lars Michelsen Date: Tue Jan 20 13:09:02 2015 +0100 FIX: SLES omd init-Script does not use default runlevel 4 anymore --- Changelog | 1 + packages/omd/Makefile | 7 +++++++ packages/omd/omd.init | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 33e45f9..12ba6e1 100644 --- a/Changelog +++ b/Changelog @@ -20,6 +20,7 @@ This file documents the revision history for the Open Monitoring Distribution be useful for backups, but also for migrations across servers. - FIX: Update mechanism detects obsolete but non empty directories correctly and asks the user whether or not to delete them + - FIX: SLES omd init-Script does not use default runlevel 4 anymore - NagVis: - Update to version 1.8rc1 - Removed deprecated directory var/nagvis/userfiles. This was diff --git a/packages/omd/Makefile b/packages/omd/Makefile index dc6040f..491b6c2 100644 --- a/packages/omd/Makefile +++ b/packages/omd/Makefile @@ -4,6 +4,12 @@ NAME = omd VERSION = $(OMD_VERSION) SHELL = /bin/bash +ifeq ($(DISTRO_NAME),SLES) + DEFAULT_RUNLEVELS=2 3 5 +else + DEFAULT_RUNLEVELS=2 3 4 5 +endif + build: install: @@ -18,6 +24,7 @@ install: install -m 644 omd.8 $(DESTDIR)$(OMD_ROOT)/share/man/man8 gzip $(DESTDIR)$(OMD_ROOT)/share/man/man8/omd.8 install -m 755 omd.init $(DESTDIR)$(OMD_ROOT)/share/omd/omd.init + sed -i 's|###DEFAULT_RUNLEVELS###|$(DEFAULT_RUNLEVELS)|g' $(DESTDIR)$(OMD_ROOT)/share/omd/omd.init mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) install -m 644 COPYING AUTHORS $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd diff --git a/packages/omd/omd.init b/packages/omd/omd.init index 7764f1c..0d483d1 100755 --- a/packages/omd/omd.init +++ b/packages/omd/omd.init @@ -5,7 +5,7 @@ # Provides: omd # Required-Start: $syslog # Required-Stop: $syslog -# Default-Start: 2 3 4 5 +# Default-Start: ###DEFAULT_RUNLEVELS### # Default-Stop: 1 # Short-Description: OMD sites # Description: Start and stop the sites of the Open Monitoring From git at mathias-kettner.de Tue Jan 20 17:50:31 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 20 Jan 2015 17:50:31 +0100 Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.5.1 Message-ID: <20150120165031.8888180810@mail.mathias-kettner.de> Module: omd Branch: master Commit: c95c1a5a4110b5271904ad356da56e443cca252f URL: http://omdistro.org/projects/omd/repository/revisions/c95c1a5a4110b5271904ad356da56e443cca252f Author: Sven Nierlein Date: Tue Jan 20 17:50:00 2015 +0100 Commiter: Sven Nierlein Date: Tue Jan 20 17:50:29 2015 +0100 Mod-Gearman: Update 1.5.1 --- Changelog | 2 +- packages/mod-gearman/Makefile | 2 +- packages/mod-gearman/mod_gearman-1.5.0.tar.gz | Bin 321882 -> 0 bytes packages/mod-gearman/mod_gearman-1.5.1.tar.gz | Bin 0 -> 321935 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 12ba6e1..c5e8c95 100644 --- a/Changelog +++ b/Changelog @@ -39,7 +39,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for SLES 12 - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - - Mod-Gearman: Update 1.5.0 + - Mod-Gearman: Update 1.5.1 - Thruk: Update to 1.86-2 - Updated Monitoring-Plugins to 2.1.1 diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 6196f32..61c87d3 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mod_gearman -VERSION = 1.5.0 +VERSION = 1.5.1 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }') DIR = mod_gearman-$(VERSION) diff --git a/packages/mod-gearman/mod_gearman-1.5.0.tar.gz b/packages/mod-gearman/mod_gearman-1.5.0.tar.gz deleted file mode 100644 index b435cf5..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.5.0.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.5.1.tar.gz b/packages/mod-gearman/mod_gearman-1.5.1.tar.gz new file mode 100644 index 0000000..907cfbc Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.5.1.tar.gz differ From git at mathias-kettner.de Tue Jan 20 19:18:27 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 20 Jan 2015 19:18:27 +0100 Subject: [omd-commits] OMD Git: omd: monitoring-plugins: bugs file is no longer included in the source tarball Message-ID: <20150120181827.AB178806C6@mail.mathias-kettner.de> Module: omd Branch: master Commit: 11ada1e0ed497276e8aa6d28bff8070736321f24 URL: http://omdistro.org/projects/omd/repository/revisions/11ada1e0ed497276e8aa6d28bff8070736321f24 Author: Sven Nierlein Date: Tue Jan 20 19:17:30 2015 +0100 Commiter: Sven Nierlein Date: Tue Jan 20 19:17:30 2015 +0100 monitoring-plugins: bugs file is no longer included in the source tarball --- packages/monitoring-plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/monitoring-plugins/Makefile b/packages/monitoring-plugins/Makefile index 3c1e8fc..6161248 100644 --- a/packages/monitoring-plugins/Makefile +++ b/packages/monitoring-plugins/Makefile @@ -27,7 +27,7 @@ install: # Copy package documentations to have these information in the binary packages mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME) - for file in ACKNOWLEDGEMENTS AUTHORS BUGS CODING COPYING FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS ; do \ + for file in ACKNOWLEDGEMENTS AUTHORS CODING COPYING FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS ; do \ install -m 644 $(DIR)/$$file $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME); \ done From git at mathias-kettner.de Thu Jan 22 12:34:32 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 22 Jan 2015 12:34:32 +0100 Subject: [omd-commits] OMD Git: omd: omd restore: Fixed restoring from stdin Message-ID: <20150122113432.589D88086B@mail.mathias-kettner.de> Module: omd Branch: master Commit: abb935c4dd6cd886c326d0a1c0d65d4ce06a0859 URL: http://omdistro.org/projects/omd/repository/revisions/abb935c4dd6cd886c326d0a1c0d65d4ce06a0859 Author: Lars Michelsen Date: Thu Jan 22 12:34:24 2015 +0100 Commiter: Lars Michelsen Date: Thu Jan 22 12:34:24 2015 +0100 omd restore: Fixed restoring from stdin --- packages/omd/omd | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index 86183fb..50f4d9f 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2998,18 +2998,20 @@ def main_restore(args, options={}): set_conflict_option(options) if len(args) == 0: - bail_out("You need to provide either a path to the destination " - "file or \"-\" for backup to stdout.") + bail_out("You need to provide either a path to the source " + "file or \"-\" for restore from stdin.") source = args[-1] if source == '-': - fh = sys.stdout + fh = sys.stdin + tar_mode = 'r|gz' elif os.path.exists(source): fh = file(source) + tar_mode = 'r:gz' else: bail_out("The backup archive does not exist.") - tar = tarfile.open(fileobj=fh, mode='r:gz') + tar = tarfile.open(fileobj=fh, mode=tar_mode) # Get the first file of the tar archive (expecting site directory) sitename = tar.next().name From git at mathias-kettner.de Thu Jan 22 12:34:32 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 22 Jan 2015 12:34:32 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150122113432.6DF3B80869@mail.mathias-kettner.de> Module: omd Branch: master Commit: ec50f3b3045be7465795752a96a092aede358df9 URL: http://omdistro.org/projects/omd/repository/revisions/ec50f3b3045be7465795752a96a092aede358df9 Author: Lars Michelsen Date: Thu Jan 22 12:34:29 2015 +0100 Commiter: Lars Michelsen Date: Thu Jan 22 12:34:29 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Thu Jan 22 23:00:08 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 22 Jan 2015 23:00:08 +0100 Subject: [omd-commits] OMD Git: omd: make apache restarts more reliable during tests Message-ID: <20150122220008.3E7BF814D4@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9f0fb54acd40620030fdc8b9bcd727b1628c4f49 URL: http://omdistro.org/projects/omd/repository/revisions/9f0fb54acd40620030fdc8b9bcd727b1628c4f49 Author: Sven Nierlein Date: Thu Jan 22 20:00:43 2015 +0100 Commiter: Sven Nierlein Date: Thu Jan 22 22:59:27 2015 +0100 make apache restarts more reliable during tests debians (at least with systemd) restart is not finished when the restart command already returns, so we have to sleep a bit to prevent the following tests from failing. Signed-off-by: Sven Nierlein --- t/TestUtils.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 6206ce9..6051518 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -849,11 +849,15 @@ sub _tail_apache_logs { =cut sub restart_system_apache { - my $name = TestUtils::config('APACHE_INIT_NAME'); - my $init = TestUtils::config('INIT_CMD'); - my $cmd = $init; - $cmd =~ s/\Q%(name)s\E/$name/mx; - $cmd =~ s/\Q%(action)s\E/restart/mx; + my $name = TestUtils::config('APACHE_INIT_NAME'); + my $init = TestUtils::config('INIT_CMD'); + my $cmd = $init; + $cmd =~ s/\Q%(name)s\E/$name/mx; + my $stop = $cmd; + $stop =~ s/\Q%(action)s\E/stop/mx; + my $start = $cmd; + $start =~ s/\Q%(action)s\E/start/mx; + $cmd = $stop.'; sleep 3; '.$start; TestUtils::test_command({ cmd => $cmd }); } From git at mathias-kettner.de Thu Jan 22 23:00:08 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 22 Jan 2015 23:00:08 +0100 Subject: [omd-commits] OMD Git: omd: read environment from OMD_ROOT Message-ID: <20150122220008.4DFDA814D3@mail.mathias-kettner.de> Module: omd Branch: master Commit: 93b428fdaaaf1f920d0575be7505f663b685d676 URL: http://omdistro.org/projects/omd/repository/revisions/93b428fdaaaf1f920d0575be7505f663b685d676 Author: Sven Nierlein Date: Thu Jan 22 15:35:06 2015 +0100 Commiter: Sven Nierlein Date: Thu Jan 22 22:59:15 2015 +0100 read environment from OMD_ROOT since this is the place which we just checked if it exists. OMD_ROOT may be different from ~ for example in shared apache mode. --- packages/omd/skel/.profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/omd/skel/.profile b/packages/omd/skel/.profile index db25ce6..85e47bb 100644 --- a/packages/omd/skel/.profile +++ b/packages/omd/skel/.profile @@ -17,7 +17,7 @@ export MAILRC="$OMD_ROOT/etc/mail.rc" if [ -f $OMD_ROOT/etc/environment ] then - eval $(egrep -v '^[[:space:]]*(#|$)' < ~/etc/environment | sed 's/^/export /') + eval $(egrep -v '^[[:space:]]*(#|$)' < $OMD_ROOT/etc/environment | sed 's/^/export /') fi # Only load bashrc when in a bash shell and not loaded yet. From git at mathias-kettner.de Fri Jan 23 12:57:00 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 12:57:00 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: updated to current build Message-ID: <20150123115700.DCEA7815CF@mail.mathias-kettner.de> Module: omd Branch: master Commit: 52db2f11cbafba28223e2968dbd4025f1be42eb1 URL: http://omdistro.org/projects/omd/repository/revisions/52db2f11cbafba28223e2968dbd4025f1be42eb1 Author: Lars Michelsen Date: Fri Jan 23 12:56:36 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 23 12:56:36 2015 +0100 nagvis: updated to current build --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1492845 -> 1493293 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 581f191..e033996 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Fri Jan 23 12:57:00 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 12:57:00 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150123115700.EFAC881562@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0216533f737c30f1b3eb406d8f1d14aa78fde835 URL: http://omdistro.org/projects/omd/repository/revisions/0216533f737c30f1b3eb406d8f1d14aa78fde835 Author: Lars Michelsen Date: Fri Jan 23 12:56:40 2015 +0100 Commiter: Lars Michelsen Date: Fri Jan 23 12:56:40 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Jan 23 14:05:07 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 14:05:07 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: update modules and remove some unused modules Message-ID: <20150123130507.E3AAE80981@mail.mathias-kettner.de> Module: omd Branch: master Commit: eee1c61b63ff359d69b01b89379918f15880b276 URL: http://omdistro.org/projects/omd/repository/revisions/eee1c61b63ff359d69b01b89379918f15880b276 Author: Sven Nierlein Date: Fri Jan 23 12:09:10 2015 +0100 Commiter: Sven Nierlein Date: Fri Jan 23 14:03:30 2015 +0100 perl-modules: update modules and remove some unused modules Signed-off-by: Sven Nierlein --- distros/Makefile.CENTOS_5.10 | 1 - distros/Makefile.CENTOS_5.4 | 1 - distros/Makefile.CENTOS_5.5 | 1 - distros/Makefile.CENTOS_5.6 | 1 - distros/Makefile.CENTOS_5.7 | 1 - distros/Makefile.CENTOS_5.8 | 1 - distros/Makefile.CENTOS_5.9 | 1 - distros/Makefile.CENTOS_6.0 | 1 - distros/Makefile.CENTOS_6.1 | 1 - distros/Makefile.CENTOS_6.2 | 1 - distros/Makefile.CENTOS_6.3 | 1 - distros/Makefile.CENTOS_6.4 | 1 - distros/Makefile.CENTOS_6.5 | 1 - distros/Makefile.CENTOS_6.6 | 1 - distros/Makefile.CENTOS_7.0 | 5 +- distros/Makefile.DEBIAN_5.0 | 1 - distros/Makefile.DEBIAN_6.0 | 1 - distros/Makefile.DEBIAN_7.0 | 1 - distros/Makefile.DEBIAN_8.0 | 1 - distros/Makefile.OPENSUSE_12.1 | 1 - distros/Makefile.SLES_11 | 1 - distros/Makefile.SLES_11SP1 | 1 - distros/Makefile.SLES_11SP2 | 1 - distros/Makefile.SLES_11SP3 | 1 - distros/Makefile.SLES_12 | 1 - distros/Makefile.UBUNTU_10.04 | 1 - distros/Makefile.UBUNTU_10.10 | 1 - distros/Makefile.UBUNTU_11.04 | 1 - distros/Makefile.UBUNTU_11.10 | 1 - distros/Makefile.UBUNTU_12.04 | 1 - distros/Makefile.UBUNTU_12.10 | 1 - distros/Makefile.UBUNTU_13.04 | 1 - distros/Makefile.UBUNTU_13.10 | 1 - distros/Makefile.UBUNTU_14.04 | 1 - distros/Makefile.UBUNTU_14.10 | 1 - packages/perl-modules/Makefile | 456 +- packages/perl-modules/build_module.pl | 4 +- packages/perl-modules/check_files | 12 +- packages/perl-modules/download_package | 2 +- packages/perl-modules/lib/BuildHelper.pm | 136 +- packages/perl-modules/lib/Module/CoreList.pm |23521 -------------------- packages/perl-modules/orphaned_modules | 37 +- packages/perl-modules/sort_modules | 8 + packages/perl-modules/src/Algorithm-C3-0.08.tar.gz | Bin 11738 -> 0 bytes packages/perl-modules/src/Algorithm-C3-0.10.tar.gz | Bin 0 -> 12523 bytes packages/perl-modules/src/Any-Moose-0.21.tar.gz | Bin 15763 -> 0 bytes packages/perl-modules/src/Any-Moose-0.25.tar.gz | Bin 0 -> 29941 bytes .../perl-modules/src/App-cpanminus-1.7024.tar.gz | Bin 0 -> 313306 bytes packages/perl-modules/src/AppConfig-1.66.tar.gz | Bin 63521 -> 0 bytes packages/perl-modules/src/AppConfig-1.67.tar.gz | Bin 0 -> 64463 bytes packages/perl-modules/src/Archive-Tar-1.92.tar.gz | Bin 58422 -> 0 bytes packages/perl-modules/src/Archive-Tar-2.04.tar.gz | Bin 0 -> 59873 bytes packages/perl-modules/src/Archive-Zip-1.30.tar.gz | Bin 197179 -> 0 bytes packages/perl-modules/src/Archive-Zip-1.43.tar.gz | Bin 0 -> 186266 bytes .../src/Attribute-Handlers-0.93.tar.gz | Bin 24011 -> 0 bytes .../src/Attribute-Handlers-0.96.tar.gz | Bin 0 -> 23564 bytes .../src/B-Hooks-EndOfScope-0.12.tar.gz | Bin 16361 -> 0 bytes .../src/B-Hooks-EndOfScope-0.13.tar.gz | Bin 0 -> 25735 bytes packages/perl-modules/src/B-Keywords-1.13.tar.gz | Bin 9739 -> 0 bytes packages/perl-modules/src/Bit-Vector-7.3.tar.gz | Bin 130395 -> 0 bytes packages/perl-modules/src/Bit-Vector-7.4.tar.gz | Bin 0 -> 135965 bytes packages/perl-modules/src/CGI-Simple-1.113.tar.gz | Bin 103884 -> 0 bytes packages/perl-modules/src/CGI-Simple-1.115.tar.gz | Bin 0 -> 85165 bytes packages/perl-modules/src/CGI.pm-3.63.tar.gz | Bin 247277 -> 0 bytes packages/perl-modules/src/CPAN-1.9402.tar.gz | Bin 680842 -> 0 bytes packages/perl-modules/src/CPAN-2.05.tar.gz | Bin 0 -> 775502 bytes .../perl-modules/src/CPAN-Meta-Check-0.009.tar.gz | Bin 0 -> 12355 bytes .../perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz | Bin 47693 -> 0 bytes packages/perl-modules/src/Cairo-1.103.tar.gz | Bin 108254 -> 0 bytes packages/perl-modules/src/Capture-Tiny-0.22.tar.gz | Bin 31390 -> 0 bytes packages/perl-modules/src/Capture-Tiny-0.27.tar.gz | Bin 0 -> 34474 bytes .../src/Catalyst-Plugin-Cache-0.12.tar.gz | Bin 29098 -> 0 bytes .../src/Catalyst-Plugin-Compress-0.005.tar.gz | Bin 23368 -> 0 bytes .../src/Catalyst-Plugin-ConfigLoader-0.32.tar.gz | Bin 28085 -> 0 bytes .../src/Catalyst-Plugin-ConfigLoader-0.34.tar.gz | Bin 0 -> 30240 bytes .../src/Catalyst-Plugin-Session-0.37.tar.gz | Bin 48383 -> 0 bytes .../src/Catalyst-Plugin-StackTrace-0.12.tar.gz | Bin 23238 -> 0 bytes .../src/Catalyst-Plugin-Static-Simple-0.30.tar.gz | Bin 43419 -> 0 bytes .../src/Catalyst-Plugin-Static-Simple-0.33.tar.gz | Bin 0 -> 44753 bytes .../src/Catalyst-Runtime-5.90042.tar.gz | Bin 297800 -> 0 bytes .../src/Catalyst-Runtime-5.90082.tar.gz | Bin 0 -> 345696 bytes .../Catalyst-View-Excel-Template-Plus-0.03.tar.gz | Bin 6143 -> 0 bytes .../Catalyst-View-Excel-Template-Plus-0.04.tar.gz | Bin 0 -> 7030 bytes .../src/Catalyst-View-JSON-0.33.tar.gz | Bin 26777 -> 0 bytes .../src/Catalyst-View-JSON-0.35.tar.gz | Bin 0 -> 28844 bytes .../src/Catalyst-View-PDF-Reuse-0.04.tar.gz | Bin 5867 -> 0 bytes .../perl-modules/src/Catalyst-View-TT-0.41.tar.gz | Bin 48606 -> 0 bytes .../perl-modules/src/Catalyst-View-TT-0.42.tar.gz | Bin 0 -> 50541 bytes .../perl-modules/src/Chart-Clicker-2.86.tar.gz | Bin 72079 -> 0 bytes packages/perl-modules/src/Check-ISA-0.04.tar.gz | Bin 5552 -> 0 bytes packages/perl-modules/src/Class-C3-0.25.tar.gz | Bin 39566 -> 0 bytes packages/perl-modules/src/Class-C3-0.27.tar.gz | Bin 0 -> 25481 bytes packages/perl-modules/src/Class-Load-0.20.tar.gz | Bin 20271 -> 0 bytes packages/perl-modules/src/Class-Load-0.22.tar.gz | Bin 0 -> 34179 bytes .../perl-modules/src/Class-Load-XS-0.06.tar.gz | Bin 56141 -> 0 bytes .../perl-modules/src/Class-Load-XS-0.09.tar.gz | Bin 0 -> 73186 bytes .../src/Class-Method-Modifiers-2.04.tar.gz | Bin 42886 -> 0 bytes .../src/Class-Method-Modifiers-2.11.tar.gz | Bin 0 -> 35364 bytes .../perl-modules/src/Class-MethodMaker-2.18.tar.gz | Bin 89815 -> 0 bytes .../perl-modules/src/Class-MethodMaker-2.22.tar.gz | Bin 0 -> 77065 bytes .../perl-modules/src/Class-Singleton-1.4.tar.gz | Bin 7793 -> 0 bytes .../perl-modules/src/Class-Singleton-1.5.tar.gz | Bin 0 -> 7785 bytes packages/perl-modules/src/Clone-0.34.tar.gz | Bin 13192 -> 0 bytes .../perl-modules/src/Color-Library-0.021.tar.gz | Bin 343300 -> 0 bytes packages/perl-modules/src/Color-Scheme-1.05.tar.gz | Bin 20528 -> 0 bytes .../src/Compress-Raw-Bzip2-2.062.tar.gz | Bin 135942 -> 0 bytes .../src/Compress-Raw-Bzip2-2.068.tar.gz | Bin 0 -> 136281 bytes .../src/Compress-Raw-Zlib-2.062.tar.gz | Bin 236613 -> 0 bytes .../src/Compress-Raw-Zlib-2.068.tar.gz | Bin 0 -> 238144 bytes packages/perl-modules/src/Config-Any-0.23.tar.gz | Bin 33172 -> 0 bytes packages/perl-modules/src/Config-Any-0.24.tar.gz | Bin 0 -> 35024 bytes .../perl-modules/src/Config-General-2.52.tar.gz | Bin 60471 -> 0 bytes .../perl-modules/src/Config-General-2.56.tar.gz | Bin 0 -> 61135 bytes packages/perl-modules/src/Config-Tiny-2.14.tar.gz | Bin 16963 -> 0 bytes packages/perl-modules/src/Config-Tiny-2.20.tgz | Bin 0 -> 24350 bytes .../perl-modules/src/Crypt-Rijndael-1.11.tar.gz | Bin 23536 -> 0 bytes .../perl-modules/src/Crypt-Rijndael-1.12.tar.gz | Bin 0 -> 24512 bytes packages/perl-modules/src/Crypt-SSLeay-0.64.tar.gz | Bin 121431 -> 0 bytes packages/perl-modules/src/Crypt-SSLeay-0.72.tar.gz | Bin 0 -> 129575 bytes packages/perl-modules/src/DBD-Oracle-1.64.tar.gz | Bin 444613 -> 0 bytes packages/perl-modules/src/DBD-mysql-4.023.tar.gz | Bin 140522 -> 0 bytes packages/perl-modules/src/DBD-mysql-4.029.tar.gz | Bin 0 -> 139722 bytes packages/perl-modules/src/DBI-1.631.tar.gz | Bin 589096 -> 0 bytes packages/perl-modules/src/DBI-1.633.tar.gz | Bin 0 -> 592307 bytes packages/perl-modules/src/Data-Dumper-2.145.tar.gz | Bin 96398 -> 0 bytes packages/perl-modules/src/Data-Dumper-2.154.tar.gz | Bin 0 -> 100369 bytes .../perl-modules/src/Data-OptList-0.108.tar.gz | Bin 16201 -> 0 bytes .../perl-modules/src/Data-OptList-0.109.tar.gz | Bin 0 -> 16110 bytes packages/perl-modules/src/Date-Manip-6.40.tar.gz | Bin 1983036 -> 0 bytes packages/perl-modules/src/Date-Manip-6.48.tar.gz | Bin 0 -> 1809305 bytes packages/perl-modules/src/DateTime-1.03.tar.gz | Bin 174369 -> 0 bytes packages/perl-modules/src/DateTime-1.18.tar.gz | Bin 0 -> 212053 bytes packages/perl-modules/src/DateTime-Set-0.31.tar.gz | Bin 44582 -> 0 bytes .../perl-modules/src/DateTime-TimeZone-1.60.tar.gz | Bin 865213 -> 0 bytes .../perl-modules/src/DateTime-TimeZone-1.84.tar.gz | Bin 0 -> 901133 bytes packages/perl-modules/src/Devel-Caller-2.06.tar.gz | Bin 6540 -> 0 bytes .../perl-modules/src/Devel-CheckOS-1.73.tar.gz | Bin 0 -> 30832 bytes .../src/Devel-GlobalDestruction-0.11.tar.gz | Bin 7572 -> 0 bytes .../src/Devel-GlobalDestruction-0.13.tar.gz | Bin 0 -> 8460 bytes .../src/Devel-GlobalDestruction-XS-0.01.tar.gz | Bin 0 -> 46948 bytes .../src/Devel-OverloadInfo-0.002.tar.gz | Bin 0 -> 10966 bytes packages/perl-modules/src/Devel-PPPort-3.21.tar.gz | Bin 204037 -> 0 bytes .../perl-modules/src/Devel-StackTrace-1.30.tar.gz | Bin 18518 -> 0 bytes .../src/Devel-StackTrace-AsHTML-0.14.tar.gz | Bin 53370 -> 0 bytes .../perl-modules/src/Devel-Symdump-2.10.tar.gz | Bin 17334 -> 0 bytes packages/perl-modules/src/Digest-MD5-2.53.tar.gz | Bin 47476 -> 0 bytes packages/perl-modules/src/Digest-MD5-2.54.tar.gz | Bin 0 -> 48699 bytes .../perl-modules/src/Digest-Perl-MD5-1.8.tar.gz | Bin 74077 -> 0 bytes .../perl-modules/src/Digest-Perl-MD5-1.9.tar.gz | Bin 0 -> 72009 bytes .../src/Dist-CheckConflicts-0.09.tar.gz | Bin 18958 -> 0 bytes .../src/Dist-CheckConflicts-0.11.tar.gz | Bin 0 -> 19964 bytes .../perl-modules/src/Email-Address-1.900.tar.gz | Bin 37136 -> 0 bytes .../src/Email-Date-Format-1.004.tar.gz | Bin 13255 -> 0 bytes .../src/Email-Date-Format-1.005.tar.gz | Bin 0 -> 14324 bytes packages/perl-modules/src/Encode-2.52.tar.gz | Bin 2007288 -> 0 bytes packages/perl-modules/src/Encode-2.68.tar.gz | Bin 0 -> 2011076 bytes .../perl-modules/src/Encode-Locale-1.03.tar.gz | Bin 6846 -> 0 bytes .../perl-modules/src/Encode-Locale-1.04.tar.gz | Bin 0 -> 8298 bytes packages/perl-modules/src/Error-0.17020.tar.gz | Bin 22345 -> 0 bytes packages/perl-modules/src/Error-0.17022.tar.gz | Bin 0 -> 31045 bytes packages/perl-modules/src/Eval-Closure-0.11.tar.gz | Bin 18126 -> 0 bytes packages/perl-modules/src/Eval-Closure-0.12.tar.gz | Bin 0 -> 19699 bytes .../src/Excel-Template-Plus-0.05.tar.gz | Bin 8808 -> 0 bytes .../src/Excel-Template-Plus-0.06.tar.gz | Bin 0 -> 9384 bytes .../perl-modules/src/Exception-Class-1.37.tar.gz | Bin 26457 -> 0 bytes packages/perl-modules/src/Exporter-5.68.tar.gz | Bin 16854 -> 0 bytes packages/perl-modules/src/Exporter-5.70.tar.gz | Bin 0 -> 17293 bytes .../perl-modules/src/Exporter-Tiny-0.042.tar.gz | Bin 0 -> 32173 bytes .../src/ExtUtils-CBuilder-0.280205.tar.gz | Bin 34683 -> 0 bytes .../src/ExtUtils-CBuilder-0.280220.tar.gz | Bin 0 -> 39131 bytes .../perl-modules/src/ExtUtils-Config-0.007.tar.gz | Bin 12135 -> 0 bytes .../perl-modules/src/ExtUtils-Config-0.008.tar.gz | Bin 0 -> 11165 bytes .../perl-modules/src/ExtUtils-Depends-0.304.tar.gz | Bin 11445 -> 0 bytes .../perl-modules/src/ExtUtils-Helpers-0.021.tar.gz | Bin 17019 -> 0 bytes .../perl-modules/src/ExtUtils-Helpers-0.022.tar.gz | Bin 0 -> 17078 bytes .../src/ExtUtils-InstallPaths-0.009.tar.gz | Bin 18496 -> 0 bytes .../src/ExtUtils-InstallPaths-0.010.tar.gz | Bin 0 -> 18395 bytes .../src/ExtUtils-MakeMaker-6.72.tar.gz | Bin 423681 -> 0 bytes .../src/ExtUtils-MakeMaker-7.04.tar.gz | Bin 0 -> 439960 bytes .../perl-modules/src/ExtUtils-Manifest-1.61.tar.gz | Bin 28838 -> 0 bytes .../perl-modules/src/ExtUtils-Manifest-1.70.tar.gz | Bin 0 -> 37941 bytes .../perl-modules/src/ExtUtils-ParseXS-3.21.tar.gz | Bin 68251 -> 0 bytes .../perl-modules/src/ExtUtils-ParseXS-3.24.tar.gz | Bin 0 -> 66863 bytes .../src/ExtUtils-PkgConfig-1.14.tar.gz | Bin 9814 -> 0 bytes packages/perl-modules/src/FCGI-0.74.tar.gz | Bin 97599 -> 0 bytes packages/perl-modules/src/FCGI-0.77.tar.gz | Bin 0 -> 90561 bytes .../perl-modules/src/FCGI-ProcManager-0.24.tar.gz | Bin 21564 -> 0 bytes .../src/FCGI-ProcManager-MaxRequests-0.02.tar.gz | Bin 15407 -> 0 bytes .../perl-modules/src/File-ChangeNotify-0.23.tar.gz | Bin 19200 -> 0 bytes .../perl-modules/src/File-Compare-1.1001.tar.gz | Bin 1708 -> 0 bytes .../perl-modules/src/File-ShareDir-1.03.tar.gz | Bin 33711 -> 0 bytes .../perl-modules/src/File-ShareDir-1.102.tar.gz | Bin 0 -> 11973 bytes .../src/File-ShareDir-Install-0.04.tar.gz | Bin 4781 -> 0 bytes .../src/File-ShareDir-Install-0.10.tar.gz | Bin 0 -> 6870 bytes packages/perl-modules/src/File-Temp-0.22.tar.gz | Bin 38352 -> 0 bytes packages/perl-modules/src/File-chdir-0.1008.tar.gz | Bin 21595 -> 0 bytes .../src/Filesys-Notify-Simple-0.12.tar.gz | Bin 12935 -> 0 bytes packages/perl-modules/src/Filter-1.49.tar.gz | Bin 85905 -> 0 bytes packages/perl-modules/src/Font-TTF-1.02.tar.gz | Bin 220317 -> 0 bytes packages/perl-modules/src/Forest-0.09.tar.gz | Bin 33001 -> 0 bytes packages/perl-modules/src/Gearman-1.11.tar.gz | Bin 27170 -> 0 bytes packages/perl-modules/src/Gearman-1.12.tar.gz | Bin 0 -> 29938 bytes .../src/Geometry-Primitive-0.22.tar.gz | Bin 23025 -> 0 bytes packages/perl-modules/src/Getopt-Long-2.41.tar.gz | Bin 42060 -> 0 bytes packages/perl-modules/src/Getopt-Long-2.43.tar.gz | Bin 0 -> 42556 bytes .../src/Getopt-Long-Descriptive-0.093.tar.gz | Bin 23954 -> 0 bytes .../src/Getopt-Long-Descriptive-0.098.tar.gz | Bin 0 -> 28582 bytes .../perl-modules/src/Graphics-Color-0.29.tar.gz | Bin 16681 -> 0 bytes .../src/Graphics-Primitive-0.61.tar.gz | Bin 43971 -> 0 bytes .../Graphics-Primitive-Driver-Cairo-0.44.tar.gz | Bin 18068 -> 0 bytes packages/perl-modules/src/HTTP-Body-1.17.tar.gz | Bin 24376 -> 0 bytes packages/perl-modules/src/HTTP-Body-1.19.tar.gz | Bin 0 -> 24189 bytes .../perl-modules/src/HTTP-Parser-XS-0.16.tar.gz | Bin 78509 -> 0 bytes .../perl-modules/src/HTTP-Parser-XS-0.17.tar.gz | Bin 0 -> 86185 bytes .../src/Hash-Util-FieldHash-Compat-0.03.tar.gz | Bin 4702 -> 0 bytes packages/perl-modules/src/IO-Compress-2.062.tar.gz | Bin 242704 -> 0 bytes packages/perl-modules/src/IO-Compress-2.068.tar.gz | Bin 0 -> 243169 bytes packages/perl-modules/src/IPC-Cmd-0.84.tar.gz | Bin 28897 -> 0 bytes packages/perl-modules/src/IPC-Cmd-0.92.tar.gz | Bin 0 -> 30129 bytes packages/perl-modules/src/JSON-2.59.tar.gz | Bin 83997 -> 0 bytes packages/perl-modules/src/JSON-2.90.tar.gz | Bin 0 -> 85333 bytes packages/perl-modules/src/JSON-Any-1.30.tar.gz | Bin 19612 -> 0 bytes packages/perl-modules/src/JSON-PP-2.27202.tar.gz | Bin 41076 -> 0 bytes packages/perl-modules/src/JSON-PP-2.27300.tar.gz | Bin 0 -> 41365 bytes packages/perl-modules/src/JSON-XS-2.34.tar.gz | Bin 75468 -> 0 bytes packages/perl-modules/src/JSON-XS-3.01.tar.gz | Bin 0 -> 78245 bytes .../src/LWP-Protocol-Net-Curl-0.018.tar.gz | Bin 30589 -> 0 bytes .../src/LWP-Protocol-connect-6.09.tar.gz | Bin 0 -> 15208 bytes .../src/LWP-Protocol-https-6.04.tar.gz | Bin 4035 -> 0 bytes .../src/LWP-Protocol-https-6.06.tar.gz | Bin 0 -> 8376 bytes .../perl-modules/src/Layout-Manager-0.34.tar.gz | Bin 34125 -> 0 bytes packages/perl-modules/src/List-Compare-0.37.tar.gz | Bin 83106 -> 0 bytes packages/perl-modules/src/List-Compare-0.39.tar.gz | Bin 0 -> 84780 bytes .../perl-modules/src/List-MoreUtils-0.33.tar.gz | Bin 38997 -> 0 bytes .../perl-modules/src/List-MoreUtils-0.402.tar.gz | Bin 0 -> 160370 bytes packages/perl-modules/src/Log-Dispatch-2.41.tar.gz | Bin 35285 -> 0 bytes packages/perl-modules/src/Log-Dispatch-2.44.tar.gz | Bin 0 -> 49540 bytes packages/perl-modules/src/Log-Log4perl-1.42.tar.gz | Bin 274273 -> 0 bytes packages/perl-modules/src/Log-Log4perl-1.46.tar.gz | Bin 0 -> 278058 bytes packages/perl-modules/src/MIME-Base64-3.14.tar.gz | Bin 18193 -> 0 bytes packages/perl-modules/src/MIME-Base64-3.15.tar.gz | Bin 0 -> 18438 bytes packages/perl-modules/src/MIME-Lite-3.029.tar.gz | Bin 64651 -> 0 bytes packages/perl-modules/src/MIME-Lite-3.030.tar.gz | Bin 0 -> 81830 bytes packages/perl-modules/src/MIME-Types-2.02.tar.gz | Bin 44970 -> 0 bytes packages/perl-modules/src/MIME-Types-2.09.tar.gz | Bin 0 -> 56101 bytes .../src/Module-Build-Tiny-0.026.tar.gz | Bin 19338 -> 0 bytes .../src/Module-Build-Tiny-0.039.tar.gz | Bin 0 -> 20663 bytes .../perl-modules/src/Module-CoreList-2.97.tar.gz | Bin 66580 -> 0 bytes .../src/Module-CoreList-5.20150120.tar.gz | Bin 0 -> 80818 bytes packages/perl-modules/src/Module-Find-0.11.tar.gz | Bin 5286 -> 0 bytes packages/perl-modules/src/Module-Find-0.12.tar.gz | Bin 0 -> 5902 bytes .../src/Module-Implementation-0.07.tar.gz | Bin 11388 -> 0 bytes .../src/Module-Implementation-0.09.tar.gz | Bin 0 -> 18553 bytes .../perl-modules/src/Module-Install-1.06.tar.gz | Bin 135467 -> 0 bytes .../perl-modules/src/Module-Install-1.14.tar.gz | Bin 0 -> 128795 bytes packages/perl-modules/src/Module-Load-0.24.tar.gz | Bin 6089 -> 0 bytes packages/perl-modules/src/Module-Load-0.32.tar.gz | Bin 0 -> 8498 bytes .../src/Module-Load-Conditional-0.54.tar.gz | Bin 12381 -> 0 bytes .../src/Module-Load-Conditional-0.64.tar.gz | Bin 0 -> 13110 bytes .../src/Module-Metadata-1.000014.tar.gz | Bin 30648 -> 0 bytes .../src/Module-Metadata-1.000026.tar.gz | Bin 0 -> 41296 bytes .../perl-modules/src/Module-Pluggable-4.8.tar.gz | Bin 27074 -> 0 bytes .../perl-modules/src/Module-Pluggable-5.1.tar.gz | Bin 0 -> 29418 bytes .../perl-modules/src/Module-Runtime-0.013.tar.gz | Bin 15849 -> 0 bytes .../perl-modules/src/Module-Runtime-0.014.tar.gz | Bin 0 -> 17396 bytes .../perl-modules/src/Module-ScanDeps-1.10.tar.gz | Bin 58946 -> 0 bytes .../perl-modules/src/Module-ScanDeps-1.18.tar.gz | Bin 0 -> 61759 bytes .../src/Monitoring-Livestatus-Class-0.04.tar.gz | Bin 36296 -> 0 bytes .../src/Monitoring-Livestatus-Class-0.06.tar.gz | Bin 0 -> 36935 bytes .../perl-modules/src/Monitoring-Plugin-0.37.tar.gz | Bin 62278 -> 0 bytes .../perl-modules/src/Monitoring-Plugin-0.38.tar.gz | Bin 0 -> 62426 bytes .../perl-modules/src/MooseX-Aliases-0.11.tar.gz | Bin 17732 -> 0 bytes .../src/MooseX-AttributeHelpers-0.23.tar.gz | Bin 38659 -> 0 bytes packages/perl-modules/src/MooseX-Clone-0.05.tar.gz | Bin 7805 -> 0 bytes .../perl-modules/src/MooseX-Daemonize-0.18.tar.gz | Bin 30820 -> 0 bytes .../perl-modules/src/MooseX-Daemonize-0.19.tar.gz | Bin 0 -> 40543 bytes .../perl-modules/src/MooseX-Getopt-0.56.tar.gz | Bin 38332 -> 0 bytes .../perl-modules/src/MooseX-Getopt-0.65.tar.gz | Bin 0 -> 48797 bytes .../src/MooseX-MethodAttributes-0.28.tar.gz | Bin 27357 -> 0 bytes .../src/MooseX-MethodAttributes-0.29.tar.gz | Bin 0 -> 33301 bytes .../src/MooseX-Params-Validate-0.18.tar.gz | Bin 19137 -> 0 bytes .../src/MooseX-Role-Parameterized-1.00.tar.gz | Bin 34386 -> 0 bytes .../src/MooseX-Role-Parameterized-1.08.tar.gz | Bin 0 -> 43284 bytes .../src/MooseX-Role-WithOverloading-0.13.tar.gz | Bin 19415 -> 0 bytes .../src/MooseX-Role-WithOverloading-0.16.tar.gz | Bin 0 -> 30591 bytes .../src/MooseX-SemiAffordanceAccessor-0.09.tar.gz | Bin 9777 -> 0 bytes .../perl-modules/src/MooseX-Storage-0.39.tar.gz | Bin 43310 -> 0 bytes packages/perl-modules/src/MooseX-Types-0.36.tar.gz | Bin 55122 -> 0 bytes packages/perl-modules/src/MooseX-Types-0.45.tar.gz | Bin 0 -> 52335 bytes .../perl-modules/src/Mozilla-CA-20130114.tar.gz | Bin 139200 -> 0 bytes .../perl-modules/src/Mozilla-CA-20141217.tar.gz | Bin 0 -> 151260 bytes packages/perl-modules/src/NEXT-0.65.tar.gz | Bin 10174 -> 0 bytes packages/perl-modules/src/Net-Curl-0.31.tar.gz | Bin 88775 -> 0 bytes packages/perl-modules/src/Net-HTTP-6.06.tar.gz | Bin 15609 -> 0 bytes packages/perl-modules/src/Net-HTTP-6.07.tar.gz | Bin 0 -> 16945 bytes packages/perl-modules/src/Net-Server-2.007.tar.gz | Bin 133765 -> 0 bytes packages/perl-modules/src/Net-Server-2.008.tar.gz | Bin 0 -> 119565 bytes .../perl-modules/src/Object-Signature-1.07.tar.gz | Bin 29588 -> 0 bytes packages/perl-modules/src/PAR-Dist-0.49.tar.gz | Bin 36682 -> 0 bytes packages/perl-modules/src/PDF-Reuse-0.35.tar.gz | Bin 62478 -> 0 bytes packages/perl-modules/src/PPI-1.215.tar.gz | Bin 228887 -> 0 bytes packages/perl-modules/src/PPIx-Regexp-0.034.tar.gz | Bin 153764 -> 0 bytes .../src/PPIx-Utilities-1.001000.tar.gz | Bin 25707 -> 0 bytes .../perl-modules/src/Package-Constants-0.02.tar.gz | Bin 2761 -> 0 bytes .../perl-modules/src/Package-Stash-0.35.tar.gz | Bin 36357 -> 0 bytes .../perl-modules/src/Package-Stash-0.37.tar.gz | Bin 0 -> 40309 bytes packages/perl-modules/src/PadWalker-1.96.tar.gz | Bin 15272 -> 0 bytes .../perl-modules/src/Params-Validate-1.08.tar.gz | Bin 103728 -> 0 bytes .../perl-modules/src/Params-Validate-1.17.tar.gz | Bin 0 -> 123268 bytes packages/perl-modules/src/Path-Class-0.32.tar.gz | Bin 32205 -> 0 bytes packages/perl-modules/src/Path-Class-0.35.tar.gz | Bin 0 -> 34086 bytes packages/perl-modules/src/Path-Tiny-0.061.tar.gz | Bin 0 -> 71937 bytes packages/perl-modules/src/PathTools-3.40.tar.gz | Bin 139883 -> 0 bytes packages/perl-modules/src/PathTools-3.47.tar.gz | Bin 0 -> 143041 bytes packages/perl-modules/src/Perl-Critic-1.118.tar.gz | Bin 645371 -> 0 bytes .../src/Perl-Critic-Deprecated-1.108.tar.gz | Bin 15074 -> 0 bytes .../src/Perl-Critic-Dynamic-0.05.tar.gz | Bin 18860 -> 0 bytes .../src/Perl-Critic-Nits-v1.0.0.tar.gz | Bin 6891 -> 0 bytes ...rl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz | Bin 6408 -> 0 bytes packages/perl-modules/src/Perl-OSType-1.003.tar.gz | Bin 14850 -> 0 bytes packages/perl-modules/src/Perl-OSType-1.007.tar.gz | Bin 0 -> 16427 bytes .../perl-modules/src/Perl-Tidy-20130806.tar.gz | Bin 421134 -> 0 bytes packages/perl-modules/src/Plack-1.0028.tar.gz | Bin 235735 -> 0 bytes packages/perl-modules/src/Plack-1.0033.tar.gz | Bin 0 -> 239206 bytes ...Middleware-FixMissingBodyInRedirect-0.12.tar.gz | Bin 0 -> 11361 bytes .../Plack-Middleware-MethodOverride-0.11.tar.gz | Bin 0 -> 5530 bytes ...lack-Middleware-RemoveRedundantBody-0.05.tar.gz | Bin 0 -> 10387 bytes packages/perl-modules/src/Pod-Coverage-0.23.tar.gz | Bin 13211 -> 0 bytes packages/perl-modules/src/Pod-Escapes-1.04.tar.gz | Bin 10187 -> 0 bytes packages/perl-modules/src/Pod-Escapes-1.07.tar.gz | Bin 0 -> 11652 bytes packages/perl-modules/src/Pod-Parser-1.61.tar.gz | Bin 79353 -> 0 bytes packages/perl-modules/src/Pod-Simple-3.28.tar.gz | Bin 244687 -> 0 bytes packages/perl-modules/src/Pod-Simple-3.29.tar.gz | Bin 0 -> 247127 bytes packages/perl-modules/src/Pod-Spell-1.05.tar.gz | Bin 24754 -> 0 bytes packages/perl-modules/src/Pod-Usage-1.64.tar.gz | Bin 0 -> 20236 bytes packages/perl-modules/src/Readonly-1.03.tar.gz | Bin 13677 -> 0 bytes packages/perl-modules/src/Readonly-2.00.tar.gz | Bin 0 -> 23673 bytes packages/perl-modules/src/Safe-Isa-1.000003.tar.gz | Bin 3700 -> 0 bytes packages/perl-modules/src/Safe-Isa-1.000005.tar.gz | Bin 0 -> 5311 bytes packages/perl-modules/src/Set-Infinite-0.65.tar.gz | Bin 50041 -> 0 bytes packages/perl-modules/src/Set-Object-1.31.tar.gz | Bin 75019 -> 0 bytes packages/perl-modules/src/Set-Object-1.34.tar.gz | Bin 0 -> 75039 bytes packages/perl-modules/src/Socket-2.011.tar.gz | Bin 38366 -> 0 bytes packages/perl-modules/src/Socket-2.016.tar.gz | Bin 0 -> 40582 bytes .../src/Spreadsheet-ParseExcel-0.59.tar.gz | Bin 188131 -> 0 bytes .../src/Spreadsheet-ParseExcel-0.65.tar.gz | Bin 0 -> 206923 bytes .../src/Spreadsheet-WriteExcel-2.39.tar.gz | Bin 494383 -> 0 bytes .../src/Spreadsheet-WriteExcel-2.40.tar.gz | Bin 0 -> 480975 bytes packages/perl-modules/src/Starman-0.4006.tar.gz | Bin 28179 -> 0 bytes packages/perl-modules/src/Starman-0.4011.tar.gz | Bin 0 -> 29311 bytes packages/perl-modules/src/Storable-2.45.tar.gz | Bin 184098 -> 0 bytes .../perl-modules/src/Stream-Buffered-0.02.tar.gz | Bin 22215 -> 0 bytes .../perl-modules/src/Stream-Buffered-0.03.tar.gz | Bin 0 -> 10348 bytes packages/perl-modules/src/String-CRC32-1.4.tar.gz | Bin 6976 -> 0 bytes packages/perl-modules/src/String-CRC32-1.5.tar.gz | Bin 0 -> 6990 bytes .../perl-modules/src/String-Format-1.17.tar.gz | Bin 12841 -> 0 bytes .../src/String-RewritePrefix-0.006.tar.gz | Bin 11002 -> 0 bytes .../src/String-RewritePrefix-0.007.tar.gz | Bin 0 -> 13553 bytes .../perl-modules/src/Sub-Exporter-0.986.tar.gz | Bin 45295 -> 0 bytes .../perl-modules/src/Sub-Exporter-0.987.tar.gz | Bin 0 -> 45980 bytes .../src/Sub-Exporter-Progressive-0.001010.tar.gz | Bin 5762 -> 0 bytes .../src/Sub-Exporter-Progressive-0.001011.tar.gz | Bin 0 -> 5829 bytes packages/perl-modules/src/Sub-Identify-0.04.tar.gz | Bin 42502 -> 0 bytes packages/perl-modules/src/Sub-Identify-0.10.tar.gz | Bin 0 -> 52135 bytes packages/perl-modules/src/Sub-Install-0.926.tar.gz | Bin 15065 -> 0 bytes packages/perl-modules/src/Sub-Install-0.928.tar.gz | Bin 0 -> 18669 bytes packages/perl-modules/src/Sub-Name-0.05.tar.gz | Bin 3463 -> 0 bytes packages/perl-modules/src/Sub-Name-0.12.tar.gz | Bin 0 -> 25498 bytes .../perl-modules/src/Sys-SigAction-0.20.tar.gz | Bin 22094 -> 0 bytes .../perl-modules/src/Sys-SigAction-0.21.tar.gz | Bin 0 -> 22152 bytes packages/perl-modules/src/Sys-Syslog-0.33.tar.gz | Bin 82440 -> 0 bytes .../perl-modules/src/Template-Toolkit-2.25.tar.gz | Bin 501038 -> 0 bytes .../perl-modules/src/Template-Toolkit-2.26.tar.gz | Bin 0 -> 503055 bytes packages/perl-modules/src/Term-Clui-1.68.tar.gz | Bin 65300 -> 0 bytes packages/perl-modules/src/Term-Clui-1.70.tar.gz | Bin 0 -> 65527 bytes .../perl-modules/src/Term-ProgressBar-2.14.tar.gz | Bin 15979 -> 0 bytes .../perl-modules/src/Term-ProgressBar-2.17.tar.gz | Bin 0 -> 18711 bytes .../perl-modules/src/Term-ReadLine-Gnu-1.24.tar.gz | Bin 74199 -> 0 bytes .../perl-modules/src/Term-ReadLine-Gnu-1.25.tar.gz | Bin 0 -> 74490 bytes packages/perl-modules/src/TermReadKey-2.30.tar.gz | Bin 37006 -> 0 bytes packages/perl-modules/src/TermReadKey-2.32.tar.gz | Bin 0 -> 81547 bytes packages/perl-modules/src/Test-Cmd-1.05.tar.gz | Bin 31104 -> 0 bytes packages/perl-modules/src/Test-Cmd-1.07.tar.gz | Bin 0 -> 32999 bytes .../perl-modules/src/Test-Perl-Critic-1.02.tar.gz | Bin 21250 -> 0 bytes packages/perl-modules/src/Test-Pod-1.48.tar.gz | Bin 11291 -> 0 bytes .../perl-modules/src/Test-Pod-Coverage-1.08.tar.gz | Bin 6418 -> 0 bytes .../perl-modules/src/Test-Simple-1.001003.tar.gz | Bin 113151 -> 0 bytes .../perl-modules/src/Test-Simple-1.001014.tar.gz | Bin 0 -> 127212 bytes packages/perl-modules/src/Text-Flow-0.01.tar.gz | Bin 11571 -> 0 bytes packages/perl-modules/src/Text-PDF-0.29.tar.gz | Bin 51466 -> 0 bytes packages/perl-modules/src/Thread-Queue-3.02.tar.gz | Bin 13850 -> 0 bytes packages/perl-modules/src/Thread-Queue-3.05.tar.gz | Bin 0 -> 13974 bytes .../perl-modules/src/Tie-RefHash-Weak-0.09.tar.gz | Bin 7057 -> 0 bytes packages/perl-modules/src/Tree-Simple-1.18.tar.gz | Bin 32851 -> 0 bytes packages/perl-modules/src/Tree-Simple-1.25.tgz | Bin 0 -> 44704 bytes .../src/Tree-Simple-VisitorFactory-0.10.tar.gz | Bin 27970 -> 0 bytes .../src/Tree-Simple-VisitorFactory-0.12.tgz | Bin 0 -> 44779 bytes packages/perl-modules/src/Try-Tiny-0.18.tar.gz | Bin 16499 -> 0 bytes packages/perl-modules/src/Try-Tiny-0.22.tar.gz | Bin 0 -> 18311 bytes .../perl-modules/src/Types-Serialiser-1.0.tar.gz | Bin 0 -> 6238 bytes .../src/UNIVERSAL-isa-1.20120726.tar.gz | Bin 12371 -> 0 bytes .../src/UNIVERSAL-isa-1.20140927.tar.gz | Bin 0 -> 28099 bytes packages/perl-modules/src/URI-1.60.tar.gz | Bin 81196 -> 0 bytes packages/perl-modules/src/URI-1.65.tar.gz | Bin 0 -> 82882 bytes .../perl-modules/src/Variable-Magic-0.52.tar.gz | Bin 58146 -> 0 bytes .../perl-modules/src/Variable-Magic-0.55.tar.gz | Bin 0 -> 58505 bytes packages/perl-modules/src/XML-LibXML-2.0102.tar.gz | Bin 455320 -> 0 bytes packages/perl-modules/src/XML-LibXML-2.0117.tar.gz | Bin 0 -> 463827 bytes packages/perl-modules/src/XML-Parser-2.41.tar.gz | Bin 238441 -> 0 bytes packages/perl-modules/src/XML-Parser-2.44.tar.gz | Bin 0 -> 237377 bytes packages/perl-modules/src/XML-Twig-3.44.tar.gz | Bin 390219 -> 0 bytes packages/perl-modules/src/XML-Twig-3.48.tar.gz | Bin 0 -> 401255 bytes packages/perl-modules/src/XSLoader-0.16.tar.gz | Bin 11266 -> 0 bytes packages/perl-modules/src/YAML-0.84.tar.gz | Bin 121150 -> 0 bytes packages/perl-modules/src/YAML-1.14.tar.gz | Bin 0 -> 80688 bytes packages/perl-modules/src/YAML-LibYAML-0.58.tar.gz | Bin 0 -> 140734 bytes packages/perl-modules/src/YAML-Syck-1.27.tar.gz | Bin 173024 -> 0 bytes packages/perl-modules/src/aliased-0.31.tar.gz | Bin 8976 -> 0 bytes packages/perl-modules/src/aliased-0.34.tar.gz | Bin 0 -> 30464 bytes packages/perl-modules/src/autodie-2.25.tar.gz | Bin 87373 -> 0 bytes packages/perl-modules/src/autodie-2.26.tar.gz | Bin 0 -> 90887 bytes packages/perl-modules/src/boolean-0.30.tar.gz | Bin 33231 -> 0 bytes packages/perl-modules/src/boolean-0.43.tar.gz | Bin 0 -> 14841 bytes packages/perl-modules/src/common-sense-3.72.tar.gz | Bin 10985 -> 0 bytes packages/perl-modules/src/common-sense-3.73.tar.gz | Bin 0 -> 11132 bytes packages/perl-modules/src/indirect-0.30.tar.gz | Bin 41721 -> 0 bytes packages/perl-modules/src/libnet-1.23.tar.gz | Bin 67699 -> 0 bytes packages/perl-modules/src/libnet-3.05.tar.gz | Bin 0 -> 83473 bytes packages/perl-modules/src/libwww-perl-6.05.tar.gz | Bin 132505 -> 0 bytes packages/perl-modules/src/libwww-perl-6.08.tar.gz | Bin 0 -> 135990 bytes .../src/namespace-autoclean-0.13.tar.gz | Bin 12954 -> 0 bytes .../src/namespace-autoclean-0.24.tar.gz | Bin 0 -> 36241 bytes .../perl-modules/src/namespace-clean-0.24.tar.gz | Bin 12659 -> 0 bytes .../perl-modules/src/namespace-clean-0.25.tar.gz | Bin 0 -> 12816 bytes packages/perl-modules/src/parent-0.226.tar.gz | Bin 5883 -> 0 bytes packages/perl-modules/src/parent-0.228.tar.gz | Bin 0 -> 6130 bytes packages/perl-modules/src/podlators-2.5.1.tar.gz | Bin 100313 -> 0 bytes packages/perl-modules/src/podlators-2.5.3.tar.gz | Bin 0 -> 104823 bytes packages/perl-modules/src/threads-1.87.tar.gz | Bin 102965 -> 0 bytes packages/perl-modules/src/threads-1.96.tar.gz | Bin 0 -> 104818 bytes .../perl-modules/src/threads-shared-1.43.tar.gz | Bin 97427 -> 0 bytes .../perl-modules/src/threads-shared-1.46.tar.gz | Bin 0 -> 97993 bytes packages/perl-modules/src/version-0.9903.tar.gz | Bin 108336 -> 0 bytes packages/perl-modules/src/version-0.9912.tar.gz | Bin 0 -> 123921 bytes packages/perl-modules/update_modules | 36 +- t/20-package_perl-modules.t | 11 + 446 files changed, 363 insertions(+), 23899 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=eee1c61b63ff359d69b01b89379918f15880b276 From git at mathias-kettner.de Fri Jan 23 15:37:13 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 15:37:13 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: update helper script Message-ID: <20150123143713.1DCA7809D1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8a66b362352d3c9f0afc92cc860c0fe66c01e55d URL: http://omdistro.org/projects/omd/repository/revisions/8a66b362352d3c9f0afc92cc860c0fe66c01e55d Author: Sven Nierlein Date: Fri Jan 23 15:36:51 2015 +0100 Commiter: Sven Nierlein Date: Fri Jan 23 15:36:51 2015 +0100 perl-modules: update helper script --- packages/perl-modules/orphaned_modules | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/perl-modules/orphaned_modules b/packages/perl-modules/orphaned_modules index 541060d..84cf79e 100755 --- a/packages/perl-modules/orphaned_modules +++ b/packages/perl-modules/orphaned_modules @@ -66,6 +66,20 @@ for my $f (keys %{$files}) { } } +# check other modules +for my $m (keys %{$more_modules}) { + if(BuildHelper::is_core_module($m, 5.008)) { + print "WARNING: ",$m, " is a core module and should be removed\n"; + next; + } + my $mdep = BuildHelper::module_to_file($m, $files, $more_modules->{$m}); + if(!defined $mdep) { + print "WARNING: ",$m, " does not resolve to a file\n"; + } else { + delete $orphaned->{$mdep}; + } +} + #################################### # print result for my $file (keys %{$orphaned}) { From git at mathias-kettner.de Fri Jan 23 17:02:53 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 17:02:53 +0100 Subject: [omd-commits] OMD Git: omd: icinga: update 1.12.0 Message-ID: <20150123160253.4317B80CEE@mail.mathias-kettner.de> Module: omd Branch: master Commit: e5636699f255d9f4171742c3c675c79bed96d263 URL: http://omdistro.org/projects/omd/repository/revisions/e5636699f255d9f4171742c3c675c79bed96d263 Author: Sven Nierlein Date: Fri Jan 23 16:07:00 2015 +0100 Commiter: Sven Nierlein Date: Fri Jan 23 16:07:00 2015 +0100 icinga: update 1.12.0 --- Changelog | 1 + packages/icinga/Makefile | 2 +- packages/icinga/{icinga-1.11.4.tar.gz => icinga-1.12.0.tar.gz} | Bin 18657247 -> 18670338 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index c5e8c95..a93b1a9 100644 --- a/Changelog +++ b/Changelog @@ -42,6 +42,7 @@ This file documents the revision history for the Open Monitoring Distribution - Mod-Gearman: Update 1.5.1 - Thruk: Update to 1.86-2 - Updated Monitoring-Plugins to 2.1.1 + - Icinga: Update to 1.12.0 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile index 2107b2c..0c340b1 100644 --- a/packages/icinga/Makefile +++ b/packages/icinga/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = icinga -VERSION = 1.11.4 +VERSION = 1.12.0 DIR = $(NAME)-$(VERSION) # Configure options for Icinga. Since we want to compile diff --git a/packages/icinga/icinga-1.11.4.tar.gz b/packages/icinga/icinga-1.12.0.tar.gz similarity index 67% rename from packages/icinga/icinga-1.11.4.tar.gz rename to packages/icinga/icinga-1.12.0.tar.gz index 6754361..c8f5828 100644 Binary files a/packages/icinga/icinga-1.11.4.tar.gz and b/packages/icinga/icinga-1.12.0.tar.gz differ From git at mathias-kettner.de Fri Jan 23 17:02:53 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 23 Jan 2015 17:02:53 +0100 Subject: [omd-commits] OMD Git: omd: skip lint checks by pattern from env Message-ID: <20150123160253.57B9680CD0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 92e8189b48a7ad6d8a426659f9b0d65cec0c3729 URL: http://omdistro.org/projects/omd/repository/revisions/92e8189b48a7ad6d8a426659f9b0d65cec0c3729 Author: Sven Nierlein Date: Fri Jan 23 17:02:13 2015 +0100 Commiter: Sven Nierlein Date: Fri Jan 23 17:02:13 2015 +0100 skip lint checks by pattern from env --- t/TestUtils.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index 6051518..ecd2a3f 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -333,6 +333,9 @@ sub test_url { if($page->{'content'} =~ /^\[.*\]$/mx) { skip "no lint check for json data", 2; } + if($ENV{LINTSKIPPATTERN} && $test->{'url'} =~ m|/$ENV{LINTSKIPPATTERN}/|mx) { + skip "lint check skipped by LINTSKIPPATTERN: ".$ENV{LINTSKIPPATTERN}, 2; + } my $lint = new HTML::Lint; isa_ok( $lint, "HTML::Lint" ); From git at mathias-kettner.de Mon Jan 26 01:05:37 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 26 Jan 2015 01:05:37 +0100 Subject: [omd-commits] OMD Git: omd: tests: skip html lint for json code in curly brackets too Message-ID: <20150126000538.05F39807CC@mail.mathias-kettner.de> Module: omd Branch: master Commit: ae4101d90467eb75193c26a9e98844cf1dd0c805 URL: http://omdistro.org/projects/omd/repository/revisions/ae4101d90467eb75193c26a9e98844cf1dd0c805 Author: Gerhard Lausser Date: Mon Jan 26 01:05:34 2015 +0100 Commiter: Gerhard Lausser Date: Mon Jan 26 01:05:34 2015 +0100 tests: skip html lint for json code in curly brackets too --- t/TestUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index ecd2a3f..b1e834b 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -330,7 +330,7 @@ sub test_url { if($use_html_lint == 0) { skip "no HTML::Lint installed", 2; } - if($page->{'content'} =~ /^\[.*\]$/mx) { + if($page->{'content'} =~ /^\[.*\]$/mx || $page->{'content'} =~ /^\{.*\}$/mx) { skip "no lint check for json data", 2; } if($ENV{LINTSKIPPATTERN} && $test->{'url'} =~ m|/$ENV{LINTSKIPPATTERN}/|mx) { From git at mathias-kettner.de Mon Jan 26 09:48:31 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 26 Jan 2015 09:48:31 +0100 Subject: [omd-commits] OMD Git: omd: Added ADMIN_MAIL config option for configuring sites users mail forwarding Message-ID: <20150126084831.3983E807E8@mail.mathias-kettner.de> Module: omd Branch: master Commit: f270e81a6d513481a76625af2ed0d3dca9b0ae92 URL: http://omdistro.org/projects/omd/repository/revisions/f270e81a6d513481a76625af2ed0d3dca9b0ae92 Author: Lars Michelsen Date: Mon Jan 26 09:48:10 2015 +0100 Commiter: Lars Michelsen Date: Mon Jan 26 09:48:10 2015 +0100 Added ADMIN_MAIL config option for configuring sites users mail forwarding --- Changelog | 8 ++++++++ packages/omd/ADMIN_MAIL.hook | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/Changelog b/Changelog index c5e8c95..ada77ce 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,14 @@ This file documents the revision history for the Open Monitoring Distribution 1.30 - omd: + - Added "Basic / ADMIN_MAIL" hook to configure the target mail + address for eMails sent to the site user (e.g. created by + crontab). Finally this generates the ~/.forward file within + the sites directory. When a mail address is configured, the + file is written, when you have none configured, the file is + deleted. + If you already have a ~/.forward file, the mail address will + automatically be used as ADMIN_MAIL value. - Added backup/restore modes to backup and restore sites completely You can backup your sites and restore them with the same or a different name. diff --git a/packages/omd/ADMIN_MAIL.hook b/packages/omd/ADMIN_MAIL.hook new file mode 100755 index 0000000..4d03231 --- /dev/null +++ b/packages/omd/ADMIN_MAIL.hook @@ -0,0 +1,28 @@ +#!/bin/bash + +# Alias: Administrative Mail Address +# Menu: Basic +# Description: +# Mails sent to the sites user (e.g. by crontab) are forwarded +# to this mail address. If you configure none, the mail is +# handled normally by the mailer config. + +case "$1" in + default) + if [ -e $OMD_ROOT/.forward ]; then + head -n1 $OMD_ROOT/.forward + else + echo "" + fi + ;; + choices) + echo "^([-a-z??????A-Z0-9_.+%]+@[-a-z??????A-Z0-9]+(\.[-a-z??????A-Z0-9]+)*)?$" + ;; + set) + if [ -n "$2" ]; then + echo $2 > $OMD_ROOT/.forward + else + rm -f $OMD_ROOT/.forward + fi + ;; +esac From git at mathias-kettner.de Mon Jan 26 09:48:31 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 26 Jan 2015 09:48:31 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150126084831.4BE45807CC@mail.mathias-kettner.de> Module: omd Branch: master Commit: 951afa84ce22e96168642bfe2e8d19f41f8e0106 URL: http://omdistro.org/projects/omd/repository/revisions/951afa84ce22e96168642bfe2e8d19f41f8e0106 Author: Lars Michelsen Date: Mon Jan 26 09:48:23 2015 +0100 Commiter: Lars Michelsen Date: Mon Jan 26 09:48:23 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Jan 26 09:59:47 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 26 Jan 2015 09:59:47 +0100 Subject: [omd-commits] OMD Git: omd: The ADMIN_MAIL attribute is now directly configured as MAILTO option in crontab Message-ID: <20150126085947.D4FEC80869@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3733015c1e9b8599ffa60d40df1bac3c64dd078e URL: http://omdistro.org/projects/omd/repository/revisions/3733015c1e9b8599ffa60d40df1bac3c64dd078e Author: Lars Michelsen Date: Mon Jan 26 09:59:45 2015 +0100 Commiter: Lars Michelsen Date: Mon Jan 26 09:59:45 2015 +0100 The ADMIN_MAIL attribute is now directly configured as MAILTO option in crontab --- packages/maintenance/.f12 | 2 ++ packages/maintenance/merge-crontabs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/packages/maintenance/.f12 b/packages/maintenance/.f12 index 1543898..f208aa8 100644 --- a/packages/maintenance/.f12 +++ b/packages/maintenance/.f12 @@ -1,6 +1,8 @@ +SITE=${SITE:-$(cat .site || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} echo "Installing to site \"$SITE\"..." sudo install -m 755 diskspace /omd/sites/$SITE/bin +sudo install -m 755 merge-crontabs /omd/sites/$SITE/bin for F in ../*/skel/share/diskspace/*; do sudo cp $F /omd/sites/$SITE/share/diskspace done diff --git a/packages/maintenance/merge-crontabs b/packages/maintenance/merge-crontabs index e0a35f9..c571fb7 100755 --- a/packages/maintenance/merge-crontabs +++ b/packages/maintenance/merge-crontabs @@ -5,6 +5,9 @@ import sys import os +omd_config = {} +execfile('%s/etc/omd/site.conf' % os.environ['OMD_ROOT'], {}, omd_config) + sys.stdout.write("""# # Do not edit this file. It will be recreated each time OMD # is started or reloaded. @@ -18,6 +21,7 @@ sys.stdout.write("""# sys.stdout.write("OMD_ROOT=%s\n" % os.environ['OMD_ROOT']) sys.stdout.write("OMD_SITE=%s\n" % os.environ['OMD_SITE']) sys.stdout.write("PATH=%s\n" % os.environ['PATH']) +sys.stdout.write("MAILTO=\"%s\"\n" % omd_config.get('CONFIG_ADMIN_MAIL', '')) sys.stdout.write("# ------------------------------------------------------------\n") From git at mathias-kettner.de Tue Jan 27 18:40:30 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 27 Jan 2015 18:40:30 +0100 Subject: [omd-commits] OMD Git: omd: perl: update Gearman-Utils Message-ID: <20150127174030.2233880020@mail.mathias-kettner.de> Module: omd Branch: master Commit: f99ecb84b1234295cc3d25f0dcd7cc1aa449bcfd URL: http://omdistro.org/projects/omd/repository/revisions/f99ecb84b1234295cc3d25f0dcd7cc1aa449bcfd Author: Sven Nierlein Date: Tue Jan 27 18:03:32 2015 +0100 Commiter: Sven Nierlein Date: Tue Jan 27 18:03:32 2015 +0100 perl: update Gearman-Utils --- packages/perl-modules/lib/BuildHelper.pm | 2 +- packages/perl-modules/src/Gearman-1.12.tar.gz | Bin 29938 -> 30144 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/lib/BuildHelper.pm b/packages/perl-modules/lib/BuildHelper.pm index 3c5f4c2..cc19f8c 100644 --- a/packages/perl-modules/lib/BuildHelper.pm +++ b/packages/perl-modules/lib/BuildHelper.pm @@ -405,7 +405,7 @@ sub install_module { my $installed = 0; `grep $file $TARGET/modlist.txt 2>&1`; $installed = 1 if $? == 0; - if( $installed and $modname ne 'Catalyst::Runtime' and $modname ne 'parent' ) { + if( $installed and $modname ne 'parent' ) { print "already installed\n"; return 1; } diff --git a/packages/perl-modules/src/Gearman-1.12.tar.gz b/packages/perl-modules/src/Gearman-1.12.tar.gz index 391b997..a6e6fc9 100644 Binary files a/packages/perl-modules/src/Gearman-1.12.tar.gz and b/packages/perl-modules/src/Gearman-1.12.tar.gz differ From git at mathias-kettner.de Tue Jan 27 18:40:30 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 27 Jan 2015 18:40:30 +0100 Subject: [omd-commits] OMD Git: omd: nail: update 12.5 Message-ID: <20150127174030.359C28001F@mail.mathias-kettner.de> Module: omd Branch: master Commit: b12a243fc53b151370ae427a35c335a27e36ab2c URL: http://omdistro.org/projects/omd/repository/revisions/b12a243fc53b151370ae427a35c335a27e36ab2c Author: Sven Nierlein Date: Tue Jan 27 16:19:47 2015 +0100 Commiter: Sven Nierlein Date: Tue Jan 27 16:19:47 2015 +0100 nail: update 12.5 This fixes problem with utf encoded mails. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=465484 Signed-off-by: Sven Nierlein --- Changelog | 1 + packages/nail/Makefile | 10 ++++---- packages/nail/heirloom-mailx-12.5.tar.gz | Bin 0 -> 324085 bytes packages/nail/nail-11.25.tar.bz2 | Bin 267959 -> 0 bytes .../nail/patches/0001-disable-ssl-and-kerberos.dif | 24 ++++++++++---------- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Changelog b/Changelog index 0ff7b25..c013df2 100644 --- a/Changelog +++ b/Changelog @@ -51,6 +51,7 @@ This file documents the revision history for the Open Monitoring Distribution - Thruk: Update to 1.86-2 - Updated Monitoring-Plugins to 2.1.1 - Icinga: Update to 1.12.0 + - updated to nail/mailx 12.5 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/packages/nail/Makefile b/packages/nail/Makefile index 63bf221..01a7597 100644 --- a/packages/nail/Makefile +++ b/packages/nail/Makefile @@ -1,13 +1,13 @@ include ../../Makefile.omd NAME = nail -VERSION = 11.25 -DIR = nail-$(VERSION) +VERSION = 12.5 +DIR = heirloom-mailx-$(VERSION) .PHONY: skel build: - tar xjf nail-$(VERSION).tar.bz2 + tar xzf $(DIR).tar.gz set -e ; for p in patches/*.dif ; do \ echo "applying $$p..." ; \ ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ @@ -16,10 +16,10 @@ build: install: mkdir -p $(DESTDIR)$(OMD_ROOT)/bin - install -m 755 $(DIR)/nail $(DESTDIR)$(OMD_ROOT)/bin/nail + install -m 755 $(DIR)/mailx $(DESTDIR)$(OMD_ROOT)/bin/nail ln -sfn nail $(DESTDIR)$(OMD_ROOT)/bin/mail mkdir -p $(DESTDIR)$(OMD_ROOT)/share/man/man1 - install -m 644 $(DIR)/nail.1 $(DESTDIR)$(OMD_ROOT)/share/man/man1/nail.1 + install -m 644 $(DIR)/mailx.1 $(DESTDIR)$(OMD_ROOT)/share/man/man1/nail.1 gzip $(DESTDIR)$(OMD_ROOT)/share/man/man1/nail.1 skel: diff --git a/packages/nail/heirloom-mailx-12.5.tar.gz b/packages/nail/heirloom-mailx-12.5.tar.gz new file mode 100644 index 0000000..975d0ff Binary files /dev/null and b/packages/nail/heirloom-mailx-12.5.tar.gz differ diff --git a/packages/nail/nail-11.25.tar.bz2 b/packages/nail/nail-11.25.tar.bz2 deleted file mode 100644 index 2022ac1..0000000 Binary files a/packages/nail/nail-11.25.tar.bz2 and /dev/null differ diff --git a/packages/nail/patches/0001-disable-ssl-and-kerberos.dif b/packages/nail/patches/0001-disable-ssl-and-kerberos.dif index 4d7913d..57d42b3 100644 --- a/packages/nail/patches/0001-disable-ssl-and-kerberos.dif +++ b/packages/nail/patches/0001-disable-ssl-and-kerberos.dif @@ -1,28 +1,28 @@ ---- nail-11.25/makeconfig.orig 2011-11-21 12:11:40.956958655 +0100 -+++ nail-11.25/makeconfig 2011-11-21 12:15:50.981269020 +0100 -@@ -319,7 +319,7 @@ - link_check 'for Network Security Services (NSS)' '#define USE_SSL +--- heirloom-mailx-12.5/makeconfig.orig 2011-04-26 23:23:22.000000000 +0200 ++++ heirloom-mailx-12.5/makeconfig 2015-01-27 16:14:02.296251746 +0100 +@@ -326,7 +326,7 @@ #define USE_NSS' '-lsmime3 -lnss3 -lssl3 -lnspr4 -lplc4' <<\! || \ - link_check 'for sufficiently recent OpenSSL' '#define USE_SSL + link_check openssl 'for sufficiently recent OpenSSL' \ + '#define USE_SSL -#define USE_OPENSSL' '-lssl -lcrypto' <<\% +#define USE_OPENSSL' '-lDESTROYssl -lcrypto' <<\% #include #include #include -@@ -364,16 +364,16 @@ - } +@@ -425,16 +425,16 @@ ! --<$tmp2.c link_check 'for GSSAPI in libgss' '#define USE_GSSAPI' '-lgss' || -+<$tmp2.c link_check 'for GSSAPI in libgss' '#define DONT_USE_GSSAPI' '-lgss' || - <$tmp2.c link_check 'for GSSAPI in libgssapi_krb5' \ + <$tmp2.c link_check gssapi 'for GSSAPI in libgss' \ +- '#define USE_GSSAPI' '-lgss' || ++ '#define DONT_USE_GSSAPI' '-lgss' || + <$tmp2.c link_check gssapi 'for GSSAPI in libgssapi_krb5' \ - '#define USE_GSSAPI' '-lgssapi_krb5' || + '#define DONT_USE_GSSAPI' '-lgssapi_krb5' || - link_check 'for GSSAPI in libgssapi_krb5, old-style' \ + link_check gssapi 'for GSSAPI in libgssapi_krb5, old-style' \ - '#define USE_GSSAPI + '#define DONT_USE_GSSAPI #define GSSAPI_OLD_STYLE' '-lgssapi_krb5' <<\! || \ - link_check 'for GSSAPI in libgssapi' \ + link_check gssapi 'for GSSAPI in libgssapi' \ '#define USE_GSSAPI #define GSSAPI_REG_INCLUDE' '-lgssapi' <<\% -#include From git at mathias-kettner.de Wed Jan 28 14:09:46 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 28 Jan 2015 14:09:46 +0100 Subject: [omd-commits] OMD Git: omd: NagVis: Added missing default path to CoreAuthorisationModGroups db file Message-ID: <20150128130946.D111E80020@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5e75906b28a8195c3023ce8d7d1c9236f418e5bd URL: http://omdistro.org/projects/omd/repository/revisions/5e75906b28a8195c3023ce8d7d1c9236f418e5bd Author: Lars Michelsen Date: Wed Jan 28 14:09:39 2015 +0100 Commiter: Lars Michelsen Date: Wed Jan 28 14:09:39 2015 +0100 NagVis: Added missing default path to CoreAuthorisationModGroups db file --- packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php index 80558bb..4db1207 100644 --- a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php +++ b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php @@ -9,6 +9,7 @@ [global] sesscookiepath="/###SITE###/nagvis" +authorisation_group_perms_file="###ROOT###/etc/nagvis/perms.db" [paths] base="###ROOT###/share/nagvis/" From git at mathias-kettner.de Wed Jan 28 14:09:46 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 28 Jan 2015 14:09:46 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150128130946.E77D68001D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 77e4bd86acbba9a996ecaa59ada094213aa34e8c URL: http://omdistro.org/projects/omd/repository/revisions/77e4bd86acbba9a996ecaa59ada094213aa34e8c Author: Lars Michelsen Date: Wed Jan 28 14:09:43 2015 +0100 Commiter: Lars Michelsen Date: Wed Jan 28 14:09:43 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Thu Jan 29 14:12:27 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 29 Jan 2015 14:12:27 +0100 Subject: [omd-commits] OMD Git: omd: apache: remove omd config from apache on purge Message-ID: <20150129131227.3CB3880044@mail.mathias-kettner.de> Module: omd Branch: master Commit: 99c1c685ba97bd16e31f29b788ded8cf576ee7f8 URL: http://omdistro.org/projects/omd/repository/revisions/99c1c685ba97bd16e31f29b788ded8cf576ee7f8 Author: Sven Nierlein Date: Thu Jan 29 14:11:40 2015 +0100 Commiter: Sven Nierlein Date: Thu Jan 29 14:11:40 2015 +0100 apache: remove omd config from apache on purge otherwise apache fails to start after pkg removal. --- debian/postrm.in | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/postrm.in b/debian/postrm.in index 58b53be..cda6910 100644 --- a/debian/postrm.in +++ b/debian/postrm.in @@ -46,6 +46,7 @@ case "$1" in fi rm -f $APACHE_OMD_CONF $APACHE_OMD_EMPTY_CONF rm -f /omd + ! test -x /usr/sbin/a2dismod || a2dismod zzz_omd # Try to remove empty directories if test -d /opt/omd/versions; then rmdir --ignore-fail-on-non-empty /opt/omd/versions From git at mathias-kettner.de Fri Jan 30 15:12:11 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 30 Jan 2015 15:12:11 +0100 Subject: [omd-commits] OMD Git: omd: omd: fix bogus user asking on vanished directories Message-ID: <20150130141211.EBE2080074@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7af77d578ab0903572b426be3ba2e119145bd15b URL: http://omdistro.org/projects/omd/repository/revisions/7af77d578ab0903572b426be3ba2e119145bd15b Author: Mathias Kettner Date: Fri Jan 30 15:12:10 2015 +0100 Commiter: Mathias Kettner Date: Fri Jan 30 15:12:10 2015 +0100 omd: fix bogus user asking on vanished directories --- packages/omd/omd | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index 50f4d9f..44e7128 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2655,7 +2655,7 @@ def diff_list(from_skelroot, g_sitedir, from_version, orig_path): if not rel_path: rel_path = "." walk_skel(from_skelroot, print_diff, (from_skelroot, g_sitedir, - from_version, old_perms), relbase = rel_path) + from_version, old_perms), depth_first=False, relbase = rel_path) def print_diff(rel_path, source_path, target_path, source_version, source_perms): @@ -2711,27 +2711,40 @@ def print_diff(rel_path, source_path, target_path, source_version, source_perms) if source_perm != target_perm: print_status(warn, fn, 'p', 'Changed permissions') -def walk_skel(root, handler, args, exclude_if_in = None, relbase = '.'): - # Walks all files in the skeleton dir to execute a function for each file - # The given handler is called with the provided args. Additionally the relative - # path of the file to handle is handed over in the 'relpath' parameter. +# Walks all files in the skeleton dir to execute a function for each file +# The given handler is called with the provided args. Additionally the relative +# path of the file to handle is handed over in the 'relpath' parameter. - # When called with a path in 'exclude_if_in' then paths existing relative to - # that are skipped. This is used for a second run during the update-process: to handle - # files that have vanished in the new version. +# When called with a path in 'exclude_if_in' then paths existing relative to +# that are skipped. This is used for a second run during the update-process: to handle +# files that have vanished in the new version. - # The option 'relbase' is optional. It can contain a relative path which can be used - # as base for the walk instead of walking the whole tree. +# The option 'relbase' is optional. It can contain a relative path which can be used +# as base for the walk instead of walking the whole tree. - # The function returns a set of already handled files. +# The function returns a set of already handled files. +def walk_skel(root, handler, args, depth_first, exclude_if_in = None, relbase = '.'): os.chdir(root) - for dirpath, dirnames, filenames in os.walk(relbase): + + # Note: os.walk first finds level 1 directories, then deeper + # layers. If we need a real depth search instead, where we first + # handle deep directories and files, then the top level ones. + walk_entries = list(os.walk(relbase)) + if depth_first: + walk_entries.reverse() + + for dirpath, dirnames, filenames in walk_entries: if dirpath.startswith("./"): dirpath = dirpath[2:] if dirpath.startswith("tmp"): continue - for entry in dirnames + filenames: + # In depth first search first handle files, then directories + if depth_first: + entries = filenames + dirnames + else: + entries = dirnames + filenames + for entry in entries: path = dirpath + "/" + entry if path.startswith("./"): path = path[2:] @@ -2841,10 +2854,10 @@ def main_update(args, options={}): tmp = tmp_dir(g_sitename) # First walk through skeleton files of new version - walk_skel(to_skelroot, update_file, (from_version, to_version, g_sitedir, old_perms)) + walk_skel(to_skelroot, update_file, (from_version, to_version, g_sitedir, old_perms), depth_first=False) # Now handle files present in old but not in new skel files - walk_skel(from_skelroot, update_file, (from_version, to_version, g_sitedir, old_perms), to_skelroot) + walk_skel(from_skelroot, update_file, (from_version, to_version, g_sitedir, old_perms), depth_first=True, exclude_if_in = to_skelroot) # Change symbolic link pointing to new version create_version_symlink(g_sitename, to_version)