[Fedora-directory-commits] adminutil/include/libadminutil admutil.h, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil/include/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/include/libadminutil
Modified Files:
admutil.h
Log Message:
[172166] Admin Util build (64-bit)
1) nsarch does not run well since the output of 'ld --help' did not match the
given regular expression.
2) added "_64" to the NSCONFIG macro to pick up the mozilla components.
3) added version number to the ident string
4) replaced 'perl <perlprogram>' with '/usr/bin/env perl <perlprogram>'
5) cleaned up warning message from gcc
Index: admutil.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/libadminutil/admutil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admutil.h 6 Dec 2005 18:38:31 -0000 1.3
+++ admutil.h 15 Dec 2005 21:07:17 -0000 1.4
@@ -32,6 +32,7 @@
#include "prtypes.h"
#include "plstr.h"
#include "prprf.h"
+#include "prmem.h"
/* Copy from #include "base/systems.h" */
#if defined (XP_WIN32) /* Windows NT */
18 years, 4 months
[Fedora-directory-commits] adminutil/include version.h,1.4,1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/include
Modified Files:
version.h
Log Message:
[172166] Admin Util build (64-bit)
1) nsarch does not run well since the output of 'ld --help' did not match the
given regular expression.
2) added "_64" to the NSCONFIG macro to pick up the mozilla components.
3) added version number to the ident string
4) replaced 'perl <perlprogram>' with '/usr/bin/env perl <perlprogram>'
5) cleaned up warning message from gcc
Index: version.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/version.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- version.h 6 Dec 2005 18:38:26 -0000 1.4
+++ version.h 15 Dec 2005 21:06:48 -0000 1.5
@@ -28,20 +28,20 @@
#endif
#define ADMSDK_NAME "Administration Utility"
+#define ADMSDK_VMAJOR 1
+#define ADMSDK_VMINOR 0
+#define ADMSDK_VERSION "1.0"
+#define ADMSDK_SO_VERSION "10"
+
#ifdef MCC_DEBUG
-#define ADMSDK_PRODUCT ADMSDK_NAME " (debug)"
+#define ADMSDK_PRODUCT ADMSDK_VERSION ": " ADMSDK_NAME " (debug)"
#define ADMSDK_FLAGS VS_FF_DEBUG
#else
-#define ADMSDK_PRODUCT ADMSDK_NAME
+#define ADMSDK_PRODUCT ADMSDK_VERSION ": " ADMSDK_NAME
#define ADMSDK_FLAGS 0x0L
#endif
-#define ADMSDK_VMAJOR 1
-#define ADMSDK_VMINOR 0
-#define ADMSDK_VERSION "1.0"
-#define ADMSDK_SO_VERSION "10"
-
#define VI_COMPANYNAME "Red Hat, Inc."
#define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc."
-#define ADMSDK_BUILDNUM "2005.334.210"
+#define ADMSDK_BUILDNUM "2005.349.2055"
18 years, 4 months
[Fedora-directory-commits] adminutil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.4, 1.5 nsdefs.mk, 1.4, 1.5 nsperl.mk, 1.2, 1.3 pumpkin.pl, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019
Modified Files:
nsarch nsconfig.mk nsdefs.mk nsperl.mk pumpkin.pl
Log Message:
[172166] Admin Util build (64-bit)
1) nsarch does not run well since the output of 'ld --help' did not match the
given regular expression.
2) added "_64" to the NSCONFIG macro to pick up the mozilla components.
3) added version number to the ident string
4) replaced 'perl <perlprogram>' with '/usr/bin/env perl <perlprogram>'
5) cleaned up warning message from gcc
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/adminutil/nsarch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsarch 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ nsarch 15 Dec 2005 21:06:22 -0000 1.2
@@ -570,7 +570,7 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then
#echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linux"
NS_NAME="${UNAME_SYSTEM}"
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsconfig.mk 6 Dec 2005 18:38:20 -0000 1.4
+++ nsconfig.mk 15 Dec 2005 21:06:22 -0000 1.5
@@ -59,6 +59,10 @@
ifeq (86,$(findstring 86,$(NSOS_TEST1)))
NSOS_TEST1 = x86
endif
+ ifeq ($(USE_64), 1)
+ NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG)
+ NSOS_TEST1 := $(NSOS_TEST2)
+ endif
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
else
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsdefs.mk 16 Nov 2005 18:49:58 -0000 1.4
+++ nsdefs.mk 15 Dec 2005 21:06:22 -0000 1.5
@@ -188,13 +188,7 @@
UNZIP = $(ZIPDIR)/unzip.exe -o
else
- ifeq ($(BUILD_ARCH), Linux)
-#PERL=$(COMPONENTS_DIR)/perl5/$(PKG_ARCH)2.1-perl5/perl
- PERL=perl
- else
- NSPERL_RELDATE :=20020626
- PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
- endif
+ PERL:=/usr/bin/env perl
ZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/zip
UNZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/unzip -o
IZIP = $(ZIP) -ry9uT
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsperl.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsperl.mk 8 Nov 2005 18:21:47 -0000 1.2
+++ nsperl.mk 15 Dec 2005 21:06:22 -0000 1.3
@@ -62,7 +62,7 @@
endif
ifeq ($(OSVER),SunOS5.9)
SUNOS_ARCH = $(shell uname -m)
- PERL5=/usr/bin/perl
+ PERL5:=/usr/bin/env perl
endif
ifeq ($(OSVER),SunOS5.5.1)
PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
@@ -76,6 +76,9 @@
ifeq ($(OSVER), HP-UXB.11.11)
PERL5=/u/robobld/nsperl/hpux/nsperl
endif
+ifeq ($(OSVER), HP-UXB.11.23)
+PERL5=/usr/bin/env perl
+endif
ifeq ($(BUILD_ARCH), Linux)
-PERL5=perl
+PERL5:=/usr/bin/env perl
endif
Index: pumpkin.pl
===================================================================
RCS file: /cvs/dirsec/adminutil/pumpkin.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pumpkin.pl 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ pumpkin.pl 15 Dec 2005 21:06:22 -0000 1.2
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
18 years, 4 months
[Fedora-directory-commits] setuputil/installer/unix installer.cc, 1.2, 1.3 product.cc, 1.1.1.1, 1.2 product.h, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/installer/unix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31687
Modified Files:
installer.cc product.cc product.h
Log Message:
[175418] Admin Server ns-update crashes if necessary attribute-value is not given
1) Although Admin Server's PostInstall program ns-update expects it, PostInstall
framework in SetupUtil does not take silent install option "-s". Changed to pass the option.
2) PostInstall framework does not support logging. Changed to pass the option.
3) PostInstall failure is issued as WARNING and the installation finishes with
Success message even though it really failed. Increased the error level to FATAL.
Index: installer.cc
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installer.cc 26 Oct 2005 16:38:16 -0000 1.2
+++ installer.cc 13 Dec 2005 20:58:22 -0000 1.3
@@ -27,6 +27,14 @@
**
** HISTORY:
** $Log$
+** Revision 1.3 2005/12/13 20:58:22 nhosoi
+** [175418] Admin Server ns-update crashes if necessary attribute-value is not given
+** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall
+** framework in SetupUtil does not take silent install option "-s". Changed to pass the option.
+** 2) PostInstall framework does not support logging. Changed to pass the option.
+** 3) PostInstall failure is issued as WARNING and the installation finishes with
+** Success message even though it really failed. Increased the error level to FATAL.
+**
** Revision 1.2 2005/10/26 16:38:16 rmeggins
** Bug(s) fixed: 171793
** Bug Description: Change setuputil version to 1.0
@@ -1566,7 +1574,8 @@
}
else
{
- err = product.postInstall(_serverRoot,_sourceDir, _infoFile, _installInfo);
+ err = product.postInstall(_serverRoot, _sourceDir,
+ _infoFile, _installInfo, _installMode, _logFile);
}
_dialogManager->disableWinMode();
@@ -1578,7 +1587,8 @@
product.skip(True);
if (_installMode == Silent)
{
- setupLogMessage(WARN, "Setup", "Failure installing %s\n.", product.get(PKG_NAME));
+ setupLogMessage(FATAL, "Setup", "Failure installing %s\n.", product.get(PKG_NAME));
+ return err;
}
else
{
@@ -1599,6 +1609,8 @@
if (p->isSelected() && !p->skipped())
{
err = doPreOrPostInstall(*p, which);
+ if (err)
+ return err;
}
}
Index: product.cc
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/product.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- product.cc 29 Jul 2005 22:16:32 -0000 1.1.1.1
+++ product.cc 13 Dec 2005 20:58:22 -0000 1.2
@@ -27,6 +27,14 @@
**
** HISTORY:
** $Log$
+** Revision 1.2 2005/12/13 20:58:22 nhosoi
+** [175418] Admin Server ns-update crashes if necessary attribute-value is not given
+** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall
+** framework in SetupUtil does not take silent install option "-s". Changed to pass the option.
+** 2) PostInstall framework does not support logging. Changed to pass the option.
+** 3) PostInstall failure is issued as WARNING and the installation finishes with
+** Success message even though it really failed. Increased the error level to FATAL.
+**
** Revision 1.1.1.1 2005/07/29 22:16:32 foxworth
** Importing new setup sdk for open source project
**
@@ -1308,7 +1316,7 @@
}
int
-Product::postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *installInfo) const
+Product::postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *installInfo, InstallMode installMode, const char *logFile) const
{
NSString program;
NSString source;
@@ -1336,6 +1344,11 @@
program = program + " -r";
}
+ if (installMode == Silent)
+ {
+ program = program + " -s -l " + logFile;
+ }
+
err = InstUtil::execProgram(program, source);
}
Index: product.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/product.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- product.h 29 Jul 2005 22:16:32 -0000 1.1.1.1
+++ product.h 13 Dec 2005 20:58:22 -0000 1.2
@@ -28,6 +28,14 @@
** HISTORY
**
** $Log$
+** Revision 1.2 2005/12/13 20:58:22 nhosoi
+** [175418] Admin Server ns-update crashes if necessary attribute-value is not given
+** 1) Although Admin Server's PostInstall program ns-update expects it, PostInstall
+** framework in SetupUtil does not take silent install option "-s". Changed to pass the option.
+** 2) PostInstall framework does not support logging. Changed to pass the option.
+** 3) PostInstall failure is issued as WARNING and the installation finishes with
+** Success message even though it really failed. Increased the error level to FATAL.
+**
** Revision 1.1.1.1 2005/07/29 22:16:32 foxworth
** Importing new setup sdk for open source project
**
@@ -309,11 +317,13 @@
NSString install(const NSString & serverRoot, const NSString & source, NVPair *installInfo);
int preInstall(const NSString & serverRoot, const NSString &sourceDir,
- const char *installType,
- InstallMode installMode, const char *logFile,
- const char *cache) const;
-
- int postInstall(const NSString & serverRoot, const NSString & sourceDir, const char *infoFile, const InstallInfo *nvpair) const;
+ const char *installType,
+ InstallMode installMode, const char *logFile,
+ const char *cache) const;
+
+ int postInstall(const NSString & serverRoot, const NSString & sourceDir,
+ const char *infoFile, const InstallInfo *nvpair,
+ InstallMode installMode, const char *logFile) const;
NSString extract(const char *dest, const char *archive,
const char *extractProgram=NULL,
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.17, 1.18
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5217
Modified Files:
ux-update.cc
Log Message:
[175418] Admin Server ns-update crashes if necessary attribute-value is not given
check if the attribute-value is set or not; if not, issue an error and quit.
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ux-update.cc 7 Dec 2005 22:11:07 -0000 1.17
+++ ux-update.cc 12 Dec 2005 18:34:14 -0000 1.18
@@ -77,7 +77,7 @@
InstallMode installMode = Interactive;
InstallInfo *installInfo = NULL;
-InstallInfo *adminInfo = NULL;
+InstallInfo *adminInstallInfo = NULL;
InstallInfo *dsInfo = NULL;
char *infoFile = NULL;
char *logFile = NULL;
@@ -100,7 +100,7 @@
}
else
{
- printf("ERROR: Administration Server configuration failed. See install.log.\n");
+ printf("ERROR: Administration Server configuration failed.\n");
installLog->logMessage(FATAL, "Admin", format, arg1, arg2);
}
exit(1);
@@ -537,18 +537,31 @@
char *ss;
chdir(sroot);
+
+ if (NULL == adminInstallInfo) {
+ fatal_error("Admin Info is not set or invalid.", "", "");
+ }
// Get admin port from installInfo
- s = adminInfo->get("Port");
+ s = adminInstallInfo->get("Port");
+ if (NULL == s) {
+ fatal_error("InstallInfo: Admin Port \"Port\" is missing.", "", "");
+ }
port = atoi(s);
- s = adminInfo->get("SysUser");
+ s = adminInstallInfo->get("SysUser");
+ if (NULL == s) {
+ fatal_error("InstallInfo: Admin System User \"SysUser\" is missing.", "", "");
+ }
strcpy(adminUser, s);
- s = adminInfo->get("ApacheDir");
+ s = adminInstallInfo->get("ApacheDir");
+ if (NULL == s) {
+ fatal_error("InstallInfo: Apache Directory \"ApacheDir\" is missing.", "", "");
+ }
strcpy(apacheDir, s);
- s = adminInfo->get("ApacheRoot");
+ s = adminInstallInfo->get("ApacheRoot");
if (!s) {
NSString ar = findApacheRoot(apacheDir);
strcpy(apacheRoot, (const char *)ar);
@@ -565,13 +578,18 @@
}
s = installInfo->get(SS_USER_ID);
-
+ if (NULL == s) {
+ fatal_error("InstallInfo: Server User \"SuiteSpotUserID\" is missing.", "", "");
+ }
strcpy(SSuser, s);
s = installInfo->get(SS_GROUP);
+ if (NULL == s) {
+ fatal_error("InstallInfo: Server Group \"SuiteSpotGroup\" is missing.", "", "");
+ }
strcpy(SSgroup,s);
- s = adminInfo->get("ServerIpAddress");
+ s = adminInstallInfo->get("ServerIpAddress");
if (s == NULL || s[0] == ' ')
strcpy(serverAddress, "\0");
else
@@ -580,6 +598,9 @@
char *p;
p = strdup(installInfo->get(CONFIG_LDAP_URL));
+ if (NULL == p) {
+ fatal_error("Failed to duplicate %s.", installInfo->get(CONFIG_LDAP_URL), "");
+ }
char *cp;
@@ -591,7 +612,7 @@
free(p);
}
- s = adminInfo->get("ServerAdminID");
+ s = adminInstallInfo->get("ServerAdminID");
if (s)
{
strcpy(httpuser, s);
@@ -603,7 +624,7 @@
#endif
strcpy(httpuser, DEFAULT_ADMINUSER);
}
- s = adminInfo->get("ServerAdminPwd");
+ s = adminInstallInfo->get("ServerAdminPwd");
if (s)
{
@@ -619,7 +640,7 @@
#ifdef ORIGINAL_HOST_IP_QUERIES
// PVO
- s = adminInfo->get("HostIpAddress");
+ s = installInfo->get("HostIpAddress");
strcpy(hosts,s);
#else
strcpy(hosts, "*");
@@ -1476,9 +1497,9 @@
{
switch (opt)
{
- case 'r':
- reConfig = True;
- break;
+ case 'r':
+ reConfig = True;
+ break;
case 's':
installMode = Silent;
break;
@@ -1505,9 +1526,10 @@
if (infoFile == NULL || installInfo == NULL ||
installInfo->isEmpty() == True ||
- (adminInfo = installInfo->getSection("admin")) == NULL)
+ (adminInstallInfo = installInfo->getSection("admin")) == NULL)
{
- printf("ERROR: Answer cache not found or invalid\n");
+ installLog->logMessage(FATAL, "Admin", "Answer cache (admin section) not found or invalid.");
+ printf("ERROR: Answer cache (admin section) not found or invalid.\n");
exit(1);
}
@@ -1515,14 +1537,14 @@
{
if (infoFile == NULL || (stat(infoFile, &fi) == -1))
{
- installLog->logMessage(FATAL, "Admin", "Installation script not found");
- printf("ERROR:Installation script not found.\n");
- exit(1);
+ installLog->logMessage(FATAL, "Admin", "Installation script not found");
+ printf("ERROR:Installation script not found.\n");
+ exit(1);
}
else
{
- // PVO - why ???
- installInfo = new InstallInfo (infoFile);
+ // PVO - why ???
+ installInfo = new InstallInfo (infoFile);
}
}
@@ -1559,11 +1581,19 @@
}
sroot = installInfo->get(SERVER_ROOT);
+ if (NULL == sroot) {
+ fatal_error("InstallInfo: Server Root \"ServerRoot\" is missing.", "", "");
+ }
/*
* Get the full hostname.
*/
- strcpy(hn,installInfo->get(MACHINE_NAME));
+ const char *machine_name;
+ machine_name = installInfo->get(MACHINE_NAME);
+ if (NULL == machine_name) {
+ fatal_error("InstallInfo: Hostname \"FullMachineName\" is missing.", "", "");
+ }
+ strcpy(hn, machine_name);
cleanup_after_upgrade(sroot);
18 years, 4 months
[Fedora-directory-commits] CVSROOT syncmail,1.2,1.3
by Doctor Conrad
Author: sopwith
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22415/CVSROOT-dirsec
Modified Files:
syncmail
Log Message:
fix syncmail
Index: syncmail
===================================================================
RCS file: /cvs/dirsec/CVSROOT/syncmail,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syncmail 8 Dec 2005 20:18:40 -0000 1.2
+++ syncmail 8 Dec 2005 21:33:52 -0000 1.3
@@ -204,7 +204,7 @@
del diff_files[-3:]
commit_message = sys.stdin.read()
for I in optRequireKeyword:
- if I not in commit_message:
+ if commit_message.find(I) < 0:
return
# cannot wait for child process or that will cause parent to retain cvs
18 years, 4 months
[Fedora-directory-commits] CVSROOT loginfo, 1.8, 1.9 syncmail, 1.1, 1.2
by Doctor Conrad
Author: sopwith
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20496
Modified Files:
loginfo syncmail
Log Message:
do *docs*
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loginfo 20 Oct 2005 18:48:52 -0000 1.8
+++ loginfo 8 Dec 2005 20:18:40 -0000 1.9
@@ -27,3 +27,4 @@
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec(a)fedora.redhat.com
ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery(a)cvs-int.fedora.redhat.com
+ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes(a)fedoraproject.org
Index: syncmail
===================================================================
RCS file: /cvs/dirsec/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncmail 15 Apr 2005 15:43:19 -0000 1.1
+++ syncmail 8 Dec 2005 20:18:40 -0000 1.2
@@ -2,9 +2,10 @@
# -*- Python -*-
#
# PLEASE DO NOT EDIT THIS FILE IN PLACE IN THE CVS TREE!!!
-# check out the CVSROOT/admin directory on your local machine,
+# check out the CVSROOT directory on your local machine,
# make the changes there and commit. Otherwise your changes
# will be lost. --gafton
+# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message
#
# - updated by gafton to allow for --nodiff option. The nodiff option
# still sends out messages when something changes in a directory, but
@@ -62,6 +63,9 @@
Use <path> as the environment variable CVSROOT. Otherwise this
variable must exist in the environment.
+ --require-keyword=STRING
+ Only send mail if STRING is found in the commit message.
+
--nodiff
Don't bother generating the full diff, just report if the files changed
or not.
@@ -183,7 +187,7 @@
return string.join(lines, '')
# send mail using sendmail
-def blast_mail(subject, people):
+def blast_mail(subject, people):
global optDiffStat
# the redirection sequence in this command is actually intentional
@@ -198,7 +202,11 @@
del diff_files[-3:]
if diff_files[-3:] == ['-', 'Imported', 'sources']:
del diff_files[-3:]
-
+ commit_message = sys.stdin.read()
+ for I in optRequireKeyword:
+ if I not in commit_message:
+ return
+
# cannot wait for child process or that will cause parent to retain cvs
# lock for too long. Urg!
if not os.fork(): # in the child
@@ -206,20 +214,21 @@
time.sleep(2)
fp = os.popen(sendmail, 'w')
fp.write("Content-Type: TEXT/PLAIN; charset=US-ASCII\n")
- fp.write("Subject: %s\n" % subject)
- fp.write("To: %s\n" % people)
+ fp.write("Subject: %s\n" % (subject,))
+ fp.write("To: %s\n" % (people,))
if os.environ.has_key("CVSROOT"):
fp.write("X-CVSROOT: %s\n" % (os.environ["CVSROOT"],))
username = pwd.getpwuid(os.getuid())[0]
- fp.write("X-CVS-Module: %s\n" % cvs_module)
- fp.write("X-CVS-Directory: %s\n" % cvs_dir)
- fp.write("X-CVS-Server: %s\n" % (os.uname()[1],))
+ hostname = os.uname()[1]
+ fp.write("X-CVS-Module: %s\n" % (cvs_module,))
+ fp.write("X-CVS-Directory: %s\n" % (cvs_dir,))
fp.write("X-CVS-User: %s\n" % (username,))
+ fp.write("X-CVS-Server: %s\n" % (hostname,))
fp.write("Precedence: first-class\n")
fp.write("\n")
fp.write("Author: %s\n\n" % (username,))
# now insert the CVS blurb
- fp.write(sys.stdin.read())
+ fp.write(commit_message)
fp.write('\n')
# append the diffs if available and sensible
graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE)
@@ -245,14 +254,16 @@
global DIFF_HEAD_LINES
global DIFF_TAIL_LINES
global DIFF_TRUNCATE_IF_LARGER
+ global optRequireKeyword
try:
opts, args = getopt.getopt(sys.argv[1:], 'h', [
'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help',
- 'headlines=', 'taillines=', 'truncate='])
+ 'headlines=', 'taillines=', 'truncate=', 'require-keyword='])
except getopt.error, msg:
usage(1, msg)
+ optRequireKeyword = []
# parse the options
for opt, arg in opts:
if opt in ('-h', '--help'):
@@ -268,12 +279,14 @@
optDiffStat = 0
elif opt == '--nodiffstat':
optDiffStat = 0
- elif opt == 'headlines=':
+ elif opt == '--headlines':
DIFF_HEAD_LINES = arg
- elif opt == 'taillines=':
+ elif opt == '--taillines':
DIFF_TAIL_LINES = arg
- elif opt == 'truncate=':
+ elif opt == '--truncate':
DIFF_TRUNCATE_IF_LARGER = arg
+ elif opt == '--require-keyword':
+ optRequireKeyword.append(arg)
# What follows is the specification containing the files that were
# modified. The argument actually must be split, with the first component
18 years, 4 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.21, 1.22
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20261
Modified Files:
ldapserver.spec.tmpl
Log Message:
the install is an upgrade if the %post argument is greater than 1, not greater than or equal to 1
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ldapserver.spec.tmpl 8 Dec 2005 03:59:02 -0000 1.21
+++ ldapserver.spec.tmpl 8 Dec 2005 04:14:27 -0000 1.22
@@ -126,7 +126,7 @@
if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch
fi
-if [ "$1" -ge 1 ] ; then
+if [ "$1" -gt 1 ] ; then
# patch file to upgrade admin server from 1.0 to 1.0.1
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then
patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch
18 years, 4 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.20, 1.21
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18524
Modified Files:
ldapserver.spec.tmpl
Log Message:
need to patch the console in both upgrade installation and regular installation
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ldapserver.spec.tmpl 8 Dec 2005 01:14:17 -0000 1.20
+++ ldapserver.spec.tmpl 8 Dec 2005 03:59:02 -0000 1.21
@@ -122,6 +122,10 @@
if [ -z "$RPM_INSTALL_PREFIX" ]; then
RPM_INSTALL_PREFIX=%{prefix}
fi
+# patch file to fix startconsole ld libpath
+if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
+ patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch
+fi
if [ "$1" -ge 1 ] ; then
# patch file to upgrade admin server from 1.0 to 1.0.1
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then
@@ -131,10 +135,6 @@
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then
patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch
fi
-# patch file to fix startconsole ld libpath
- if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
- patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch
- fi
# fix up file permissions
testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
if [ ! -f $testfile ] ; then
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16564
Modified Files:
console-ld-libpath.patch
Log Message:
look for the java command in java_home/bin
console-ld-libpath.patch:
Index: console-ld-libpath.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- console-ld-libpath.patch 7 Dec 2005 23:52:53 -0000 1.1
+++ console-ld-libpath.patch 8 Dec 2005 02:37:52 -0000 1.2
@@ -10,7 +10,7 @@
# Make sure java exists and is executable
#
-if [ ! -f java -a ! -x java ]
-+if [ ! -f $JAVA_HOME/java -a ! -x $JAVA_HOME/java ]
++if [ ! -f $JAVA_HOME/bin/java -a ! -x $JAVA_HOME/bin/java ]
then
echo "$0: The java program is not in your path, or is not executable."
exit 1
18 years, 4 months