Hello community,
here is the log from the commit of package supportutils
checked in at Wed Oct 8 18:39:35 CEST 2008.
--------
--- supportutils/supportutils.changes 2008-09-25 17:41:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/supportutils/supportutils.changes 2008-10-08 17:56:05.626314000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 08 09:54:49 MDT 2008 - jrecord@novell.com
+
+-http/s uploads now require certificates, curl -k removed
+-added VAR_OPTION_GPG_UID to select GPG encryption uid
+-added GPG encryption for the tar ball
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ supportutils.spec ++++++
--- /var/tmp/diff_new_pack.G14820/_old 2008-10-08 18:39:21.000000000 +0200
+++ /var/tmp/diff_new_pack.G14820/_new 2008-10-08 18:39:21.000000000 +0200
@@ -25,7 +25,7 @@
Group: System/Management
AutoReqProv: on
Version: 1.01
-Release: 5
+Release: 6
Source: %{name}-%{version}.tar.gz
Summary: Support Troubleshooting Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,6 +85,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 08 2008 jrecord@novell.com
+-http/s uploads now require certificates, curl -k removed
+-added VAR_OPTION_GPG_UID to select GPG encryption uid
+-added GPG encryption for the tar ball
* Thu Sep 25 2008 jrecord@novell.com
-changed BASE FROM_DIRECTORY to look for nts
* Tue Sep 23 2008 jrecord@novell.com
++++++ supportutils-1.01.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig new/supportutils-1.01/supportconfig
--- old/supportutils-1.01/supportconfig 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportconfig 2008-10-08 17:54:59.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
-SVER=2.25-23
-SDATE="2008 09 25"
+SVER=2.25-25
+SDATE="2008 10 08"
##############################################################################
# supportconfig - Gathers system troubleshooting information for NTS.
@@ -104,6 +104,7 @@
VAR_OPTION_CONTACT_PHONE="" # -P
VAR_OPTION_CONTACT_STOREID="" # -W
VAR_OPTION_CONTACT_TERMINALID="" # -M
+VAR_OPTION_GPG_UID="" # -G
VAR_OPTION_LOG_DIRS="/var/log /tmp" # -R
VAR_OPTION_LINE_COUNT=500 # -I
VAR_OPTION_MSG_MAXSIZE=500000 # -X
@@ -175,6 +176,7 @@
echo " -E <string> Contact email address"
echo " -F Display available supportconfig feature keywords (case-sensitive) used"
echo " with -i and -x"
+ echo " -G The GPG recipient's user ID used to encrypt the supportconfig tarball"
echo " -H <number> Limit number of included HA Policy engine files"
echo " -I <number> Default log file line count"
echo " -L Create a full file listing from '/'"
@@ -2973,6 +2975,35 @@
fi
}
+encrypt_tarball() {
+ FOUND_KEY=$(gpg --list-keys 2>/dev/null | grep "$VAR_OPTION_GPG_UID" 2>/dev/null)
+ if [ -z "$FOUND_KEY" ]; then
+ echo "ERROR: GPG key not found: $VAR_OPTION_GPG_UID"
+ echo " File encryption failed, aborting"
+ echo
+ gpg --list-keys
+ exit 13
+ fi
+ if (( VAR_OPTION_SILENT )); then
+ :
+ else
+ echo "Encrypting Tar Ball"
+ echo
+ echo "Using GPG Key: $VAR_OPTION_GPG_UID"
+ echo "Command: gpg --batch --yes --trust-model always --encrypt --recipient \"$VAR_OPTION_GPG_UID\" $TARBALL"
+ gpg --batch --yes --trust-model always --encrypt --recipient "$VAR_OPTION_GPG_UID" $TARBALL
+ ERR=$?
+ if [ $ERR -ne 0 ]; then
+ echo "ERROR: gpg failed, RC=$ERR, aborting"
+ echo
+ exit 13
+ fi
+ TARBALL=${TARBALL}.gpg
+ echo "Encrypted File: $TARBALL"
+ echo
+ fi
+}
+
upload_tarball() {
if (( UPLOAD_TARBALL )); then
TARBALL_FILE=$(basename $TARBALL)
@@ -2989,7 +3020,7 @@
;;
http|https)
UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{TARBALL}/$TARBALL_FILE/g")
- curl -k -A SupportConfig -T "$TARBALL" "${UPLOAD_URL}" &>/dev/null
+ curl -A SupportConfig -T "$TARBALL" "${UPLOAD_URL}" &>/dev/null
;;
*)
exit 7
@@ -3013,9 +3044,9 @@
;;
http|https)
UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{TARBALL}/$TARBALL_FILE/g")
- echo "curl -k -A SupportConfig -T \"$TARBALL\" \"${UPLOAD_URL}\""
+ echo "curl -A SupportConfig -T \"$TARBALL\" \"${UPLOAD_URL}\""
echo
- curl -k -A SupportConfig -T "$TARBALL" "${UPLOAD_URL}" &>/dev/null
+ curl -A SupportConfig -T "$TARBALL" "${UPLOAD_URL}" &>/dev/null
;;
*)
echo "ERROR: Unsupported upload service type: ${UPLOAD_SERVICE}"
@@ -3045,7 +3076,7 @@
fi
init_plugins on
ALL_ARGS="$@"
-while getopts :ACDFLQT:O:E:M:N:P:I:S:X:H:R:U:W:deghi:klmpr:suvx:yt:f: TMPOPT
+while getopts :ACDFG:LQT:O:E:M:N:P:I:S:X:H:R:U:W:deghi:klmpr:suvx:yt:f: TMPOPT
do
case $TMPOPT in
\:) clear; title
@@ -3064,6 +3095,7 @@
C) clear; title; echo "Overwriting $SC_CONF with default options."; gen_sysconfig; exit 0 ;;
D) set_to_default ;;
F) get_features; exit 0 ;;
+ G) VAR_OPTION_GPG_UID="$OPTARG" ;;
L) ADD_OPTION_FSLIST=1 ;;
Q) VAR_OPTION_SILENT=1 ;;
T) VAR_OPTION_BIN_TIMEOUT_SEC=$OPTARG ;;
@@ -3253,5 +3285,6 @@
EOF1
fi
+test -n "$VAR_OPTION_GPG_UID" && encrypt_tarball
upload_tarball
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.1 new/supportutils-1.01/supportconfig.1
--- old/supportutils-1.01/supportconfig.1 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportconfig.1 2008-10-08 17:54:59.000000000 +0200
@@ -1,8 +1,8 @@
-.TH supportconfig "1" "22 Sep 2008" "supportconfig" "Support Utilities Manual"
+.TH supportconfig "1" "06 Oct 2008" "supportconfig" "Support Utilities Manual"
.SH NAME
supportconfig - Gathers system troubleshooting information
.SH SYNOPSIS
-supportconfig [\fB\-ACDFLQdeghklmpsuvy\fR][\fB-E\fR string][\fB-H\fR number][\fB-I\fR number][\fB-M\fR string][\fB-N\fR string][\fB-O\fR string][\fB-P\fR string][\fB-R\fR directory path][\fB-S\fR number][\fB-T\fR seconds][\fB-U\fR URI string][\fB-W\fR string][\fB-X\fR number][\fB-f\fR directory][\fB-i\fR keyword list][\fB-r\fR srnum][\fB-t\fR directory][\fB-x\fR keyword list]
+supportconfig [\fB\-ACDFLQdeghklmpsuvy\fR][\fB-E\fR string][\fB-G\fR gpg_uid][\fB-H\fR number][\fB-I\fR number][\fB-M\fR string][\fB-N\fR string][\fB-O\fR string][\fB-P\fR string][\fB-R\fR directory path][\fB-S\fR number][\fB-T\fR seconds][\fB-U\fR URI string][\fB-W\fR string][\fB-X\fR number][\fB-f\fR directory][\fB-i\fR keyword list][\fB-r\fR srnum][\fB-t\fR directory][\fB-x\fR keyword list]
.SH DESCRIPTION
Creates a tar ball that can be attached to a Novell service request and/or sent to a Novell Technical Services engineer. Basic info is collected for SLES8. More comprehensive information is collected for SLES9, SLE10 and OES Linux.
.PP
@@ -38,6 +38,9 @@
\fB\-F\fR
Display available supportconfig feature keywords (case-sensitive) used with -i and -x
.TP
+\fB\-G\fR \fIgpg_uid\fR
+The GPG recipient user ID used to encrypt the supportconfig tar ball for more secure uploads.
+.TP
\fB\-H\fR \fInumber\fR
Limit number of included HA Policy engine files
.TP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf new/supportutils-1.01/supportconfig.conf
--- old/supportutils-1.01/supportconfig.conf 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportconfig.conf 2008-10-08 17:54:59.000000000 +0200
@@ -63,6 +63,7 @@
VAR_OPTION_CONTACT_PHONE="" # -P
VAR_OPTION_CONTACT_STOREID="" # -W
VAR_OPTION_CONTACT_TERMINALID="" # -M
+VAR_OPTION_GPG_UID="" # -G
VAR_OPTION_LINE_COUNT=500 # -I
VAR_OPTION_LOG_DIRS="/var/log /tmp" # -R
VAR_OPTION_MSG_MAXSIZE=500000 # -X
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf.5 new/supportutils-1.01/supportconfig.conf.5
--- old/supportutils-1.01/supportconfig.conf.5 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportconfig.conf.5 2008-10-08 17:54:59.000000000 +0200
@@ -1,4 +1,4 @@
-.TH supportconfig.conf "5" "22 Sep 2008" "supportconfig.conf" "Support Utilities Manual"
+.TH supportconfig.conf "5" "06 Oct 2008" "supportconfig.conf" "Support Utilities Manual"
.SH NAME
supportconfig.conf \-
.BR supportconfig (1)
@@ -202,6 +202,9 @@
VAR_OPTION_CONTACT_TERMINALID
Contact's company terminal identifier to include in the basic-environment.txt \fB\-M\fR (Not Set)
.TP
+VAR_OPTION_GPG_UID
+The GPG recipient's user ID used to encrypt the supportconfig tar ball for more secure uploads. \fB\-G\fR (Not Set)
+.TP
VAR_OPTION_LINE_COUNT
The number of lines to include when getting a log file. Zero means get the entire file. \fB\-I\fR (500)
.TP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.changes new/supportutils-1.01/supportutils.changes
--- old/supportutils-1.01/supportutils.changes 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportutils.changes 2008-10-08 17:54:59.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Oct 08 09:54:49 MDT 2008 - jrecord@novell.com
+
+-http/s uploads now require certificates, curl -k removed
+-added VAR_OPTION_GPG_UID to select GPG encryption uid
+-added GPG encryption for the tar ball
+
+-------------------------------------------------------------------
Thu Sep 25 09:36:45 MDT 2008 - jrecord@novell.com
-changed BASE FROM_DIRECTORY to look for nts
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.spec new/supportutils-1.01/supportutils.spec
--- old/supportutils-1.01/supportutils.spec 2008-09-25 17:37:55.000000000 +0200
+++ new/supportutils-1.01/supportutils.spec 2008-10-08 17:54:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package supportutils (Version 1.01.10)
+# spec file for package supportutils (Version 1.01.11)
#
# Copyright (C) 2008 Novell, Inc.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
Group: System/Management
Autoreqprov: on
Version: 1.01
-Release: 10
+Release: 11
Source: %{name}-%{version}.tar.gz
Summary: Support Troubleshooting Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org