Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (e044670c981fcbaae1160bdd80799e448b82d705)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (e044670c981fcbaae1160bdd80799e448b82d705)
  • Date: Thu, 13 Jun 2013 20:15:26 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

cluster/clusterssh/DETAILS | 1
cluster/clusterssh/HISTORY | 4 ++
cluster/clusterssh/PRE_BUILD | 2 +
http/firefox/DETAILS | 1
http/firefox/HISTORY | 4 ++
http/firefox/desktop/firefox.desktop | 2 -
mail/thunderbird/DETAILS | 1
mail/thunderbird/HISTORY | 5 ++
mail/thunderbird/desktop/thunderbird.desktop | 2 -
utils/sysstat/CONFIGURE | 1
utils/sysstat/DEPENDS | 3 +
utils/sysstat/DETAILS | 1
utils/sysstat/HISTORY | 9 ++++
utils/sysstat/INSTALL | 16 ++++++++
utils/sysstat/cron.daily/sa2 | 5 ++
utils/sysstat/cron.hourly/sa1 | 6 +++
utils/sysstat/init.d/sysstat | 49
+++++++++++++++++++++++++++
utils/sysstat/init.d/sysstat.conf | 14 +++++++
18 files changed, 124 insertions(+), 2 deletions(-)

New commits:
commit e044670c981fcbaae1160bdd80799e448b82d705
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

clusterssh: Fix desktop file to use a valid icon: clusterssh-48x48.png
PATCHLEVEL++

commit 46dd7b6daaf144ae5cefb6ca4e9bb27fc3de4fc9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sysstat: Setup sar to actually have data
PATCHLEVEL++
Query about installing cron jobs.
Default is 'y' otherwise sar is pretty useless.
Depend on CRON if using cron jobs
cron.daily/sa2: Add (optional) cron jobs to update stats
cron.hourly/sa1: Add (optional) cron jobs to update stats
init.d/sysstat: Add boot sysstat init script to set stats

commit c95a10cd08dd42e909d4e4d41ea7d4dead183418
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: thunderbird.desktop mozicon50.xpm is no longer available,
PATCHLEVEL++
desktop icon to use
/usr/lib/thunderbird/chrome/icons/default/default256.png

commit 74a4415a49755e06df37fdd1e76b4557b87237f4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

firefox: firefox.desktop icon moved under icons/browser directory
PATCHLEVEL++

diff --git a/cluster/clusterssh/DETAILS b/cluster/clusterssh/DETAILS
index 694ed15..737d4a7 100755
--- a/cluster/clusterssh/DETAILS
+++ b/cluster/clusterssh/DETAILS
@@ -1,5 +1,6 @@
SPELL=clusterssh
VERSION=3.28
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
#
SOURCE_HASH=sha512:4d7a5ceac986dc6a848e6ef7f5e58fd6184b122ed781f5b901b64a8418cd7a7f5a203be5da505a9568641cd40c752db2c3d955aa28c2ae6828d1977fd07cf107
diff --git a/cluster/clusterssh/HISTORY b/cluster/clusterssh/HISTORY
index 83fb41b..ff00a79 100644
--- a/cluster/clusterssh/HISTORY
+++ b/cluster/clusterssh/HISTORY
@@ -1,3 +1,7 @@
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Fix desktop file to use a valid icon:
clusterssh-48x48.png
+
2013-06-07 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Suggest xterm or cssh won't work without defining an
alternate terminal emulator.
diff --git a/cluster/clusterssh/PRE_BUILD b/cluster/clusterssh/PRE_BUILD
new file mode 100755
index 0000000..92ad2a1
--- /dev/null
+++ b/cluster/clusterssh/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sedit 's:clusterssh.png:clusterssh-48x48.png:'
"${SOURCE_DIRECTORY}"/clusterssh.desktop
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 8180b53..6e2dbc2 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,4 +1,5 @@
SPELL=firefox
+ PATCHLEVEL=1
if [[ $FIREFOX_CVS == y ]]; then
VERSION=21.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index d4c3bcb..cd10706 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * desktop/firefox.desktop: Icon moved under icons/browser directory
+ * DETAILS: PATCHLEVEL++
+
2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: Fix up dependencies
* BUILD, mozconfig: use proper way to add flags to .mozconfig
diff --git a/http/firefox/desktop/firefox.desktop
b/http/firefox/desktop/firefox.desktop
index da3dc2a..e5ef237 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Firefox
Exec=firefox
-Icon=/usr/lib/firefox/icons/mozicon128.png
+Icon=/usr/lib/firefox/browser/icons/mozicon128.png
Terminal=false
Type=Application
Categories=Application;Network;Browsers
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 164fe6f..e0de56b 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,6 @@
SPELL=thunderbird
VERSION=17.0.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index ce6b00e..a0990ec 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * desktop/thunderbird.desktop: mozicon50.xpm is no longer available,
use
+ /usr/lib/thunderbird/chrome/icons/default/default256.png
+
2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS; version 17.0.6, SECURITY_PATCH++
* DEPENDS: Fix up dependencies
diff --git a/mail/thunderbird/desktop/thunderbird.desktop
b/mail/thunderbird/desktop/thunderbird.desktop
index e83779c..7f23269 100644
--- a/mail/thunderbird/desktop/thunderbird.desktop
+++ b/mail/thunderbird/desktop/thunderbird.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Thunderbird
Exec=thunderbird
-Icon=/usr/lib/thunderbird/icons/mozicon50.xpm
+Icon=/usr/lib/thunderbird/chrome/icons/default/default256.png
Terminal=false
Type=Application
Categories=Application;Network;Mail;
diff --git a/utils/sysstat/CONFIGURE b/utils/sysstat/CONFIGURE
new file mode 100755
index 0000000..8fdaba8
--- /dev/null
+++ b/utils/sysstat/CONFIGURE
@@ -0,0 +1 @@
+config_query SYSSTAT_CRON 'Install a crontab to start sa1 at boot?' y
diff --git a/utils/sysstat/DEPENDS b/utils/sysstat/DEPENDS
new file mode 100755
index 0000000..6b9b7fc
--- /dev/null
+++ b/utils/sysstat/DEPENDS
@@ -0,0 +1,3 @@
+if [[ "x${SYSSTAT_CRON}" == "xy" ]]; then
+ depends CRON
+fi
diff --git a/utils/sysstat/DETAILS b/utils/sysstat/DETAILS
index 45955e6..d72fdb6 100755
--- a/utils/sysstat/DETAILS
+++ b/utils/sysstat/DETAILS
@@ -1,5 +1,6 @@
SPELL=sysstat
VERSION=10.0.5
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://perso.wanadoo.fr/sebastien.godard/$SOURCE
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index e2cda5f..b0002f4 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,12 @@
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * CONFIGURE: Query about installing cron jobs.
+ Default is 'y' otherwise sar is pretty useless.
+ * DEPENDS: Depend on CRON if using cron jobs
+ * cron.daily/sa2: Add (optional) cron jobs to update stats
+ * cron.hourly/sa1: Add (optional) cron jobs to update stats
+ * init.d/sysstat: Add boot sysstat init script to set stats
+
2012-05-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 10.0.5

diff --git a/utils/sysstat/INSTALL b/utils/sysstat/INSTALL
new file mode 100755
index 0000000..14b2547
--- /dev/null
+++ b/utils/sysstat/INSTALL
@@ -0,0 +1,16 @@
+default_install &&
+
+if [[ "x${SYSSTAT_CRON}" == "xy" ]]; then
+ if ! -d "${INSTALL_ROOT}"/etc/cron.hourly; then
+ install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.hourly
+ fi &&
+
+ if ! -d "${INSTALL_ROOT}"/etc/cron.daily; then
+ install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.daily
+ fi &&
+
+ install -m 0755 "${SPELL_DIRECTORY}"/cron.hourly/sa1 \
+ "${INSTALL_ROOT}"/etc/cron.hourly/sa1 &&
+ install -m 0755 "${SPELL_DIRECTORY}"/cron.daily/sa2 \
+ "${INSTALL_ROOT}"/etc/cron.daily/sa2
+fi
diff --git a/utils/sysstat/cron.daily/sa2 b/utils/sysstat/cron.daily/sa2
new file mode 100644
index 0000000..f3e092d
--- /dev/null
+++ b/utils/sysstat/cron.daily/sa2
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Write daily report in the /var/log/sa directory
+
+/usr/lib/sa/sa2 -A &
diff --git a/utils/sysstat/cron.hourly/sa1 b/utils/sysstat/cron.hourly/sa1
new file mode 100644
index 0000000..dfeedd2
--- /dev/null
+++ b/utils/sysstat/cron.hourly/sa1
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Collect and store binary data in the system activity daily data file
+# Run system activity accounting tool every 10 minutes
+
+/usr/lib/sa/sa1 600 6 -S DISK &
diff --git a/utils/sysstat/init.d/sysstat b/utils/sysstat/init.d/sysstat
new file mode 100644
index 0000000..e8b9a55
--- /dev/null
+++ b/utils/sysstat/init.d/sysstat
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/sysconfig/sysstat
+
+PROGRAM=/usr/lib/sa/sa1
+RUNLEVEL=S
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+
+# Borrowed from sysstat.in
+# Description: Reset the system activity logs
+# Short-Description: Reset the system activity logs
+### END INIT INFO
+#@(#) @PACKAGE_NAME@-@PACKAGE_VERSION@ startup script:
+#@(#) Insert a dummy record in current daily data file.
+#@(#) This indicates that the counters have restarted from 0.
+
+# See how we were called.
+start()
+{
+ local exitCodeIndicator="$(mktemp /tmp/sysstat-XXXXXX)" || exit 1
+ echo -n "Calling the system activity data collector (sadc): "
+ "${PROGRAM}" --boot || rm -f ${exitCodeIndicator} @QUOTE@
+
+ # Try to guess if sadc was successfully launched. The difficulty
+ # here is that the exit code is lost when the above command is
+ # run via "su foo -c ..."
+ if [ -f "${exitCodeIndicator}" ]; then
+ rm -f ${exitCodeIndicator}
+ else
+ exit 2
+ fi
+ echo
+ evaluate_retval
+}
+
+stop()
+{
+ echo "sysstat has nothing to stop..."
+ evaluate_retval
+}
+
+status()
+{
+ echo "sysstat runs once at boot, then via cron..."
+ evaluate_retval
+}
+
diff --git a/utils/sysstat/init.d/sysstat.conf
b/utils/sysstat/init.d/sysstat.conf
new file mode 100644
index 0000000..e41ff2c
--- /dev/null
+++ b/utils/sysstat/init.d/sysstat.conf
@@ -0,0 +1,14 @@
+# sysstat-10.0.5 configuration file.
+
+# How long to keep log files (in days).
+# If value is greater than 28, then log files are kept in
+# multiple directories, one for each month.
+HISTORY=7
+
+# Compress (using gzip or bzip2) sa and sar files older than (in days):
+COMPRESSAFTER=10
+
+# Parameters for the system activity data collector (see sadc manual page)
+# which are used for the generation of log files.
+SADC_OPTIONS=""
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (e044670c981fcbaae1160bdd80799e448b82d705), Eric Sandall, 06/13/2013

Archive powered by MHonArc 2.6.24.

Top of Page