client/rhel
by Miroslav Suchý
client/rhel/yum-rhn-plugin/rhnplugin.conf | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9e12526b0515d6a63fd304424b34d51a1ed06264
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 17:25:18 2009 +0100
509342 - explicitly say, that this is example
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.conf b/client/rhel/yum-rhn-plugin/rhnplugin.conf
index d8b47d8..d50adca 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.conf
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.conf
@@ -2,6 +2,11 @@
enabled = 1
gpgcheck = 1
-[rhel-i386-server-5]
-enabled = 1
+# You can specify options per channel, e.g.:
+#
+#[rhel-i386-server-5]
+#enabled = 1
+#
+#[some-unsigned-custom-channel]
+#gpgcheck = 0
14 years, 5 months
Branch 'sha256-support3' - 3 commits - web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/Channel.pm | 6 +-
web/modules/rhn/RHN/DB/ConfigRevision.pm | 10 ++-
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 6 +-
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 4 -
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 36 ++++++++----
web/modules/rhn/RHN/DB/Errata.pm | 39 +++++++++-----
web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 -
web/modules/rhn/RHN/DB/KSTree.pm | 6 +-
web/modules/rhn/RHN/DB/Package.pm | 14 +++--
web/modules/sniglets/Sniglets/Packages.pm | 3 -
10 files changed, 82 insertions(+), 46 deletions(-)
New commits:
commit 223bfbc08b4eb604df6aecced0f4f60d7a74cc0e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 16:31:42 2009 +0100
fixed ORA-00904: "P"."MD5SUM": invalid identifier
Execution of /var/www/html/network/software/packages/change_log.pxt
failed at Wed Nov 18 15:58:45 2009: RHN::Exception: DBD::Oracle::db
prepare failed: ORA-00904: "P"."MD5SUM": invalid identifier (DBD ERROR:
error possibly near <*> indicator at char 233 in 'SELECT P.id, P.org_id,
P.name_id, P.evr_id, P.package_arch_id, P.package_group, P.rpm_version,
P.description, P.summary, P.package_size, P.payload_size, P.build_host,
TO_CHAR(P.build_time , 'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id, <*>P.md5sum,
P.vendor, P.payload_format, P.compat, P.path, P.header_sig, P.copyright,
P.cookie, TO_CHAR(P.last_modified , 'YYYY-MM-DD HH24:MI:SS'), PA.id,
PA.name, PA.label, PA.arch_type_id, PN.id, PN.name, PEVR.id, PEVR.epoch,
PEVR.version, PEVR.release, PG.id, PG.name, SRPM.id, SRPM.name\nFROM
rhnPackage P, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PEVR,
rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE P.PACKAGE_ARCH_ID = PA.ID
AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID AND P.PACKAGE_GROUP =
PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID = :p1') [for
Statement "SELECT P.id, P.org_id, P.name_id, P.evr_id,
P.package_arch_id, P.package_group, P.rpm_version, P.description,
P.summary, P.package_size, P.payload_size, P.build_host,
TO_CHAR(P.build_time , 'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id,
P.md5sum, P.vendor, P.payload_format, P.compat, P.path, P.header_sig,
P.copyright, P.cookie, TO_CHAR(P.last_modified , 'YYYY-MM-DD
HH24:MI:SS'), PA.id, PA.name, PA.label, PA.arch_type_id, PN.id, PN.name,
PEVR.id, PEVR.epoch, PEVR.version, PEVR.release, PG.id, PG.name,
SRPM.id, SRPM.name\nFROM rhnPackage P, rhnPackageArch PA, rhnPackageName
PN, rhnPackageEVR PEVR, rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE
P.PACKAGE_ARCH_ID = PA.ID AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID
AND P.PACKAGE_GROUP = PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID
= ?"]\n RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 234
RHN::Exception::DB::throw\n RHN::DB::Package
/usr/lib/perl5/vendor_perl/5.8.8/RHN/DB/Package.pm 547
RHN::DB::handle_error\n RHN::Package
/usr/lib/perl5/vendor_perl/5.8.8/RHN/Package.pm 31
RHN::DB::Package::lookup\n Sniglets::Packages
/usr/lib/perl5/vendor_perl/5.8.8/Sniglets/Packages.pm 329
RHN::Package::lookup\n PXT::Parser
/usr/lib/perl5/vendor_perl/5.8.8/PXT/Parser.pm 171
Sniglets::Packages::package_details\n PXT::Parser
/usr/lib/perl5/vendor_perl/5.8.8/PXT/Parser.pm 83
PXT::Parser::expand_tag\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 633
PXT::Parser::expand_tags\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 124
PXT::ApacheHandler::pxt_parse_data\n PXT::ApacheHandler
/usr/lib/perl5/vendor_perl/5.8.8/PXT/ApacheHandler.pm 124 (eval)\n main
-e 0 PXT::ApacheHandler::handler\n main -e 0 (eval)\n\nOffending Query:
SELECT P.id, P.org_id, P.name_id, P.evr_id, P.package_arch_id,
P.package_group, P.rpm_version, P.description, P.summary,
P.package_size, P.payload_size, P.build_host, TO_CHAR(P.build_time ,
'YYYY-MM-DD HH24:MI:SS'), P.source_rpm_id, P.md5sum, P.vendor,
P.payload_format, P.compat, P.path, P.header_sig, P.copyright, P.cookie,
TO_CHAR(P.last_modified , 'YYYY-MM-DD HH24:MI:SS'), PA.id, PA.name,
PA.label, PA.arch_type_id, PN.id, PN.name, PEVR.id, PEVR.epoch,
PEVR.version, PEVR.release, PG.id, PG.name, SRPM.id, SRPM.name\nFROM
rhnPackage P, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PEVR,
rhnPackageGroup PG, rhnSourceRPM SRPM\nWHERE P.PACKAGE_ARCH_ID = PA.ID
AND P.NAME_ID = PN.ID AND P.EVR_ID = PEVR.ID AND P.PACKAGE_GROUP =
PG.ID(+) AND P.SOURCE_RPM_ID = SRPM.ID(+) AND P.ID = ?
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index b126a21..382b6e1 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -33,13 +33,14 @@ use RHN::Package::SolarisPatchSet;
my @pkg_fields = qw/
id org_id name_id evr_id package_arch_id package_group rpm_version description
summary package_size payload_size build_host build_time:longdate source_rpm_id
- md5sum vendor payload_format compat path header_sig copyright cookie last_modified:longdate
+ vendor payload_format compat path header_sig copyright cookie last_modified:longdate
/;
my @arch_fields = qw { id name label arch_type_id};
my @name_fields = qw { id name };
my @evr_fields = qw { id epoch version release };
my @group_fields = qw { id name };
my @srpm_fields = qw { id name };
+my @csum_fields = qw { id checksum };
my $p = new RHN::DB::TableClass("rhnPackage","P","",@pkg_fields);
my $a = new RHN::DB::TableClass("rhnPackageArch","PA","arch",@arch_fields);
@@ -47,14 +48,16 @@ my $n = new RHN::DB::TableClass("rhnPackageName", "PN", "package_name", @name_fi
my $evr = new RHN::DB::TableClass("rhnPackageEVR", "PEVR", "package_evr", @evr_fields);
my $pg = new RHN::DB::TableClass("rhnPackageGroup", "PG", "package_group", @group_fields);
my $srpm = new RHN::DB::TableClass("rhnSourceRPM", "SRPM", "s_rpm", @srpm_fields);
+my $csum = new RHN::DB::TableClass("rhnChecksum", "Csum", "checksum", @csum_fields);
-my $tc = $p->create_join([ $a, $n, $evr, $pg, $srpm ],{ "rhnPackage" => {
+my $tc = $p->create_join([ $a, $n, $evr, $pg, $srpm, $csum ],{ "rhnPackage" => {
"rhnPackage" => [ "ID", "ID" ],
"rhnPackageArch" => ["PACKAGE_ARCH_ID", "ID" ],
"rhnPackageName" => ["NAME_ID", "ID"],
"rhnPackageEVR" => ["EVR_ID", "ID"],
"rhnPackageGroup" => ["PACKAGE_GROUP", "ID"],
- "rhnSourceRPM" => ["SOURCE_RPM_ID", "ID"]
+ "rhnSourceRPM" => ["SOURCE_RPM_ID", "ID"],
+ "rhnChecksum" => ["CHECKSUM_ID", "ID"],
}
},
{ rhnSourceRPM => "(+)",
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 7ce66c1..ad777ae 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -344,7 +344,8 @@ sub package_details {
$pxt->pnotes(package_name => $package->nvre);
$subst{"package_$_"} = PXT::Utils->escapeHTML($package->$_() || '') || $no_data
- foreach qw/id arch_name arch_label arch_type_label arch_type_name package_group_name rpm_version build_host build_time md5sum vendor copyright/;
+ foreach qw/id arch_name arch_label arch_type_label arch_type_name
+ package_group_name rpm_version build_host build_time vendor copyright/;
my ($relative_path, $size) = $package->source_rpm_path;
commit 77af04e4ac94a8b7bb9f436ebacf7ee8cc7e3a00
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 15:46:31 2009 +0100
fixed another bunch of perl queries for sha256 schema
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index d0029fe..5edfcad 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1128,7 +1128,7 @@ SELECT DISTINCT C.label,
PE.release,
E.advisory_name,
C.name,
- P.md5sum OUTDATED_PACKAGE_MD5SUM,
+ Csum.checksum OUTDATED_PACKAGE_MD5SUM,
P.path
FROM rhnPackageArch PA,
rhnChannel C,
@@ -1141,7 +1141,8 @@ SELECT DISTINCT C.label,
rhnChannelErrata CE,
rhnPackage P2,
rhnPackage P,
- rhnErrataPackage EP
+ rhnErrataPackage EP,
+ rhnChecksum Csum
WHERE EP.errata_id = ?
AND EP.package_id = P.id
AND P.name_id = P2.name_id
@@ -1157,6 +1158,7 @@ SELECT DISTINCT C.label,
AND P2.evr_id = PE.id
AND P2.package_arch_id = PA.id
AND CE2.channel_id = C.id
+ AND P.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 3575fb7..0f84dc5 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -49,7 +49,7 @@ SELECT
CFN.path,
CC.org_id,
CC.id config_channel_id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CCon.file_size,
(SELECT CFt.latest_config_revision_id FROM rhnConfigFile CFt WHERE CFT.id = CR.config_file_id) LATEST_ID,
CCon.is_binary,
@@ -60,7 +60,8 @@ SELECT
rhnConfigChannel CC,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE CR.id = :id
AND CI.id = CR.config_info_id
AND CF.id = CR.config_file_id
@@ -68,6 +69,7 @@ SELECT
AND CCon.id = CR.config_content_id
AND CC.id = CF.config_channel_id
AND CFT.id = CR.config_file_type_id
+ AND CCon.checksum_id = Csum.id
EOS
my $sth = $dbh->prepare($query);
$sth->execute_h(id => $params{id});
@@ -100,9 +102,9 @@ sub create_config_contents {
my $sth;
$sth = $dbh->prepare(<<EOS);
INSERT INTO rhnConfigContent
- (id, md5sum, file_size, contents)
+ (id, checksum_id, file_size, contents)
VALUES
- (rhn_confcontent_id_seq.nextval, :md5sum, :file_size, :contents)
+ (rhn_confcontent_id_seq.nextval, lookup_checksum('md5', :md5sum), :file_size, :contents)
RETURNING id INTO :ccid
EOS
diff --git a/web/modules/rhn/RHN/DB/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index 19b6fdb..39642c2 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.pm
@@ -159,7 +159,7 @@ sub files {
$query = <<EOQ;
SELECT DISTINCT
EF.id AS ID,
- EF.md5sum AS MD5SUM,
+ Csum.checksum AS MD5SUM,
EF.filename AS FILENAME,
EFP.package_id AS PACKAGE_ID,
P1.path AS RHN_PACKAGE_PATH,
@@ -206,7 +206,8 @@ SELECT MAX(E.advisory_name)
rhnChannel C,
rhnErrataFileChannel EFC,
rhnErrataFileType EFT,
- rhnErrataFile EF
+ rhnErrataFile EF,
+ rhnChecksum Csum
WHERE EF.errata_id = ?
AND EF.type = EFT.id
AND EF.id = EFC.errata_file_id (+)
@@ -222,6 +223,7 @@ SELECT MAX(E.advisory_name)
AND P1.source_rpm_id = PS1.source_rpm_id (+)
AND P1.package_arch_id = PA.id (+)
AND EFPS.package_id = PS2.id (+)
+ AND EF.checksum_id = Csum.id
ORDER BY UPPER(Prod.name), UPPER(PA.name), UPPER(EF.filename)
EOQ
@@ -768,7 +770,7 @@ sub packages_in_errata {
PE.evr.version,
PE.evr.release,
C.name,
- P.md5sum,
+ Csum.checksum md5sum,
P.path,
PE.evr.epoch,
PA.label,
@@ -780,7 +782,8 @@ sub packages_in_errata {
rhnChannel C,
rhnChannelErrata CE,
rhnChannelPackage CP,
- rhnErrataPackage EP
+ rhnErrataPackage EP,
+ rhnChecksum Csum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -790,6 +793,7 @@ sub packages_in_errata {
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND P.package_arch_id = PA.id
+ AND P.checksum_id = Csum.id
EOS
$sth = $dbh->prepare($query);
@@ -817,13 +821,16 @@ sub source_rpms {
my $sth;
$query = <<EOS;
- SELECT PS.id, P.id, PS.id, C.label, 'src', PS.path, NULL, NULL, 'SRPMs', P.md5sum, PS.md5sum
+ SELECT PS.id, P.id, PS.id, C.label, 'src', PS.path, NULL, NULL, 'SRPMs',
+ CPsum.checksum md5sum, CPSsum.checksum md5sum
FROM rhnChannel C,
rhnPackageSource PS,
rhnPackage P,
rhnChannelPackage CP,
rhnChannelErrata CE,
rhnErrataPackage EP
+ rhnChecksum CPsum,
+ rhnChecksum CPSsum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -831,6 +838,8 @@ sub source_rpms {
AND CE.channel_id = C.id
AND EP.package_id = P.id
AND P.source_rpm_id = PS.source_rpm_id
+ AND P.checksum_id = CPsum.id
+ AND PS.checksum_id = CPSsum.id
EOS
@@ -857,14 +866,14 @@ sub public_packages_overview {
my $sth;
$query = <<EOQ;
-SELECT P2.id, P2.md5sum, C.name, PN.name, PE.evr.version, PE.evr.release, PE.evr.epoch, P2.path, PA.name, C.label, CFM.channel_family_id,
+SELECT P2.id, Csum.checksum md5sum, C.name, PN.name, PE.evr.version, PE.evr.release, PE.evr.epoch, P2.path, PA.name, C.label, CFM.channel_family_id,
(
SELECT CFP2.channel_family_id
FROM rhnChannelFamilyPermissions CFP2
WHERE CFP2.org_id IS NULL
AND CFP2.channel_family_id = CFM.channel_family_id
) PUBLIC_PACKAGE
- FROM rhnChannelFamily CF, rhnChannelFamilyMembers CFM, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P2, rhnPackage P, rhnChannel C, rhnChannelPackage CP, rhnChannelErrata CE, rhnErrataPackage EP
+ FROM rhnChannelFamily CF, rhnChannelFamilyMembers CFM, rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P2, rhnPackage P, rhnChannel C, rhnChannelPackage CP, rhnChannelErrata CE, rhnErrataPackage EP, rhnChecksum Csum
WHERE EP.errata_id = ?
AND CE.errata_id = ?
AND EP.package_id = CP.package_id
@@ -879,6 +888,7 @@ SELECT P2.id, P2.md5sum, C.name, PN.name, PE.evr.version, PE.evr.release, PE.ev
AND C.id = CFM.channel_id
AND CFM.channel_family_id = CF.id
AND CF.org_id IS NULL
+ AND P2.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
@@ -906,18 +916,20 @@ sub rhn_files_overview {
$query = <<EOQ;
SELECT DISTINCT EFP.package_id,
- EF.md5sum,
+ Csum.checksum md5sum,
EF.filename AS FILENAME,
C.name AS CHANNEL_NAME
FROM rhnChannel C,
rhnErrataFilePackage EFP,
rhnErrataFileChannel EFC,
- rhnErrataFile EF
+ rhnErrataFile EF,
+ rhnChecksum Csum
WHERE EF.errata_id = :errata_id
AND EF.id = EFC.errata_file_id (+)
AND EF.id = EFP.errata_file_id (+)
AND EFC.channel_id IN (SELECT AC.channel_id FROM rhnAvailableChannels AC WHERE AC.org_id = :org_id)
AND EFC.channel_id = C.id
+ AND EF.checksum_id = Csum.id
ORDER BY C.name, EF.filename DESC
EOQ
@@ -1486,15 +1498,16 @@ EOQ
my $ep_table = $self->table_map('rhnErrataPackage');
$query = <<EOQ;
-SELECT rhn_erratafile_id_seq.nextval AS ID, EFT.id AS TYPE_ID, P.md5sum, P.path, P.id AS PACKAGE_ID,
+SELECT rhn_erratafile_id_seq.nextval AS ID, EFT.id AS TYPE_ID, Csum.checksum md5sum, P.path, P.id AS PACKAGE_ID,
PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label AS NVREA
- FROM rhnErrataFileType EFT, rhnPackage P, $ep_table EP, rhnPackageName PN, rhnPackageEVR PE, rhnPackageArch PA
+ FROM rhnErrataFileType EFT, rhnPackage P, $ep_table EP, rhnPackageName PN, rhnPackageEVR PE, rhnPackageArch PA, rhnChecksum Csum
WHERE EFT.label = 'RPM'
AND P.id = EP.package_id
AND EP.errata_id = :eid
AND P.evr_id = PE.id
AND P.name_id = PN.id
AND P.package_arch_id = PA.id
+ AND P.checksum_id = Csum.id
EOQ
$sth = $dbh->prepare($query);
@@ -1503,8 +1516,8 @@ EOQ
my $ef_insert_query = <<EOQ;
INSERT
INTO $ef_table
- (id, errata_id, type, md5sum, filename)
-VALUES (:id, :eid, :type, :md5sum, :filename)
+ (id, errata_id, type, checksum_id, filename)
+VALUES (:id, :eid, :type, lookup_checksum('md5', :md5sum), :filename)
EOQ
my $ef_insert_sth = $dbh->prepare($ef_insert_query);
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 35f852e..f0833f3 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -397,8 +397,8 @@ EOQ
$query =<<EOQ;
INSERT
INTO rhnErrataFileTmp
- (id, errata_id, type, md5sum, filename)
- (SELECT rhn_erratafile_id_seq.nextval, :new_eid, EF.type, EF.md5sum, EF.filename
+ (id, errata_id, type, checksum_id, filename)
+ (SELECT rhn_erratafile_id_seq.nextval, :new_eid, EF.type, EF.checksum_id, EF.filename
FROM rhnErrataFile EF
WHERE EF.errata_id = :old_eid)
EOQ
diff --git a/web/modules/rhn/RHN/DB/KSTree.pm b/web/modules/rhn/RHN/DB/KSTree.pm
index 3f5017d..0c75646 100644
--- a/web/modules/rhn/RHN/DB/KSTree.pm
+++ b/web/modules/rhn/RHN/DB/KSTree.pm
@@ -89,7 +89,7 @@ EOQ
return unless ($row);
$self->$_($row->{uc $_}) for qw/id label base_path channel_id boot_image org_id tree_type tree_type_name tree_type_label install_type install_type_label install_type_name channel_arch_id channel_arch_label channel_arch_name/;
- $sth = $dbh->prepare("SELECT relative_filename, file_size, md5sum, TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED FROM rhnKSTreeFile WHERE kstree_id = :tree_id");
+ $sth = $dbh->prepare("SELECT relative_filename, file_size, Csum.checksum md5sum, TO_CHAR(last_modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED FROM rhnKSTreeFile, rhnChecksum Csum WHERE kstree_id = :tree_id AND checksum_id = Csum.id");
$sth->execute_h(tree_id => $self->id);
$self->files( [ $sth->fullfetch_hashref ] );
@@ -194,9 +194,9 @@ sub commit_files {
for my $file (@{$self->files}) {
$sth = $dbh->prepare(<<EOQ);
INSERT INTO rhnKSTreeFile
- (kstree_id, relative_filename, md5sum, last_modified, file_size)
+ (kstree_id, relative_filename, checksum_id, last_modified, file_size)
VALUES
- (:tree_id, :relative_filename, :md5sum, TO_DATE(:last_modified, 'YYYY-MM-DD HH24:MI:SS'), :file_size)
+ (:tree_id, :relative_filename, lookup_checksum('md5', :md5sum), TO_DATE(:last_modified, 'YYYY-MM-DD HH24:MI:SS'), :file_size)
EOQ
$sth->execute_h(tree_id => $self->id, map { $_ => $file->{+uc $_} } qw/relative_filename md5sum last_modified file_size/)
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 8b9c003..b126a21 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -329,10 +329,11 @@ sub file_list {
my $sth;
$query = <<EOQ;
-SELECT C.name, F.file_size, F.md5, F.file_mode
- FROM rhnPackageFile F, rhnPackageCapability C
+SELECT C.name, F.file_size, Csum.checksum md5, F.file_mode
+ FROM rhnPackageFile F, rhnPackageCapability C, rhnChecksum Csum
WHERE F.package_id = ?
AND F.capability_id = C.id
+ AND F.checksum_id = Csum.id
ORDER BY UPPER(C.name)
EOQ
commit 33ee571867c04f630a78705f49406bd3d21b2a2d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 18 14:55:43 2009 +0100
fixed perl queries for sha256 schema
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 821dcfb..c660586 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -104,13 +104,15 @@ ORDER BY created DESC
<query params="pid">
SELECT C.name,
F.file_size,
- F.md5,
+ Cs.checksum md5,
F.file_mode,
F.linkto,
TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
- FROM rhnPackageFile F, rhnPackageCapability C
+ FROM rhnPackageFile F, rhnPackageCapability C,
+ rhnChecksum Cs
WHERE F.package_id = :pid
AND F.capability_id = C.id
+ AND CS.id = F.checksum_id
ORDER BY UPPER(C.name)
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 19ce8d3..723cd77 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -1752,7 +1752,7 @@ SELECT NEWEST.package_id AS id, NEWEST.channel_id
<query params="sid, action_id">
SELECT SAVR.mode_differs,
SAVR.size_differs,
- SAVR.md5_differs,
+ SAVR.checksum_differs md5_differs,
SAVR.uid_differs,
SAVR.gid_differs,
SAVR.mtime_differs,
@@ -1777,7 +1777,7 @@ SELECT SAVR.mode_differs,
UNION
SELECT 'N' AS mode_differs,
'N' AS size_differs,
- 'N' AS md5_differs,
+ 'N' AS checksum_differs md5_differs,
'N' AS uid_differs,
'N' AS gid_differs,
'N' AS mtime_differs,
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
index dd3e921..9af09c7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -115,14 +115,16 @@ ORDER BY CFN.path
<mode name="configfile_revisions">
<query params="crid">
SELECT CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
TO_CHAR(CCon.created, 'YYYY-MM-DD HH24:MI:SS') AS CREATED
- FROM rhnConfigContent CCon, rhnConfigRevision CR, rhnConfigFile CF
+ FROM rhnConfigContent CCon, rhnConfigRevision CR, rhnConfigFile CF,
+ rhnChecksum Csum
WHERE CCon.id = CR.config_content_id
AND CF.id = (SELECT config_file_id FROM rhnConfigRevision WHERE id = :crid)
AND CF.id = CR.config_file_id
+ AND CCon.checksum_id = Csum.id
ORDER BY CR.revision DESC
</query>
</mode>
@@ -130,7 +132,7 @@ ORDER BY CR.revision DESC
<mode name="configfiles_for_system">
<query params="sid">
SELECT CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
@@ -150,7 +152,8 @@ SELECT CR.id AS ID,
rhnConfigFile CF,
rhnConfigRevision CR,
rhnServerConfigChannel SCC,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE SCC.server_id = :sid
AND SCC.config_channel_id = CF.config_channel_id
AND CF.id = CR.config_file_id
@@ -161,6 +164,7 @@ SELECT CR.id AS ID,
AND CF.latest_config_revision_id = CR.id
AND CCT.label in ('normal', 'local_override')
AND CR.config_file_type_id = CFT.id
+ AND CCon.checksum_id = Csum.id
ORDER BY CCT.priority, SCC.position
</query>
<elaborator params="sid" multiple="t">
@@ -197,7 +201,7 @@ ORDER BY SCC.position
<mode name="configfiles_for_system_diff">
<query params="sid">
SELECT CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
@@ -217,7 +221,8 @@ SELECT CR.id AS ID,
rhnConfigFile CF,
rhnConfigRevision CR,
rhnServerConfigChannel SCC,
- rhnConfigFileType CFT
+ rhnConfigFileType CFT,
+ rhnChecksum Csum
WHERE SCC.server_id = :sid
AND SCC.config_channel_id = CF.config_channel_id
AND CF.id = CR.config_file_id
@@ -229,6 +234,7 @@ SELECT CR.id AS ID,
AND CCT.label in ('normal', 'local_override')
AND CR.config_file_type_id = CFT.id
AND NOT CFT.label = 'directory'
+ AND CCon.checksum_id = Csum.id
ORDER BY CCT.priority, SCC.position
</query>
<elaborator params="sid" multiple="t">
@@ -266,7 +272,7 @@ ORDER BY SCC.position
<query params="user_id">
SELECT SCC.server_id,
CR.id AS ID,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
@@ -284,7 +290,8 @@ SELECT SCC.server_id,
rhnConfigFileName CFN,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnServerConfigChannel SCC
+ rhnServerConfigChannel SCC,
+ rhnChecksum Csum
WHERE SCC.server_id IN (
SELECT DISTINCT S.id
FROM rhnServer S,
@@ -311,6 +318,7 @@ SELECT SCC.server_id,
WHERE label = 'selected_configfiles_ssm'
AND USER_ID = :user_id
)
+ AND CCon.checksum_id = Csum.id
ORDER BY SCC.server_id, CCT.priority, SCC.position
</query>
</mode>
@@ -460,7 +468,7 @@ SELECT CFN.id, count(DISTINCT SCC.server_id) AS system_count
<mode name="selected_configfiles">
<query params="set_label, user_id">
SELECT CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.path,
CR.revision,
NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
@@ -474,7 +482,8 @@ SELECT CR.id,
rhnConfigFile CF,
rhnConfigContent CCon,
rhnConfigRevision CR,
- rhnSet S
+ rhnSet S,
+ rhnChecksum Csum
WHERE S.user_id = :user_id
AND S.label = :set_label
AND S.element = CR.id
@@ -484,6 +493,7 @@ SELECT CR.id,
AND CCon.id = CR.config_content_id
AND CCT.label IN ('normal', 'local_override')
AND CFN.id = CF.config_file_name_id
+ AND CCon.checksum_id = Csum.id
ORDER BY CFN.path
</query>
</mode>
@@ -509,7 +519,7 @@ ORDER BY CFN.path
<query params="ss_id">
SELECT DISTINCT
CR.id,
- CCon.md5sum,
+ Csum.checksum md5sum,
CFN.id AS CONFIG_FILE_NAME_ID,
CFN.path,
CR.revision,
@@ -522,12 +532,14 @@ SELECT DISTINCT
rhnConfigFileName CFN,
rhnConfigFile CF,
rhnConfigRevision CR,
- rhnSnapshotConfigRevision SCR
+ rhnSnapshotConfigRevision SCR,
+ rhnChecksum Csum
WHERE SCR.snapshot_id = :ss_id
AND SCR.config_revision_id = CR.id
AND CR.config_content_id = CCon.id
AND CR.config_file_id = CF.id
AND CF.config_file_name_id = CFN.id
+ AND CCon.checksum_id = Csum.id
ORDER BY CFN.path
</query>
</mode>
14 years, 5 months
client/rhel
by Miroslav Suchý
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 34c478f84d2ced3ac81cd94df00e0ef9fa49e593
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 15:15:49 2009 +0100
515575 - require recent rhn-client tools
We need defined exception InvalidRedirectionError
addressing:
File "/usr/lib/yum-plugins/rhnplugin.py", line 318, in _getFile
except up2dateErrors.InvalidRedirectionError, e:
AttributeError: 'module' object has no attribute 'InvalidRedirectionError'
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index ff6569a..4ef49b3 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -15,7 +15,7 @@ BuildRequires: intltool
BuildRequires: gettext
Requires: yum >= 3.2.19-15
-Requires: rhn-client-tools >= 0.4.19-9
+Requires: rhn-client-tools >= 0.4.20-2
Requires: m2crypto >= 0.16-6
# Not really, but for upgrades we need these
14 years, 5 months
Changes to 'refs/tags/spacewalk-backend-0.7.14-1'
by Jan Pazdziora
Tag 'spacewalk-backend-0.7.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-11-18 12:26 +0000
Tagging package [spacewalk-backend] version [0.7.14-1] in directory [backend/].
Changes since spacewalk-proxy-html-0.7.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [0.7.14-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ddd5f435262a44a34f608ec2211f550b200fb4e8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 18 13:26:21 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c9023c5..0687db0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.13
+Version: 0.7.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 18 2009 Jan Pazdziora 0.7.14-1
+- reporting: add reports "users" and "users-systems".
+
* Thu Nov 12 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.13-1
- merged exportLib from satellite_exporter to satellite_tools
* Thu Nov 5 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.12-1
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d764756..f0ffa13 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.13-1 backend/
+0.7.14-1 backend/
14 years, 5 months
Changes to 'refs/tags/spacewalk-proxy-html-0.7.2-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-html-0.7.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-11-18 10:28 +0000
Tagging package [spacewalk-proxy-html] version [0.7.2-1] in directory [proxy/proxy-html/].
Changes since spacewalk-certs-tools-0.7.2-1:
Miroslav Suchý (2):
494292 - use %global instead of %define
Automatic commit of package [spacewalk-proxy-html] release [0.7.2-1].
---
proxy/proxy-html/spacewalk-proxy-html.spec | 9 ++++++---
rel-eng/packages/spacewalk-proxy-html | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
14 years, 5 months
proxy/proxy-html rel-eng/packages
by Miroslav Suchý
proxy/proxy-html/spacewalk-proxy-html.spec | 4 ++--
rel-eng/packages/spacewalk-proxy-html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1a8d41f0427305781f67a711c7405ad364feccb2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 11:28:17 2009 +0100
Automatic commit of package [spacewalk-proxy-html] release [0.7.2-1].
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index f868ea0..4125b46 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -6,7 +6,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
-* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com>
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.2-1
- 494292 - use %%global instead of %%define
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
diff --git a/rel-eng/packages/spacewalk-proxy-html b/rel-eng/packages/spacewalk-proxy-html
index eebf7fd..dce14fc 100644
--- a/rel-eng/packages/spacewalk-proxy-html
+++ b/rel-eng/packages/spacewalk-proxy-html
@@ -1 +1 @@
-0.7.1-1 proxy/proxy-html/
+0.7.2-1 proxy/proxy-html/
14 years, 5 months
proxy/proxy-html
by Miroslav Suchý
proxy/proxy-html/spacewalk-proxy-html.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8ea13848b309dadc444ac1956043e6cea33fc392
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 11:27:01 2009 +0100
494292 - use %global instead of %define
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index e7db978..f868ea0 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -1,3 +1,5 @@
+%global htmldir %{_var}/www/html
+
Name: spacewalk-proxy-html
Summary: The HTML component for Spacewalk Proxy
Group: Applications/Internet
@@ -12,8 +14,6 @@ Obsoletes: rhns-proxy-html < 5.3.0
Provides: rhns-proxy-html = 5.3.0
Requires: httpd
-%define htmldir %{_var}/www/html
-
%description
This package contains placeholder html pages, which the Spacewalk Server
displays, if you navigate to it using your browser.
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com>
+- 494292 - use %%global instead of %%define
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
- 494292 - address issues with spec file during Fedora package review
14 years, 5 months
Changes to 'refs/tags/spacewalk-certs-tools-0.7.2-1'
by Miroslav Suchý
Tag 'spacewalk-certs-tools-0.7.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-11-18 09:44 +0000
Tagging package [spacewalk-certs-tools] version [0.7.2-1] in directory [spacewalk/certs-tools/].
Changes since rhncfg-5.9.14-1:
Miroslav Suchý (7):
538046 - add LICENSE file
538046 - add python license
538046 - use %global instead of %define
538046 - Fedora prefer %defattr(-,root,root,-)
538046 - require rhn-client-tools since it owns %{rhnroot}. And take ownership of %{rhnroot}/certs
include that documentation we already have in package
Automatic commit of package [spacewalk-certs-tools] release [0.7.2-1].
---
rel-eng/packages/spacewalk-certs-tools | 2
spacewalk/certs-tools/LICENSE | 339 +++++++++++++++++++++++
spacewalk/certs-tools/spacewalk-certs-tools.spec | 15 -
3 files changed, 351 insertions(+), 5 deletions(-)
---
14 years, 5 months
7 commits - rel-eng/packages spacewalk/certs-tools
by Miroslav Suchý
rel-eng/packages/spacewalk-certs-tools | 2
spacewalk/certs-tools/LICENSE | 339 +++++++++++++++++++++++
spacewalk/certs-tools/spacewalk-certs-tools.spec | 15 -
3 files changed, 351 insertions(+), 5 deletions(-)
New commits:
commit 1ad706be7ca6e61569dc56c7cbbeb80a1043060a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:44:30 2009 +0100
Automatic commit of package [spacewalk-certs-tools] release [0.7.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 242cecf..cb1efef 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-0.7.1-1 spacewalk/certs-tools/
+0.7.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 6196d54..16c8396 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Nov 18 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.2-1
+- 538046 - Polish the spec according Fedora Packaging Guidelines
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
- fix rpmlint warnings
commit f72ee7c02a674d175991fa4b93c2b5f25b4532b2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:42:48 2009 +0100
include that documentation we already have in package
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 0cfaa73..6196d54 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -51,6 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
%doc LICENSE PYTHON-LICENSES.txt
+%doc ssl-howto-simple.txt ssl-howto.txt
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
commit 1d202650e7c9c28027b21aaae8a93f927d9f5347
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:42:05 2009 +0100
538046 - require rhn-client-tools since it owns %{rhnroot}. And take ownership of %{rhnroot}/certs
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 560bd9a..0cfaa73 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -9,6 +9,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: openssl rpm-build
+Requires: rhn-client-tools
BuildRequires: docbook-utils
BuildRequires: python
Obsoletes: rhns-certs < 5.3.0
@@ -41,6 +42,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%dir %{rhnroot}/certs
%{rhnroot}/certs/*.py*
%attr(755,root,root) %{rhnroot}/certs/sign.sh
%attr(755,root,root) %{rhnroot}/certs/gen-rpm.sh
commit bd040d32c44d532c3b501ab56542679e5b6d98a9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:20:39 2009 +0100
538046 - Fedora prefer %defattr(-,root,root,-)
Obey Fedora
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 34d90ea..560bd9a 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -40,7 +40,7 @@ chmod 755 $RPM_BUILD_ROOT/%{rhnroot}/certs/{rhn_ssl_tool.py,client_config_update
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{rhnroot}/certs/*.py*
%attr(755,root,root) %{rhnroot}/certs/sign.sh
%attr(755,root,root) %{rhnroot}/certs/gen-rpm.sh
commit 7bc826d955bd0b915b9e8be154182fb11c3f7c85
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:19:47 2009 +0100
538046 - use %global instead of %define
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 201050f..34d90ea 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -21,7 +21,7 @@ Provides: rhns-certs-tools = 5.3.0
This package contains tools to generate the SSL certificates required by
Spacewalk.
-%define rhnroot %{_prefix}/share/rhn
+%global rhnroot %{_datadir}/rhn
%prep
%setup -q
commit 1467b7ee1bbd7953530533da75cf06d84fb0ab6a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:15:16 2009 +0100
538046 - add python license
e.g. compile.py is based on
Python-licensed code
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index e6e347d..201050f 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -1,7 +1,7 @@
Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
-License: GPLv2
+License: GPLv2 and Python
Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-ssl-tool
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
-%doc LICENSE
+%doc LICENSE PYTHON-LICENSES.txt
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
commit c552f9596ef81b2eb813557078d17822abc2446d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:14:30 2009 +0100
538046 - add LICENSE file
diff --git a/spacewalk/certs-tools/LICENSE b/spacewalk/certs-tools/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/spacewalk/certs-tools/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 8b6ed36..e6e347d 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-ssl-tool
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
+%doc LICENSE
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
14 years, 5 months