Change to fix bug #141004. Thanks to Wolf Giesen

Package-Manager: portage-2.1.2_pre1

6 files changed, 215 insertions, 4 deletions

diff --git a/app-admin/phpsyslogng/ChangeLog b/app-admin/phpsyslogng/ChangeLog
index bfdda083f944..d50b98a86650 100644
--- a/app-admin/phpsyslogng/ChangeLog
+++ b/app-admin/phpsyslogng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/phpsyslogng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/phpsyslogng/ChangeLog,v 1.2 2006/01/21 19:52:05 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/phpsyslogng/ChangeLog,v 1.3 2006/09/19 15:41:10 strerror Exp $
+
+*phpsyslogng-2.8-r1 (19 Sep 2006)
+
+  19 Sep 2006; Benjamin Smee <strerror@gentoo.org> +files/logrotate.php,
+  +phpsyslogng-2.8-r1.ebuild:
+  Change to fix bug #141004. Thanks to Wolf Giesen
 
   21 Jan 2006; Benjamin Smee <strerror@gentoo.org> files/postinstall-en.txt,
   phpsyslogng-2.8.ebuild:
diff --git a/app-admin/phpsyslogng/Manifest b/app-admin/phpsyslogng/Manifest
index b75d331c0d7d..bfd5d2fdce0a 100644
--- a/app-admin/phpsyslogng/Manifest
+++ b/app-admin/phpsyslogng/Manifest
@@ -1,5 +1,31 @@
-MD5 feee4d82b8707723593a7468de463f46 ChangeLog 505
-MD5 24f93b89ac40e8f8c68c4d110a89b960 files/digest-phpsyslogng-2.8 66
+AUX logrotate.php 4254 RMD160 04fed3a0fccf2e6651012daec78ede7a0b61d1b0 SHA1 ebe0b0dbf05500341530d9f716c23bb1784fb67a SHA256 038aa344b2afebc24f1e5afa97e43096a1359e6fe466b30783d419717475bb4d
+MD5 440db280d7f514b9906afbfc09af629b files/logrotate.php 4254
+RMD160 04fed3a0fccf2e6651012daec78ede7a0b61d1b0 files/logrotate.php 4254
+SHA256 038aa344b2afebc24f1e5afa97e43096a1359e6fe466b30783d419717475bb4d files/logrotate.php 4254
+AUX postinstall-en.txt 246 RMD160 3680c89cff8cd9619f902a3b670746d201074fef SHA1 81b551b289780ddd5b1e81a24e6417e16698f878 SHA256 2b5aa77d94dae7ae4ed6781e2e284e750b6da79757ec5a583103dfa6574d9003
 MD5 64cd2141a01a307aca8b25efefcbe797 files/postinstall-en.txt 246
-MD5 82c6f940fc1a08d481d8d46de563bce7 metadata.xml 203
+RMD160 3680c89cff8cd9619f902a3b670746d201074fef files/postinstall-en.txt 246
+SHA256 2b5aa77d94dae7ae4ed6781e2e284e750b6da79757ec5a583103dfa6574d9003 files/postinstall-en.txt 246
+DIST phpsyslogng-2.8.tar.gz 35686 RMD160 38daab0986b42cd964a5e5f420c22408de38d1d1 SHA1 60401e6292af5ea9d5fd5e9e209b26130ace7c0c SHA256 da1b15ac04e66f4e81aef7c7332a33004ee910fe8bd1df7756eb3f4d12b195ad
+EBUILD phpsyslogng-2.8-r1.ebuild 945 RMD160 c8c8568fb013e52b0488a8e41eb47fc1a3f7e27b SHA1 f60199671570a67843c98b555c4fe70819fb38ad SHA256 440ac369e48ba504de2bf59837fc14c7a35cb7db21e6e834aeb9e354c68b13ac
+MD5 ab236c4ca6ed53bf14a778252c0c4088 phpsyslogng-2.8-r1.ebuild 945
+RMD160 c8c8568fb013e52b0488a8e41eb47fc1a3f7e27b phpsyslogng-2.8-r1.ebuild 945
+SHA256 440ac369e48ba504de2bf59837fc14c7a35cb7db21e6e834aeb9e354c68b13ac phpsyslogng-2.8-r1.ebuild 945
+EBUILD phpsyslogng-2.8.ebuild 884 RMD160 296656786b87f53231100bd6eb653879ad67fbc9 SHA1 77547e0a55ccb55ecc1e7d73c754c6373fb23514 SHA256 3ec81feb3b1416e284bdfb996211b94a0cfe427b1b12e22fe3b195d3cbaf825d
 MD5 22ff100f4039c088d1cd13523ddc3a7b phpsyslogng-2.8.ebuild 884
+RMD160 296656786b87f53231100bd6eb653879ad67fbc9 phpsyslogng-2.8.ebuild 884
+SHA256 3ec81feb3b1416e284bdfb996211b94a0cfe427b1b12e22fe3b195d3cbaf825d phpsyslogng-2.8.ebuild 884
+MISC ChangeLog 695 RMD160 b7057be6f73bd1b0aee6a258899c8a4ad1f704d6 SHA1 6142dbe1c0f6a6e8f80f0c02c6ec7adf9a8f4c43 SHA256 7251876fac996875bddab3468cf73b91c4312d8f8458d854f7aac45ae6fbf60b
+MD5 34e1fd4d8d8b308b6b559df543a8e9cf ChangeLog 695
+RMD160 b7057be6f73bd1b0aee6a258899c8a4ad1f704d6 ChangeLog 695
+SHA256 7251876fac996875bddab3468cf73b91c4312d8f8458d854f7aac45ae6fbf60b ChangeLog 695
+MISC metadata.xml 203 RMD160 dc85a4597b327e3b50807559983ede0e147601f0 SHA1 8e318897e209b03f9c3bde8aaee0c18f379bfe7d SHA256 20b101cf5998d0c063fc2304f3c071c8a6aeb35940882f05a19ac1169e74d174
+MD5 82c6f940fc1a08d481d8d46de563bce7 metadata.xml 203
+RMD160 dc85a4597b327e3b50807559983ede0e147601f0 metadata.xml 203
+SHA256 20b101cf5998d0c063fc2304f3c071c8a6aeb35940882f05a19ac1169e74d174 metadata.xml 203
+MD5 549e52cd75b0c5801477d172c15635c4 files/digest-phpsyslogng-2.8 244
+RMD160 0b851626159e3e3d2ca3bfa7f0ee952a4b66e43d files/digest-phpsyslogng-2.8 244
+SHA256 6f4e3ed24992646dda8396467bf139d60929f77ed55c74035697e06e4dabb5b6 files/digest-phpsyslogng-2.8 244
+MD5 549e52cd75b0c5801477d172c15635c4 files/digest-phpsyslogng-2.8-r1 244
+RMD160 0b851626159e3e3d2ca3bfa7f0ee952a4b66e43d files/digest-phpsyslogng-2.8-r1 244
+SHA256 6f4e3ed24992646dda8396467bf139d60929f77ed55c74035697e06e4dabb5b6 files/digest-phpsyslogng-2.8-r1 244
diff --git a/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8 b/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8
index 334fe1e2f3d4..bbe6a62e4859 100644
--- a/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8
+++ b/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8
@@ -1 +1,3 @@
 MD5 752ec0c597f81bb8756d27b111b420f4 phpsyslogng-2.8.tar.gz 35686
+RMD160 38daab0986b42cd964a5e5f420c22408de38d1d1 phpsyslogng-2.8.tar.gz 35686
+SHA256 da1b15ac04e66f4e81aef7c7332a33004ee910fe8bd1df7756eb3f4d12b195ad phpsyslogng-2.8.tar.gz 35686
diff --git a/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8-r1 b/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8-r1
new file mode 100644
index 000000000000..bbe6a62e4859
--- /dev/null
+++ b/app-admin/phpsyslogng/files/digest-phpsyslogng-2.8-r1
@@ -0,0 +1,3 @@
+MD5 752ec0c597f81bb8756d27b111b420f4 phpsyslogng-2.8.tar.gz 35686
+RMD160 38daab0986b42cd964a5e5f420c22408de38d1d1 phpsyslogng-2.8.tar.gz 35686
+SHA256 da1b15ac04e66f4e81aef7c7332a33004ee910fe8bd1df7756eb3f4d12b195ad phpsyslogng-2.8.tar.gz 35686
diff --git a/app-admin/phpsyslogng/files/logrotate.php b/app-admin/phpsyslogng/files/logrotate.php
new file mode 100644
index 000000000000..d3e1d42577e3
--- /dev/null
+++ b/app-admin/phpsyslogng/files/logrotate.php
@@ -0,0 +1,140 @@
+#!/usr/bin/php
+<?php
+// Copyright (C) 2005 Claus Lund, clauslund@gmail.com
+
+echo "\nStarting logrotate\n";
+echo date("Y-m-d H:i:s\n");
+
+$APP_ROOT = '/data/www/localhost/htdocs/phpsyslogng';
+
+include_once "$APP_ROOT/includes/common_funcs.php";
+include_once "$APP_ROOT/config/config.php";
+
+$dbLink = db_connect_syslog(DBADMIN, DBADMINPW);
+
+echo "Dropping temp".DEFAULTLOGTABLE." if it exists ... ";
+// Drop temp table if it exists
+$query = "DROP TABLE IF EXISTS temp".DEFAULTLOGTABLE;
+perform_query($query, $dbLink);
+echo "ok.\n";
+
+echo "Creating ".DEFAULTLOGTABLE." ... ";
+// Create new table
+$query = "SHOW CREATE TABLE ".DEFAULTLOGTABLE;
+$result = perform_query($query, $dbLink);
+echo "ok.\n";
+
+$row = mysql_fetch_array($result);
+$createQuery = $row[1];
+$search = "CREATE TABLE `".DEFAULTLOGTABLE."`";
+$replace = "CREATE TABLE `temp".DEFAULTLOGTABLE."`";
+$createQuery = str_replace($search, $replace, $createQuery);
+perform_query($createQuery, $dbLink);
+
+$today = date("Ymd");
+
+// Drop the merge table
+if(defined('MERGELOGTABLE') && MERGELOGTABLE)
+  {
+   $query = "FLUSH TABLES";
+   perform_query($query, $dbLink);
+
+   echo "Dropping ".MERGELOGTABLE." if it exists ... ";
+   $query = "DROP TABLE IF EXISTS ".MERGELOGTABLE;
+   perform_query($query, $dbLink);
+   echo "ok.\n";
+  }
+
+// Rename the two tables
+echo "Renaming ".DEFAULTLOGTABLE." to ".DEFAULTLOGTABLE.$today." and temp".DEFAULTLOGTABLE." to ".DEFAULTLOGTABLE." ... ";
+$query = "RENAME TABLE ".DBNAME.".".DEFAULTLOGTABLE." TO ".DBNAME.".".DEFAULTLOGTABLE.$today.", ".DBNAME.".temp".DEFAULTLOGTABLE." TO ".DBNAME.".".DEFAULTLOGTABLE;
+perform_query($query, $dbLink);
+echo "ok.\n";
+
+echo "\nLog rotate ended successfully.\n";
+echo "Now optimizing old logs.\n";
+$query = "OPTIMIZE TABLE ".DBNAME.".".DEFAULTLOGTABLE.$today;
+perform_query($query, $dbLink);
+
+// Re-create the merge table
+if(defined('MERGELOGTABLE') || defined('LOGROTATERETENTION'))
+  {
+   echo "Getting list of log tables.\n";
+   $logTableArray = get_logtables($dbLink);
+  }
+
+if(defined('LOGROTATERETENTION') && LOGROTATERETENTION)
+  {
+   echo "Retention is in use, searching for tables to drop:";
+   foreach($logTableArray as $value)
+     {
+      if(preg_match("/[0-9]+$/", $value))
+        {
+         // determine is datestamp is old enough
+         $tableDate = strrev(substr(strrev($value), 0, 8));
+         $cutoffDate = date("Ymd", mktime(0, 0, 0, date("m"), date("d")-LOGROTATERETENTION, date("Y")));
+
+//          printf(" [cutoffDate: %s tableDate %s] ", $cutoffDate, (intval($cutoffDate) > intval($tableDate)) ? ">":"<=",  $tableDate);
+
+         if(intval($cutoffDate) > intval($tableDate))
+           {
+            $query = "DROP TABLE ".$value;
+            perform_query($query, $dbLink);
+           }
+         }
+     }
+  }
+
+if(defined('MERGELOGTABLE') && MERGELOGTABLE)
+  {
+   echo "Creating merge table:\n";
+   $query = "SHOW CREATE TABLE ".DEFAULTLOGTABLE;
+
+   $result = perform_query($query, $dbLink);
+   $row = mysql_fetch_array($result);
+   $createQuery = $row[1];
+
+   $oldStr = "CREATE TABLE `".DEFAULTLOGTABLE."`";
+   $newStr = "CREATE TABLE `".MERGELOGTABLE."`";
+   $createQuery = str_replace($oldStr, $newStr, $createQuery);
+
+   $oldStr = "ENGINE=MyISAM";
+   $newStr = "ENGINE=MRG_MyISAM";
+   $createQuery = str_replace($oldStr, $newStr, $createQuery);
+   $oldStr = "TYPE=MyISAM";
+   $newStr = "ENGINE=MRG_MyISAM";
+   $createQuery = str_replace($oldStr, $newStr, $createQuery);
+
+   $createQuery = str_replace('PRIMARY KEY', 'INDEX', $createQuery);
+
+   // Re-create the merge table data (after some stuff has been dropped above by cutoffDate
+   if(defined('MERGELOGTABLE') || defined('LOGROTATERETENTION'))
+   {
+      echo "Getting list of log tables.\n";
+      $logTableArray = get_logtables($dbLink);
+   }
+
+   $unionStr = " UNION=(";
+   foreach($logTableArray as $value)
+     {
+      $unionStr = $unionStr.$value.", ";
+     }
+   $unionStr = rtrim($unionStr, ", ");
+   $unionStr = $unionStr.")";
+
+   $createQuery = $createQuery.$unionStr;
+
+   $flushQuery = "FLUSH TABLES";
+   perform_query($flushQuery, $dbLink);
+
+   perform_query($createQuery, $dbLink);
+
+   $flushQuery = "FLUSH TABLES";
+   perform_query($flushQuery, $dbLink);
+
+   echo "ok,\n";
+  }
+
+echo "\n".date("Y-m-d H:i:s")."\n";
+echo "All done!\n";
+?>
diff --git a/app-admin/phpsyslogng/phpsyslogng-2.8-r1.ebuild b/app-admin/phpsyslogng/phpsyslogng-2.8-r1.ebuild
new file mode 100644
index 000000000000..45a652232b62
--- /dev/null
+++ b/app-admin/phpsyslogng/phpsyslogng-2.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/phpsyslogng/phpsyslogng-2.8-r1.ebuild,v 1.1 2006/09/19 15:41:10 strerror Exp $
+
+inherit webapp
+
+DESCRIPTION="php-syslog-ng is a log monitor designed to easily manage logs from many hosts."
+HOMEPAGE="http://www.phpwizardry.com/php-syslog-ng.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://www.phpwizardry.com/php-syslog-ng/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="mysql"
+
+RDEPEND="virtual/httpd-php
+		mysql? ( >=dev-db/mysql-4.1 )"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README CHANGELOG
+	rm LICENSE README CHANGELOG
+	dodoc scripts/*
+
+	cp -r . ${D}${MY_HTDOCSDIR}
+	cp	${FILESDIR}/logrotate.php ${D}${MY_HTDOCSDIR}/scripts
+
+	webapp_configfile ${MY_HTDOCSDIR}/config/config.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}