Hello community,
here is the log from the commit of package suseRegister
checked in at Fri Mar 31 15:50:23 CEST 2006.
--------
--- suseRegister/suseRegister.changes 2006-03-30 12:54:54.000000000 +0200
+++ suseRegister/suseRegister.changes 2006-03-31 10:25:51.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Mar 31 10:23:31 CEST 2006 - mc(a)suse.de
+
+- check location of query-pool [#162302]
+
+-------------------------------------------------------------------
+Thu Mar 30 16:09:03 CEST 2006 - mc(a)suse.de
+
+- remove require rug/zmd; is a soft requirement now
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suseRegister.spec ++++++
--- /var/tmp/diff_new_pack.xk9bRz/_old 2006-03-31 15:49:18.000000000 +0200
+++ /var/tmp/diff_new_pack.xk9bRz/_new 2006-03-31 15:49:18.000000000 +0200
@@ -11,8 +11,9 @@
# norootforbuild
Name: suseRegister
+BuildRequires: mono-core
Version: 1.0
-Release: 37
+Release: 38
Summary: Registration tool
Group: Productivity/Other
License: GPL
@@ -22,8 +23,7 @@
Requires: perl-XML-Writer
Requires: perl-libwww-perl
Requires: perl-IO-Socket-SSL
-Requires: rug
-Requires: zmd
+Requires: mono-core
Requires: coreutils
Requires: sysconfig
Requires: hwinfo
@@ -53,9 +53,16 @@
%defattr(-, root, root)
%doc COPYING COPYRIGHT.english README
%config %{_sysconfdir}/*.conf
+%dir /usr/lib/suseRegister
+%dir /usr/lib/suseRegister/bin
%{_bindir}/*
+/usr/lib/suseRegister/bin/*
%changelog -n suseRegister
+* Fri Mar 31 2006 - mc(a)suse.de
+- check location of query-pool [#162302]
+* Thu Mar 30 2006 - mc(a)suse.de
+- remove require rug/zmd; is a soft requirement now
* Thu Mar 30 2006 - mc(a)suse.de
- adapt new output of query-pool
* Thu Mar 30 2006 - mc(a)suse.de
++++++ suseRegister-1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/Makefile new/suseRegister-1.0/Makefile
--- old/suseRegister-1.0/Makefile 2006-03-30 12:53:49.000000000 +0200
+++ new/suseRegister-1.0/Makefile 2006-03-31 10:22:30.000000000 +0200
@@ -1,24 +1,33 @@
VERSION = 1.0
-DESTDIR = /
-BINDIR = /usr/bin
+DESTDIR = /
+BINDIR = /usr/bin
SYSCONFIGDIR = /etc
+LIBDIR = /usr/lib/suseRegister
-BINARY = suse_register
-BIN2 = suse_release
-CONFIG = suseRegister.conf
-EXTRAS = COPYING COPYRIGHT.english Makefile TODO README
+SOURCE = create-guid.cs
-install:
+BINARY = suse_register
+SRELEASE = suse_release
+CGUID = create-guid.exe
+CONFIG = suseRegister.conf
+EXTRAS = COPYING COPYRIGHT.english Makefile TODO README
+
+all:
+ mcs ${SOURCE}
+
+install: all
mkdir -p ${DESTDIR}/${BINDIR}
mkdir -p ${DESTDIR}/${SYSCONFIGDIR}
+ mkdir -p ${DESTDIR}/${LIBDIR}/bin
install -m 755 ${BINARY} ${DESTDIR}/${BINDIR}
- install -m 755 ${BIN2} ${DESTDIR}/${BINDIR}
+ install -m 755 ${SRELEASE} ${DESTDIR}/${LIBDIR}/bin/
+ install -m 755 ${CGUID} ${DESTDIR}/${LIBDIR}/bin/
install -m 644 ${CONFIG} ${DESTDIR}/${SYSCONFIGDIR}
dist: clean
mkdir suseRegister-${VERSION}
- cp -f ${EXTRAS} ${BINARY} ${BIN2} ${CONFIG} suseRegister-${VERSION}/
+ cp -f ${EXTRAS} ${BINARY} ${SRELEASE} ${SOURCE} ${CONFIG} suseRegister-${VERSION}/
tar cfvj suseRegister-${VERSION}.tar.bz2 suseRegister-${VERSION}/
clean:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/create-guid.cs new/suseRegister-1.0/create-guid.cs
--- old/suseRegister-1.0/create-guid.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/suseRegister-1.0/create-guid.cs 2006-03-31 10:22:30.000000000 +0200
@@ -0,0 +1,11 @@
+using System;
+
+public class CreateGuid
+{
+ public static void Main()
+ {
+ string guid = Guid.NewGuid ().ToString ("N");
+
+ Console.WriteLine(guid);
+ }
+}
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register
--- old/suseRegister-1.0/suse_register 2006-03-30 12:53:49.000000000 +0200
+++ new/suseRegister-1.0/suse_register 2006-03-31 10:22:30.000000000 +0200
@@ -92,10 +92,14 @@
my $xenstoreread = "/usr/bin/xenstore-read";
my $xenstorewrite = "/usr/bin/xenstore-write";
+my $mono = "/usr/bin/mono";
+my $createGuid = "/usr/lib/suseRegister/bin/create-guid.exe";
+
my $initnooptional = 0;
my $lastResponse = "";
my $initialDomain = "";
+my $rugzmdInstalled = 0;
push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_path', $CA_PATH);
push(@LWP::Protocol::http::EXTRA_SOCK_OPTS, 'SSL_ca_file', undef);
@@ -1146,34 +1150,60 @@
my $msg = "";
my $code = 1;
- $msg = `$zmdInit status 2>&1`;
- $code = ($?>>8);
-
- if($code != 0)
+ if($rugzmdInstalled)
{
- $msg = `$zmdInit start 2>&1`;
+ $msg = `$zmdInit status 2>&1`;
$code = ($?>>8);
- sleep 2;
-
- foreach my $cnt (1..10)
+ if($code != 0)
{
- if(-e $GUID_FILE)
+ $msg = `$zmdInit start 2>&1`;
+ $code = ($?>>8);
+
+ sleep 2;
+
+ foreach my $cnt (1..10)
{
- last;
+ if(-e $GUID_FILE)
+ {
+ last;
+ }
+ sleep 1;
+ }
+
+ my $msg2 = `$zmdInit status 2>&1`;
+ $code = ($?>>8);
+
+ if($code != 0)
+ {
+ logPrintExit("Cannot start zmd: ".($msg?$msg:"").($msg2?$msg2."($code)":"($code)"), 7);
}
- sleep 1;
}
-
- my $msg2 = `$zmdInit status 2>&1`;
- $code = ($?>>8);
-
- if($code != 0)
+ return $code;
+ }
+ else
+ {
+ if(!-e $GUID_FILE)
{
- logPrintExit("Cannot start zmd: ".($msg?$msg:"").($msg2?$msg2."($code)":"($code)"), 7);
+ if(!-d "/etc/zmd")
+ {
+ mkdir "/etc/zmd" or logPrintExit("cannot create directory /etc/zmd: $!\n", 12);
+ }
+
+ my $guid = `$mono $createGuid 2>/dev/null`;
+ if(!defined $guid || $guid eq "")
+ {
+ logPrintExit("Cannot create guid", 13);
+ }
+ open(ZMD, "> $GUID_FILE") or do {
+ logPrintExit("cannot open file $GUID_FILE for write: $!\n", 12);
+ };
+ print ZMD $guid;
+ close ZMD;
+ print STDERR "GUID created: $guid\n" if($debug);
}
}
- return $code;
+ return 0;
}
sub rugConfigured
@@ -1182,7 +1212,14 @@
my $code = 1;
$code = rugStart();
-
+
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
+
$msg = `LANG=en_US $rug --terse --no-abbrev sl`;
$code = ($?>>8);
@@ -1248,7 +1285,6 @@
}
else
{
-
foreach my $line (split("\n", $result))
{
next if($line =~ /^\s*$/);
@@ -1286,6 +1322,13 @@
my $id = shift || undef;
my $msg = "";
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
+
if (! defined $url || $url eq "")
{
logPrintExit("Missing URL.\n", 14);
@@ -1347,6 +1390,12 @@
my $regcode = shift || undef;
my $msg = "";
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
if (! defined $url || $url eq "")
{
@@ -1398,6 +1447,13 @@
my $msg = "";
my $code = 0;
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
+
if (!defined $catalogs || ref($catalogs) ne "ARRAY")
{
print STDERR "No catalogs to subscribe\n";
@@ -1452,6 +1508,13 @@
my $msg = "";
my $code = 0;
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
+
if (!defined $pref || $pref eq "")
{
print STDERR "No preference.\n";
@@ -1521,6 +1584,8 @@
{
foreach my $service (keys %$zmdConfig)
{
+ next if($service eq "globalzmdoptions");
+
print XMLD $zmdConfig->{$service}->{url}."\n";
syslog("info", "dumpfile write:".$zmdConfig->{$service}->{url});
}
@@ -1533,7 +1598,13 @@
}
}
-
+ if(!$rugzmdInstalled)
+ {
+ # If rug/zmd are not installed we are done here.
+ syslog("info", "rug/zmd are not installed. finish.");
+ return 0;
+ }
+
my $rugConfigured = rugConfigured();
foreach my $service (keys %$zmdConfig)
@@ -1996,6 +2067,23 @@
}
openlog("suse_register", "ndelay,pid", 'user');
+if(-e $zmdInit && -e $rug)
+{
+ $rugzmdInstalled = 1;
+}
+
+# lib64 hack
+if(! -e $querypool)
+{
+ $querypool = "/usr/lib64/zmd/query-pool";
+
+ if(!-e $querypool)
+ {
+ logPrintExit("query-pool not found", 12);
+ }
+}
+
+
# call this as soon as possible.
rugStart();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
