vokac pushed to dmlite (f34). "Synchronize with rawhide dmlite 1.15.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 19:27:20 UTC
From b4cc63028472b4f9ba145017ee4c0c598e258978 Mon Sep 17 00:00:00 2001
From: Petr Vokac <petr.vokac(a)fjfi.cvut.cz>
Date: Jul 31 2021 19:27:13 +0000
Subject: Synchronize with rawhide dmlite 1.15.1
---
diff --git a/dmlite-fix-get-replica-by-rfn.patch b/dmlite-fix-get-replica-by-rfn.patch
deleted file mode 100644
index b9afd99..0000000
--- a/dmlite-fix-get-replica-by-rfn.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/dome/DomeMysql_cns.cpp b/src/dome/DomeMysql_cns.cpp
-index 6ee9039c..975fb242 100644
---- a/src/dome/DomeMysql_cns.cpp
-+++ b/src/dome/DomeMysql_cns.cpp
-@@ -1160,8 +1160,8 @@ DmStatus DomeMySql::getReplicabyRFN(dmlite::Replica &r, std::string rfn) {
- stmt.bindResult( 4, &r.ptime);
- stmt.bindResult( 5, &r.ltime);
- stmt.bindResult( 6, &crtype, 1);
-- stmt.bindResult( 7, &ctype, 1);
-- stmt.bindResult( 8, &cstatus, 1);
-+ stmt.bindResult( 7, &cstatus, 1);
-+ stmt.bindResult( 8, &ctype, 1);
- stmt.bindResult( 9, setnm, sizeof(setnm));
- stmt.bindResult(10, cpool, sizeof(cpool));
- stmt.bindResult(11, cserver, sizeof(cserver));
diff --git a/dmlite-fix-interop-rtype.patch b/dmlite-fix-interop-rtype.patch
deleted file mode 100644
index d10227f..0000000
--- a/dmlite-fix-interop-rtype.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/domeadapter/DomeAdapterUtils.h b/src/plugins/domeadapter/DomeAdapterUtils.h
-index 2d9c373b..cf7a4e81 100644
---- a/src/plugins/domeadapter/DomeAdapterUtils.h
-+++ b/src/plugins/domeadapter/DomeAdapterUtils.h
-@@ -58,7 +58,7 @@ inline void ptree_to_replica(const boost::property_tree::ptree &ptree, dmlite::R
-
- int status = ptree.get<int>("status");
- int type = ptree.get<int>("type");
-- int rtype = ptree.get<int>("rtype");
-+ int rtype = ptree.get<int>("rtype", dmlite::Replica::kPrimary);
- replica.status = static_cast<dmlite::Replica::ReplicaStatus>(status);
- replica.type = static_cast<dmlite::Replica::ReplicaType>(type);
- replica.rtype = static_cast<dmlite::Replica::ReplicaPS>(rtype);
diff --git a/dmlite-fix-puppet-managed-db.patch b/dmlite-fix-puppet-managed-db.patch
deleted file mode 100644
index ec44484..0000000
--- a/dmlite-fix-puppet-managed-db.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/src/puppet/dmlite/manifests/db/dpm.pp b/src/puppet/dmlite/manifests/db/dpm.pp
-index 6a7598a1..6561ac3c 100644
---- a/src/puppet/dmlite/manifests/db/dpm.pp
-+++ b/src/puppet/dmlite/manifests/db/dpm.pp
-@@ -1,5 +1,5 @@
- class dmlite::db::dpm ($dbname, $dbuser, $dbpass, $dbhost) inherits dmlite::db::params {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { 'dpm mysql commentcreate':
-diff --git a/src/puppet/dmlite/manifests/db/ns.pp b/src/puppet/dmlite/manifests/db/ns.pp
-index 0086add2..9df50c44 100644
---- a/src/puppet/dmlite/manifests/db/ns.pp
-+++ b/src/puppet/dmlite/manifests/db/ns.pp
-@@ -1,5 +1,5 @@
- class dmlite::db::ns ($flavor , $dbname, $dbuser, $dbpass, $dbhost) inherits dmlite::db::params {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { "${flavor} mysql commentcreate":
-diff --git a/src/puppet/dmlite/manifests/head.pp b/src/puppet/dmlite/manifests/head.pp
-index 16d678ea..71b74d6f 100644
---- a/src/puppet/dmlite/manifests/head.pp
-+++ b/src/puppet/dmlite/manifests/head.pp
-@@ -60,11 +60,10 @@ class dmlite::head (
- }
- }
- }
--
-- #
-- # In case the DB is not local we should configure the file /root/.my.cnf
-
-- if $dbhost != 'localhost' and $dbhost != $::fqdn and $dbmanage {
-+ if $dbmanage {
-+ # In case the DB is not local we should configure the file /root/.my.cnf
-+ if $dbhost != 'localhost' and $dbhost != $::fqdn {
- #check if root pass is empty
- if empty($mysqlrootpass ) {
- fail('mysqlrootpass parameter should not be empty')
-@@ -76,24 +75,26 @@ class dmlite::head (
- content => template('dmlite/mysql/my.cnf.erb'),
- before => [Class[dmlite::db::dpm], Class[dmlite::db::ns]]
- }
-- }
-- Package['dmlite-dpmhead-domeonly']
-- ->
-- class{'dmlite::db::dpm':
-- dbname => $dpm_db,
-- dbuser => $mysql_username,
-- dbpass => $mysql_password,
-- dbhost => $mysql_host,
-- }
-+ }
-+
-+ Package['dmlite-dpmhead-domeonly']
-+ ->
-+ class{'dmlite::db::dpm':
-+ dbname => $dpm_db,
-+ dbuser => $mysql_username,
-+ dbpass => $mysql_password,
-+ dbhost => $mysql_host,
-+ }
-
-- Package['dmlite-dpmhead-domeonly']
-- ->
-- class{'dmlite::db::ns':
-- flavor => 'mysql',
-- dbname => $ns_db,
-- dbuser => $mysql_username,
-- dbpass => $mysql_password,
-- dbhost => $mysql_host,
-+ Package['dmlite-dpmhead-domeonly']
-+ ->
-+ class{'dmlite::db::ns':
-+ flavor => 'mysql',
-+ dbname => $ns_db,
-+ dbuser => $mysql_username,
-+ dbpass => $mysql_password,
-+ dbhost => $mysql_host,
-+ }
- }
- }
-
-@@ -172,7 +173,11 @@ class dmlite::head (
- }
- exec{'upgradedb350':
- command => "/bin/sh /usr/share/dmlite/dbscripts/upgrade/DPM_upgrade_mysql \"${mysql_host}\" \"${mysql_username}\" \"${mysql_password}\" \"${dpm_db}\" \"${ns_db}\"",
-- require => [ Class['dmlite::db::dpm'], Class['dmlite::db::ns'], Package['dmlite-dpmhead-domeonly']]
-+ require => [ Package['dmlite-dpmhead-domeonly']]
-+ }
-+ if $dbmanage {
-+ Class['dmlite::db::dpm']->Exec['upgradedb350']
-+ Class['dmlite::db::ns']->Exec['upgradedb350']
- }
- } else {
- package{'dmlite-dpmhead-domeonly':
-diff --git a/src/puppet/lcgdm/manifests/dpm/grants.pp b/src/puppet/lcgdm/manifests/dpm/grants.pp
-index bfdd886e..e31f39b5 100644
---- a/src/puppet/lcgdm/manifests/dpm/grants.pp
-+++ b/src/puppet/lcgdm/manifests/dpm/grants.pp
-@@ -1,5 +1,5 @@
- define lcgdm::dpm::grants ($user, $pass) {
-- Class[mysql::server] -> Lcgdm::Dpm::Grants <| |>
-+ Class[mysql::client] -> Lcgdm::Dpm::Grants <| |>
-
- mysql_user { "${user}@${name}":
- ensure => present,
-diff --git a/src/puppet/lcgdm/manifests/dpm/mysql.pp b/src/puppet/lcgdm/manifests/dpm/mysql.pp
-index c9b6eb9d..358afbd0 100644
---- a/src/puppet/lcgdm/manifests/dpm/mysql.pp
-+++ b/src/puppet/lcgdm/manifests/dpm/mysql.pp
-@@ -1,5 +1,5 @@
- class lcgdm::dpm::mysql ($dbname, $dbuser, $dbpass, $dbhost) {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { 'dpm mysql commentcreate':
-diff --git a/src/puppet/lcgdm/manifests/ns/mysql.pp b/src/puppet/lcgdm/manifests/ns/mysql.pp
-index 0cdb21f0..1e04d755 100644
---- a/src/puppet/lcgdm/manifests/ns/mysql.pp
-+++ b/src/puppet/lcgdm/manifests/ns/mysql.pp
-@@ -1,6 +1,6 @@
- class lcgdm::ns::mysql ($flavor,$dbname,$dbuser, $dbpass, $dbhost) {
- # management of a mysql db (maybe this could be improved)
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { "${flavor} mysql commentcreate":
diff --git a/dmlite-log-htext-fail.patch b/dmlite-log-htext-fail.patch
deleted file mode 100644
index 30f2d9d..0000000
--- a/dmlite-log-htext-fail.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/plugins/apache-httpd/src/client/htext_get.c b/src/plugins/apache-httpd/src/client/htext_get.c
-index 2416230a..94ff6492 100644
---- a/src/plugins/apache-httpd/src/client/htext_get.c
-+++ b/src/plugins/apache-httpd/src/client/htext_get.c
-@@ -265,7 +265,10 @@ void *htext_get_method(void *h)
- if (partial_array[i].thread != 0) {
- /* Wait, or kill if failed */
- if (handle->status == HTEXTS_FAILED) {
-- htext_log(handle, "Cancelling get thread idx %d", i);
-+ if (partial_array[i].error_string)
-+ htext_log(handle, "Cancelling get thread idx %d, http status %d: %s", i, partial_array[i].http_status, partial_array[i].error_string);
-+ else
-+ htext_log(handle, "Cancelling get thread idx %d, http status %d", i, partial_array[i].http_status);
- pthread_cancel(partial_array[i].thread);
- canceled = 1;
- }
-diff --git a/src/plugins/apache-httpd/src/client/htext_put.c b/src/plugins/apache-httpd/src/client/htext_put.c
-index 50191cd2..4ebcb9c1 100644
---- a/src/plugins/apache-httpd/src/client/htext_put.c
-+++ b/src/plugins/apache-httpd/src/client/htext_put.c
-@@ -306,7 +306,11 @@ void *htext_put_method(void *h)
- if (partial_array[i].thread != 0) {
- /* Wait, or kill if failed */
- if (handle->status == HTEXTS_FAILED) {
-- htext_log(handle, "Cancelling put thread idx %d", i);
-+
-+ if (partial_array[i].error_string)
-+ htext_log(handle, "Cancelling put thread idx %d, http status %d: %s", i, partial_array[i].http_status, partial_array[i].error_string);
-+ else
-+ htext_log(handle, "Cancelling put thread idx %d, http status %d", i, partial_array[i].http_status);
- pthread_cancel(partial_array[i].thread);
- canceled = 1;
- }
diff --git a/dmlite-puppet-cleanup.patch b/dmlite-puppet-cleanup.patch
deleted file mode 100644
index fcd920c..0000000
--- a/dmlite-puppet-cleanup.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-diff --git a/src/puppet/dmlite/metadata.json b/src/puppet/dmlite/metadata.json
-index 91dd105b..f3eee05c 100644
---- a/src/puppet/dmlite/metadata.json
-+++ b/src/puppet/dmlite/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-dmlite",
-+ "version": "1.15.0",
- "author": "DPM",
-+ "summary": "Package for managing dmlite plugins",
-+ "license": "Apache-2.0",
-+ "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-+ "project_page": "http://lcgdm.web.cern.ch/dmlite",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -11,25 +18,42 @@
- },
- {
- "name": "lcgdm/xrootd",
-- "version_requirement": ">= 0.2.8"
-+ "version_requirement": ">= 0.2.9"
- },
- {
- "name": "lcgdm/lcgdm",
-- "version_requirement": ">= 0.3.12"
-+ "version_requirement": ">= 0.3.13"
- },
- {
- "name": "lcgdm/gridftp",
-- "version_requirement": ">= 0.2.7"
-+ "version_requirement": ">= 0.2.8"
-+ }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
- }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This package provides modules for managing dmlite",
-- "license": "Apache-2.0",
-- "name": "lcgdm-dmlite",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/dmlite",
-- "requirements": [],
-- "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-- "summary": "Package for managing dmlite plugins",
-- "tags": [],
-- "version": "1.14.0"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/dpm/README.md b/src/puppet/dpm/README.md
-index c3ae8cb4..e7e38a77 100644
---- a/src/puppet/dpm/README.md
-+++ b/src/puppet/dpm/README.md
-@@ -85,7 +85,7 @@ class{'dpm::head_disknode':
- token_password => 'kwpoMyvcusgdbyyws6gfcxhntkLoh8jilwivnivel',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- mountpoints => ['/srv/dpm','/srv/dpm/01'],
- pools => ['mypool:100M'],
-@@ -121,7 +121,7 @@ class{"dpm::headnode":
- token_password => 'kwpoMyvcusgdbyyws6gfcxhntkLoh8jilwivnivel',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- pools => ['mypool:100M'],
- filesystems => ["mypool:${fqdn}:/srv/dpm/01"],
-@@ -193,7 +193,7 @@ class{'dpm::disknode':
- localdomain => 'cern.ch',
- token_password => 'TOKEN_PASSWORD',
- xrootd_sharedkey => 'A32TO64CHARACTERKEYTESTTESTTESTTEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- mountpoints => ['/data','/data/01'],
- #configure_legacy => false,
- configure_dome => true,
-diff --git a/src/puppet/dpm/metadata.json b/src/puppet/dpm/metadata.json
-index 0862976d..b7d603c6 100644
---- a/src/puppet/dpm/metadata.json
-+++ b/src/puppet/dpm/metadata.json
-@@ -1,21 +1,28 @@
- {
-+ "name": "lcgdm-dpm",
-+ "version": "1.15.0",
- "author": "LCGDM",
-+ "summary": "Official DPM module",
-+ "license": "Apache-2.0",
-+ "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-+ "project_page": "http://lcgdm.web.cern.ch/dpm",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "lcgdm/gridftp",
-- "version_requirement": ">= 0.2.7"
-+ "version_requirement": ">= 0.2.8"
- },
- {
- "name": "lcgdm/dmlite",
-- "version_requirement": ">=1.14.0"
-+ "version_requirement": ">=1.15.0"
- },
- {
- "name": "lcgdm/lcgdm",
-- "version_requirement": ">= 0.3.12"
-+ "version_requirement": ">= 0.3.13"
- },
- {
- "name": "lcgdm/xrootd",
-- "version_requirement": ">= 0.2.8"
-+ "version_requirement": ">= 0.2.9"
- },
- {
- "name": "lcgdm/voms",
-@@ -37,15 +44,32 @@
- "name": "CERNOps/bdii",
- "version_requirement": ">= 1.2.2 <= 1.3.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "A wrapper for the DPM modules",
-- "license": "Apache-2.0",
-- "name": "lcgdm-dpm",
-- "operatingsystem_support":[],
-- "project_page": "http://lcgdm.web.cern.ch/dpm",
-- "requirements": [],
-- "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-- "summary": "Official DPM module",
-- "tags": [],
-- "version": "1.14.0"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/dpm/tests/headnode.pp b/src/puppet/dpm/tests/headnode.pp
-index 44adc78b..6defa1fc 100644
---- a/src/puppet/dpm/tests/headnode.pp
-+++ b/src/puppet/dpm/tests/headnode.pp
-@@ -22,7 +22,7 @@ class{'dpm::headnode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- local_db => true,
- pools => ['mypool:100M'],
-diff --git a/src/puppet/dpm/tests/headnode_disk.pp b/src/puppet/dpm/tests/headnode_disk.pp
-index fa05c7a1..2163a99e 100644
---- a/src/puppet/dpm/tests/headnode_disk.pp
-+++ b/src/puppet/dpm/tests/headnode_disk.pp
-@@ -25,7 +25,7 @@ class{'dpm::head_disknode':
- mountpoints => ['/srv/dpm','/srv/dpm/01'],
- pools => ['mypool:100M'],
- filesystems => ["mypool:${fqdn}:/srv/dpm/01"],
-- dpmmgr_uid => '500',
-+ dpmmgr_uid => 500,
- configure_dome => true,
- configure_domeadapter => true,
- configure_legacy => false,
-diff --git a/src/puppet/dpm/tests/headnode_nodb.pp b/src/puppet/dpm/tests/headnode_nodb.pp
-index e559e9f8..d054fddb 100644
---- a/src/puppet/dpm/tests/headnode_nodb.pp
-+++ b/src/puppet/dpm/tests/headnode_nodb.pp
-@@ -21,6 +21,6 @@ class{'dpm::headnode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => false,
- }
-diff --git a/src/puppet/dpm/tests/init.pp b/src/puppet/dpm/tests/init.pp
-index 4f118520..9df80e10 100644
---- a/src/puppet/dpm/tests/init.pp
-+++ b/src/puppet/dpm/tests/init.pp
-@@ -20,5 +20,5 @@ class{'dpm::head_disknode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERKEYTESTTESTTESTTEST',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- }
-diff --git a/src/puppet/gridftp/metadata.json b/src/puppet/gridftp/metadata.json
-index 18799deb..873a9939 100644
---- a/src/puppet/gridftp/metadata.json
-+++ b/src/puppet/gridftp/metadata.json
-@@ -1,14 +1,40 @@
- {
-+ "name": "lcgdm-gridftp",
-+ "version": "0.2.8",
- "author": "puppet",
-- "dependencies": [],
-- "description": "This package installs and configures a gridftp server",
-+ "summary": "This package installs and configures a gridftp server",
- "license": "Apache License, Version 2.0",
-- "name": "lcgdm-gridftp",
-- "operatingsystem_support": [],
-- "project_page": "UNKNOWN",
-- "requirements": [],
- "source": "https://github.com/cern-it-sdc-id/puppet-gridftp",
-- "summary": "This package installs and configures a gridftp server",
-- "tags": [],
-- "version": "0.2.7"
-+ "project_page": "UNKNOWN",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
-+ "dependencies": [
-+
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
-+ ],
-+ "description": "This package installs and configures a gridftp server",
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/lcgdm/metadata.json b/src/puppet/lcgdm/metadata.json
-index 745bac92..6b54e9da 100644
---- a/src/puppet/lcgdm/metadata.json
-+++ b/src/puppet/lcgdm/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-lcgdm",
-+ "version": "0.3.13",
- "author": "LCGDM",
-+ "summary": "Package for managing lcgdm components",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/cern-it-sdc-id/puppet-lcgdm",
-+ "project_page": "http://lcgdm.web.cern.ch/",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -9,15 +16,32 @@
- "name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.25.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This package provides modules for managing lcgdm components",
-- "license": "Apache-2.0",
-- "name": "lcgdm-lcgdm",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/",
-- "requirements": [],
-- "source": "https://github.com/cern-it-sdc-id/puppet-lcgdm",
-- "summary": "Package for managing lcgdm components",
-- "tags": [],
-- "version": "0.3.12"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/xrootd/metadata.json b/src/puppet/xrootd/metadata.json
-index 6add75af..c0cef13c 100644
---- a/src/puppet/xrootd/metadata.json
-+++ b/src/puppet/xrootd/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-xrootd",
-+ "version": "0.2.9",
- "author": "puppet",
-+ "summary": "This module installs and configure a xrootd server",
-+ "license": "Apache License, Version 2.0",
-+ "source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
-+ "project_page": "http://lcgdm.web.cern.ch/dpm",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -9,15 +16,38 @@
- "name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.25.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "OracleLinux",
-+ "operatingsystemrelease": [
-+ "7"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This module installs and configure a xrootd server",
-- "license": "Apache License, Version 2.0",
-- "name": "lcgdm-xrootd",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/dpm",
-- "requirements": [],
-- "source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
-- "summary": "This module installs and configure a xrootd server",
-- "tags": [],
-- "version": "0.2.8"
-+ "tags": [
-+
-+ ]
- }
diff --git a/dmlite-tpc-crl-update.patch b/dmlite-tpc-crl-update.patch
deleted file mode 100644
index 9b51eef..0000000
--- a/dmlite-tpc-crl-update.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff --git a/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in b/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-index 062979ec..bf09c450 100644
---- a/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-+++ b/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-@@ -177,7 +177,7 @@ DiskDMLite /etc/dmlite-disk.conf
- #DiskSSLCACertificateFile
- #DiskSSLCARevocationPath /etc/grid-security/certificates
- #DiskSSLCARevocationFile
-- #DiskSSLCARevocationCheck chain
-+ #DiskSSLCARevocationCheck chain no_crl_for_cert_ok
-
- # Terminate slow (stuck) transfers if bytes transferred
- # in given time window is smaller then configured tresholds
-diff --git a/src/plugins/apache-httpd/src/client/htext.h b/src/plugins/apache-httpd/src/client/htext.h
-index e748f98d..634bfe35 100644
---- a/src/plugins/apache-httpd/src/client/htext.h
-+++ b/src/plugins/apache-httpd/src/client/htext.h
-@@ -46,6 +46,7 @@ typedef enum
- HTEXTOP_CAFILE, /* CA File */
- HTEXTOP_CRLPATH, /* CRL Path */
- HTEXTOP_CRLFILE, /* CRL File */
-+ HTEXTOP_CRLMISSOK, /* CRL Missing OK */
- HTEXTOP_VERIFYPEER, /* Validate (!0) or not (0) the remote certificate */
-
- HTEXTOP_CLIENTID, /* Client ID for the requests */
-diff --git a/src/plugins/apache-httpd/src/client/htext_api.c b/src/plugins/apache-httpd/src/client/htext_api.c
-index 69022c87..7ca3a0a3 100644
---- a/src/plugins/apache-httpd/src/client/htext_api.c
-+++ b/src/plugins/apache-httpd/src/client/htext_api.c
-@@ -74,6 +74,7 @@ static option_entry option_definitions[] = {
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CAFILE */
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CRLPATH */
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CRLFILE */
-+ { OT_INT, (option_value) 1 }, /* HTEXTOP_CRLMISSOK */
- { OT_INT, (option_value) 1 }, /* HTEXTOP_VERIFYPEER */
-
- { OT_STRING, (option_value) "htext" }, /* HTEXTOP_CLIENTID */
-diff --git a/src/plugins/apache-httpd/src/client/htext_common.c b/src/plugins/apache-httpd/src/client/htext_common.c
-index e2135fae..b4fe4b43 100644
---- a/src/plugins/apache-httpd/src/client/htext_common.c
-+++ b/src/plugins/apache-httpd/src/client/htext_common.c
-@@ -120,9 +120,58 @@ int htext_error(htext_handle *handle, const char *fmt, ...)
- return n;
- }
-
-+int htext_verify_callback(int ok, X509_STORE_CTX *ctx)
-+{
-+ char buf[256], buf1[256];
-+ X509 *err_cert;
-+ X509_CRL *err_crl;
-+ int err, depth;
-+ SSL *ssl;
-+ SSL_CTX *ssl_ctx;
-+ htext_chunk *partial;
-+
-+ err_cert = X509_STORE_CTX_get_current_cert(ctx);
-+ err_crl = X509_STORE_CTX_get0_current_crl(ctx);
-+ err = X509_STORE_CTX_get_error(ctx);
-+ depth = X509_STORE_CTX_get_error_depth(ctx);
-+
-+ /*
-+ * Retrieve the pointer to the SSL of the connection currently treated
-+ * and the application specific data stored into the SSL_CTX object.
-+ */
-+ ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-+ ssl_ctx = SSL_get_SSL_CTX(ssl);
-+ partial = (htext_chunk*) SSL_CTX_get_app_data(ssl_ctx);;
-+
-+ if (!ok) {
-+ X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
-+ if (err_crl) {
-+ X509_NAME_oneline(X509_CRL_get_issuer(err_crl), buf1, 256);
-+ htext_log(partial->handle, "verify[%i] %s CRL %s issue: %s", depth, buf, buf1, X509_verify_cert_error_string(err));
-+ }
-+ else {
-+ htext_log(partial->handle, "verify[%i] %s issue: %s", depth, buf, X509_verify_cert_error_string(err));
-+ }
-+ }
-+
-+ // ignore errors with different URL for CRL in certificate and revocation list
-+ if (!ok && (err == X509_V_ERR_DIFFERENT_CRL_SCOPE)) {
-+ X509_STORE_CTX_set_error(ctx, X509_V_OK);
-+ return 1;
-+ }
-+ // ignore missing CRL
-+ if (!ok && (err == X509_V_ERR_UNABLE_TO_GET_CRL) && GETINT(partial->handle, HTEXTOP_CRLMISSOK)) {
-+ X509_STORE_CTX_set_error(ctx, X509_V_OK);
-+ return 1;
-+ }
-+
-+ return ok;
-+}
-+
- CURLcode htext_sslctx_callback(CURL *curl, void *ssl_ctx, void *pp)
- {
-- X509_STORE *store = SSL_CTX_get_cert_store((SSL_CTX*)ssl_ctx);
-+ SSL_CTX *ctx = (SSL_CTX*)ssl_ctx;
-+ X509_STORE *store = SSL_CTX_get_cert_store(ctx);
- htext_chunk *partial = (htext_chunk*) pp;
- const char *capath = GETSTR(partial->handle, HTEXTOP_CAPATH);
- const char *crlpath = GETSTR(partial->handle, HTEXTOP_CRLPATH);
-@@ -143,6 +192,9 @@ CURLcode htext_sslctx_callback(CURL *curl, void *ssl_ctx, void *pp)
-
- X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
-
-+ SSL_CTX_set_app_data(ctx, partial);
-+ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE, htext_verify_callback);
-+
- return CURLE_OK;
- }
-
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c b/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-index 4a8805ab..dbaa922b 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-@@ -526,6 +526,7 @@ static dav_error *dav_disk_generic_copy(const dav_resource* res, const char* upr
- if (d_conf->crlfile) {
- htext_setopt(handle, HTEXTOP_CRLFILE, d_conf->crlfile);
- }
-+ htext_setopt(handle, HTEXTOP_CRLMISSOK, d_conf->crlmissok);
- }
- if (uproxy || d_conf->capath || d_conf->cafile) {
- htext_setopt(handle, HTEXTOP_VERIFYPEER, 1);
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-index 2b875028..34d7e100 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-@@ -307,12 +307,27 @@ static const char *dav_disk_cmd_crlfile(cmd_parms *cmd, void *config,
- static const char *dav_disk_cmd_crlcheck(cmd_parms *cmd, void *config,
- const char *arg)
- {
-- if (strcmp("none", arg) && strcmp("chain", arg))
-- return apr_psprintf(cmd->pool, "%s is not a recognised value", arg);
--
- dav_disk_dir_conf *conf = (dav_disk_dir_conf*) config;
-- conf->crlcheck = arg;
-- return NULL ;
-+ const char *w;
-+
-+ w = ap_getword_conf(cmd->pool, &arg);
-+ if (strcasecmp("none", w) && strcasecmp("chain", w))
-+ return apr_pstrcat(cmd->temp_pool, cmd->cmd->name, ": Invalid argument '", w, "'", NULL);
-+
-+ conf->crlcheck = w;
-+ conf->crlmissok = 0;
-+
-+ while (*arg) {
-+ w = ap_getword_conf(cmd->temp_pool, &arg);
-+ if (strcasecmp(w, "no_crl_for_cert_ok") == 0) {
-+ conf->crlmissok = 1;
-+ }
-+ else {
-+ return apr_pstrcat(cmd->temp_pool, cmd->cmd->name, ": Invalid argument '", w, "'", NULL);
-+ }
-+ }
-+
-+ return NULL;
- }
-
- /** Command list (configuration parameters) */
-@@ -335,7 +350,7 @@ static const command_rec dav_disk_cmds[] = {
- "SSL CA Certificate Revocation List (CRL) path ('/path/to/dir' - contains PEM encoded files)"),
- AP_INIT_TAKE1 ("DiskSSLCARevocationFile", dav_disk_cmd_crlfile, NULL, ACCESS_CONF,
- "SSL CA Certificate Revocation List (CRL) file ('/path/to/file' - PEM encoded)"),
-- AP_INIT_TAKE1 ("DiskSSLCARevocationCheck", dav_disk_cmd_crlcheck, NULL, ACCESS_CONF,
-+ AP_INIT_RAW_ARGS ("DiskSSLCARevocationCheck", dav_disk_cmd_crlcheck, NULL, ACCESS_CONF,
- "SSL CA Certificate Revocation List checkging (chain|none)"),
- AP_INIT_TAKE1 ("DiskLowSpeedTime", ap_set_int_slot,
- (void *)APR_OFFSETOF(dav_disk_dir_conf, low_speed_time), ACCESS_CONF,
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-index d3beac92..359aefc7 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-@@ -63,6 +63,7 @@ struct dav_disk_dir_conf
- const char *crlpath;
- const char *crlfile;
- const char *crlcheck;
-+ int crlmissok;
- int low_speed_time;
- int low_speed_limit;
- };
-diff --git a/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf b/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-index 64565ccf..8e8220df 100644
---- a/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-+++ b/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-@@ -218,7 +218,7 @@ DiskDMLite <%= @dmlite_disk_conf %>
- <% end -%>
- <% if @ssl_tpc_crlpath -%>
- DiskSSLCARevocationPath <%= @ssl_tpc_crlpath %>
-- DiskSSLCARevocationCheck chain
-+ DiskSSLCARevocationCheck chain no_crl_for_cert_ok
- <% else -%>
- #DiskSSLCARevocationPath /etc/grid-security/certificates
- DiskSSLCARevocationCheck none
diff --git a/dmlite.spec b/dmlite.spec
index 9758ff4..f5f5e44 100644
--- a/dmlite.spec
+++ b/dmlite.spec
@@ -100,11 +100,11 @@
%undefine __cmake_in_source_build
%undefine __cmake3_in_source_build
-%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
Name: dmlite
-Version: 1.15.0
-Release: 7%{?dist}%{?_with_asan:.asan}
+Version: 1.15.1
+Release: 0%{?dist}%{?_with_asan:.asan}
Summary: Lcgdm grid data management and storage framework
Group: Applications/Internet
License: ASL 2.0
@@ -112,20 +112,14 @@ URL: https://gitlab.cern.ch/lcgdm/dmlite
# The source of this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# git clone http://gitlab.cern.ch/lcgdm/dmlite.git && cd dmlite
-# git archive --prefix dmlite-1.15.0/ tags/v1.15.0c | gzip > dmlite-1.15.0.tar.gz
+# git archive --prefix dmlite-1.15.1/ tags/v1.15.1 | gzip > dmlite-1.15.1.tar.gz
# git diff 9fadf8525087f5f9..9fadf8525087f5f9^ src > dmlite-xrootd4-revert.patch
Source0: %{name}-%{version}.tar.gz
Patch0: dmlite-python3.patch
Patch1: dmlite-cmake3.patch
Patch5: dmlite-xrootd4-revert.patch
-Patch10: dmlite-fix-get-replica-by-rfn.patch
-Patch11: dmlite-fix-dmlite-disk-conf.patch
-Patch12: dmlite-fix-puppet-managed-db.patch
-Patch13: dmlite-puppet-cleanup.patch
-Patch14: dmlite-fix-interop-rtype.patch
-Patch20: dmlite-tpc-crl-update.patch
-Patch21: dmlite-log-htext-fail.patch
+Patch10: dmlite-fix-dmlite-disk-conf.patch
%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: boost-devel >= 1.48.0
@@ -854,12 +848,6 @@ This package provides the modules for the DPM configuration via puppet
%patch5 -p1
%endif
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch20 -p1
-%patch21 -p1
%build
%global build_flags -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DINSTALL_PFX_DOC=%{_pkgdocdir}
@@ -1071,7 +1059,7 @@ install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp
%changelog
-* Thu Jul 29 2021 Petr Vokac <petr.vokac(a)cern.ch> - 1.15.0-7
+* Sat Jul 31 2021 Petr Vokac <petr.vokac(a)cern.ch> - 1.15.1-0
- fix interoperability with older dmlite releases
* Fri Jul 23 2021 Petr Vokac <petr.vokac(a)cern.ch> - 1.15.0-6
diff --git a/sources b/sources
index ae8c524..b891a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dmlite-1.15.0.tar.gz) = 2cb32808e7260f20303bc861d6dbb644370ccbe8b5074aeed5cdb48031a3aabf6a7c631a31fc7523b947b207f2e99409d32bbcc0b55453685b85aef91bf4d2a8
+SHA512 (dmlite-1.15.1.tar.gz) = 8b92eb750a91c0ea686478c4b388c816fc2d56b76729467a95c2505a02d2c88c0bb76ec3cf7c8cba3beb41010bcd8dda226bb17f022f45cf0d597571f95eeb71
https://src.fedoraproject.org/rpms/dmlite/c/b4cc63028472b4f9ba145017ee4c0...
2Â years, 9Â months
vokac pushed to dmlite (f34). "fix interoperability with older dmlite
releases"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 19:27:20 UTC
From 478b489f661544c61c75d6a87d8ec84e98b77098 Mon Sep 17 00:00:00 2001
From: Petr Vokac <petr.vokac(a)fjfi.cvut.cz>
Date: Jul 31 2021 19:01:35 +0000
Subject: fix interoperability with older dmlite releases
---
diff --git a/dmlite-fix-get-replica-by-rfn.patch b/dmlite-fix-get-replica-by-rfn.patch
deleted file mode 100644
index b9afd99..0000000
--- a/dmlite-fix-get-replica-by-rfn.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/dome/DomeMysql_cns.cpp b/src/dome/DomeMysql_cns.cpp
-index 6ee9039c..975fb242 100644
---- a/src/dome/DomeMysql_cns.cpp
-+++ b/src/dome/DomeMysql_cns.cpp
-@@ -1160,8 +1160,8 @@ DmStatus DomeMySql::getReplicabyRFN(dmlite::Replica &r, std::string rfn) {
- stmt.bindResult( 4, &r.ptime);
- stmt.bindResult( 5, &r.ltime);
- stmt.bindResult( 6, &crtype, 1);
-- stmt.bindResult( 7, &ctype, 1);
-- stmt.bindResult( 8, &cstatus, 1);
-+ stmt.bindResult( 7, &cstatus, 1);
-+ stmt.bindResult( 8, &ctype, 1);
- stmt.bindResult( 9, setnm, sizeof(setnm));
- stmt.bindResult(10, cpool, sizeof(cpool));
- stmt.bindResult(11, cserver, sizeof(cserver));
diff --git a/dmlite-fix-puppet-managed-db.patch b/dmlite-fix-puppet-managed-db.patch
deleted file mode 100644
index ec44484..0000000
--- a/dmlite-fix-puppet-managed-db.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/src/puppet/dmlite/manifests/db/dpm.pp b/src/puppet/dmlite/manifests/db/dpm.pp
-index 6a7598a1..6561ac3c 100644
---- a/src/puppet/dmlite/manifests/db/dpm.pp
-+++ b/src/puppet/dmlite/manifests/db/dpm.pp
-@@ -1,5 +1,5 @@
- class dmlite::db::dpm ($dbname, $dbuser, $dbpass, $dbhost) inherits dmlite::db::params {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { 'dpm mysql commentcreate':
-diff --git a/src/puppet/dmlite/manifests/db/ns.pp b/src/puppet/dmlite/manifests/db/ns.pp
-index 0086add2..9df50c44 100644
---- a/src/puppet/dmlite/manifests/db/ns.pp
-+++ b/src/puppet/dmlite/manifests/db/ns.pp
-@@ -1,5 +1,5 @@
- class dmlite::db::ns ($flavor , $dbname, $dbuser, $dbpass, $dbhost) inherits dmlite::db::params {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { "${flavor} mysql commentcreate":
-diff --git a/src/puppet/dmlite/manifests/head.pp b/src/puppet/dmlite/manifests/head.pp
-index 16d678ea..71b74d6f 100644
---- a/src/puppet/dmlite/manifests/head.pp
-+++ b/src/puppet/dmlite/manifests/head.pp
-@@ -60,11 +60,10 @@ class dmlite::head (
- }
- }
- }
--
-- #
-- # In case the DB is not local we should configure the file /root/.my.cnf
-
-- if $dbhost != 'localhost' and $dbhost != $::fqdn and $dbmanage {
-+ if $dbmanage {
-+ # In case the DB is not local we should configure the file /root/.my.cnf
-+ if $dbhost != 'localhost' and $dbhost != $::fqdn {
- #check if root pass is empty
- if empty($mysqlrootpass ) {
- fail('mysqlrootpass parameter should not be empty')
-@@ -76,24 +75,26 @@ class dmlite::head (
- content => template('dmlite/mysql/my.cnf.erb'),
- before => [Class[dmlite::db::dpm], Class[dmlite::db::ns]]
- }
-- }
-- Package['dmlite-dpmhead-domeonly']
-- ->
-- class{'dmlite::db::dpm':
-- dbname => $dpm_db,
-- dbuser => $mysql_username,
-- dbpass => $mysql_password,
-- dbhost => $mysql_host,
-- }
-+ }
-+
-+ Package['dmlite-dpmhead-domeonly']
-+ ->
-+ class{'dmlite::db::dpm':
-+ dbname => $dpm_db,
-+ dbuser => $mysql_username,
-+ dbpass => $mysql_password,
-+ dbhost => $mysql_host,
-+ }
-
-- Package['dmlite-dpmhead-domeonly']
-- ->
-- class{'dmlite::db::ns':
-- flavor => 'mysql',
-- dbname => $ns_db,
-- dbuser => $mysql_username,
-- dbpass => $mysql_password,
-- dbhost => $mysql_host,
-+ Package['dmlite-dpmhead-domeonly']
-+ ->
-+ class{'dmlite::db::ns':
-+ flavor => 'mysql',
-+ dbname => $ns_db,
-+ dbuser => $mysql_username,
-+ dbpass => $mysql_password,
-+ dbhost => $mysql_host,
-+ }
- }
- }
-
-@@ -172,7 +173,11 @@ class dmlite::head (
- }
- exec{'upgradedb350':
- command => "/bin/sh /usr/share/dmlite/dbscripts/upgrade/DPM_upgrade_mysql \"${mysql_host}\" \"${mysql_username}\" \"${mysql_password}\" \"${dpm_db}\" \"${ns_db}\"",
-- require => [ Class['dmlite::db::dpm'], Class['dmlite::db::ns'], Package['dmlite-dpmhead-domeonly']]
-+ require => [ Package['dmlite-dpmhead-domeonly']]
-+ }
-+ if $dbmanage {
-+ Class['dmlite::db::dpm']->Exec['upgradedb350']
-+ Class['dmlite::db::ns']->Exec['upgradedb350']
- }
- } else {
- package{'dmlite-dpmhead-domeonly':
-diff --git a/src/puppet/lcgdm/manifests/dpm/grants.pp b/src/puppet/lcgdm/manifests/dpm/grants.pp
-index bfdd886e..e31f39b5 100644
---- a/src/puppet/lcgdm/manifests/dpm/grants.pp
-+++ b/src/puppet/lcgdm/manifests/dpm/grants.pp
-@@ -1,5 +1,5 @@
- define lcgdm::dpm::grants ($user, $pass) {
-- Class[mysql::server] -> Lcgdm::Dpm::Grants <| |>
-+ Class[mysql::client] -> Lcgdm::Dpm::Grants <| |>
-
- mysql_user { "${user}@${name}":
- ensure => present,
-diff --git a/src/puppet/lcgdm/manifests/dpm/mysql.pp b/src/puppet/lcgdm/manifests/dpm/mysql.pp
-index c9b6eb9d..358afbd0 100644
---- a/src/puppet/lcgdm/manifests/dpm/mysql.pp
-+++ b/src/puppet/lcgdm/manifests/dpm/mysql.pp
-@@ -1,5 +1,5 @@
- class lcgdm::dpm::mysql ($dbname, $dbuser, $dbpass, $dbhost) {
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { 'dpm mysql commentcreate':
-diff --git a/src/puppet/lcgdm/manifests/ns/mysql.pp b/src/puppet/lcgdm/manifests/ns/mysql.pp
-index 0cdb21f0..1e04d755 100644
---- a/src/puppet/lcgdm/manifests/ns/mysql.pp
-+++ b/src/puppet/lcgdm/manifests/ns/mysql.pp
-@@ -1,6 +1,6 @@
- class lcgdm::ns::mysql ($flavor,$dbname,$dbuser, $dbpass, $dbhost) {
- # management of a mysql db (maybe this could be improved)
-- include 'mysql::server'
-+ include 'mysql::client'
-
- # the packaged db script explicitly creates the db, we don't want that
- file_line { "${flavor} mysql commentcreate":
diff --git a/dmlite-log-htext-fail.patch b/dmlite-log-htext-fail.patch
deleted file mode 100644
index 30f2d9d..0000000
--- a/dmlite-log-htext-fail.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/plugins/apache-httpd/src/client/htext_get.c b/src/plugins/apache-httpd/src/client/htext_get.c
-index 2416230a..94ff6492 100644
---- a/src/plugins/apache-httpd/src/client/htext_get.c
-+++ b/src/plugins/apache-httpd/src/client/htext_get.c
-@@ -265,7 +265,10 @@ void *htext_get_method(void *h)
- if (partial_array[i].thread != 0) {
- /* Wait, or kill if failed */
- if (handle->status == HTEXTS_FAILED) {
-- htext_log(handle, "Cancelling get thread idx %d", i);
-+ if (partial_array[i].error_string)
-+ htext_log(handle, "Cancelling get thread idx %d, http status %d: %s", i, partial_array[i].http_status, partial_array[i].error_string);
-+ else
-+ htext_log(handle, "Cancelling get thread idx %d, http status %d", i, partial_array[i].http_status);
- pthread_cancel(partial_array[i].thread);
- canceled = 1;
- }
-diff --git a/src/plugins/apache-httpd/src/client/htext_put.c b/src/plugins/apache-httpd/src/client/htext_put.c
-index 50191cd2..4ebcb9c1 100644
---- a/src/plugins/apache-httpd/src/client/htext_put.c
-+++ b/src/plugins/apache-httpd/src/client/htext_put.c
-@@ -306,7 +306,11 @@ void *htext_put_method(void *h)
- if (partial_array[i].thread != 0) {
- /* Wait, or kill if failed */
- if (handle->status == HTEXTS_FAILED) {
-- htext_log(handle, "Cancelling put thread idx %d", i);
-+
-+ if (partial_array[i].error_string)
-+ htext_log(handle, "Cancelling put thread idx %d, http status %d: %s", i, partial_array[i].http_status, partial_array[i].error_string);
-+ else
-+ htext_log(handle, "Cancelling put thread idx %d, http status %d", i, partial_array[i].http_status);
- pthread_cancel(partial_array[i].thread);
- canceled = 1;
- }
diff --git a/dmlite-puppet-cleanup.patch b/dmlite-puppet-cleanup.patch
deleted file mode 100644
index fcd920c..0000000
--- a/dmlite-puppet-cleanup.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-diff --git a/src/puppet/dmlite/metadata.json b/src/puppet/dmlite/metadata.json
-index 91dd105b..f3eee05c 100644
---- a/src/puppet/dmlite/metadata.json
-+++ b/src/puppet/dmlite/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-dmlite",
-+ "version": "1.15.0",
- "author": "DPM",
-+ "summary": "Package for managing dmlite plugins",
-+ "license": "Apache-2.0",
-+ "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-+ "project_page": "http://lcgdm.web.cern.ch/dmlite",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -11,25 +18,42 @@
- },
- {
- "name": "lcgdm/xrootd",
-- "version_requirement": ">= 0.2.8"
-+ "version_requirement": ">= 0.2.9"
- },
- {
- "name": "lcgdm/lcgdm",
-- "version_requirement": ">= 0.3.12"
-+ "version_requirement": ">= 0.3.13"
- },
- {
- "name": "lcgdm/gridftp",
-- "version_requirement": ">= 0.2.7"
-+ "version_requirement": ">= 0.2.8"
-+ }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
- }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This package provides modules for managing dmlite",
-- "license": "Apache-2.0",
-- "name": "lcgdm-dmlite",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/dmlite",
-- "requirements": [],
-- "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-- "summary": "Package for managing dmlite plugins",
-- "tags": [],
-- "version": "1.14.0"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/dpm/README.md b/src/puppet/dpm/README.md
-index c3ae8cb4..e7e38a77 100644
---- a/src/puppet/dpm/README.md
-+++ b/src/puppet/dpm/README.md
-@@ -85,7 +85,7 @@ class{'dpm::head_disknode':
- token_password => 'kwpoMyvcusgdbyyws6gfcxhntkLoh8jilwivnivel',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- mountpoints => ['/srv/dpm','/srv/dpm/01'],
- pools => ['mypool:100M'],
-@@ -121,7 +121,7 @@ class{"dpm::headnode":
- token_password => 'kwpoMyvcusgdbyyws6gfcxhntkLoh8jilwivnivel',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- pools => ['mypool:100M'],
- filesystems => ["mypool:${fqdn}:/srv/dpm/01"],
-@@ -193,7 +193,7 @@ class{'dpm::disknode':
- localdomain => 'cern.ch',
- token_password => 'TOKEN_PASSWORD',
- xrootd_sharedkey => 'A32TO64CHARACTERKEYTESTTESTTESTTEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- mountpoints => ['/data','/data/01'],
- #configure_legacy => false,
- configure_dome => true,
-diff --git a/src/puppet/dpm/metadata.json b/src/puppet/dpm/metadata.json
-index 0862976d..b7d603c6 100644
---- a/src/puppet/dpm/metadata.json
-+++ b/src/puppet/dpm/metadata.json
-@@ -1,21 +1,28 @@
- {
-+ "name": "lcgdm-dpm",
-+ "version": "1.15.0",
- "author": "LCGDM",
-+ "summary": "Official DPM module",
-+ "license": "Apache-2.0",
-+ "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-+ "project_page": "http://lcgdm.web.cern.ch/dpm",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "lcgdm/gridftp",
-- "version_requirement": ">= 0.2.7"
-+ "version_requirement": ">= 0.2.8"
- },
- {
- "name": "lcgdm/dmlite",
-- "version_requirement": ">=1.14.0"
-+ "version_requirement": ">=1.15.0"
- },
- {
- "name": "lcgdm/lcgdm",
-- "version_requirement": ">= 0.3.12"
-+ "version_requirement": ">= 0.3.13"
- },
- {
- "name": "lcgdm/xrootd",
-- "version_requirement": ">= 0.2.8"
-+ "version_requirement": ">= 0.2.9"
- },
- {
- "name": "lcgdm/voms",
-@@ -37,15 +44,32 @@
- "name": "CERNOps/bdii",
- "version_requirement": ">= 1.2.2 <= 1.3.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "A wrapper for the DPM modules",
-- "license": "Apache-2.0",
-- "name": "lcgdm-dpm",
-- "operatingsystem_support":[],
-- "project_page": "http://lcgdm.web.cern.ch/dpm",
-- "requirements": [],
-- "source": "https://gitlab.cern.ch/lcgdm/dmlite",
-- "summary": "Official DPM module",
-- "tags": [],
-- "version": "1.14.0"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/dpm/tests/headnode.pp b/src/puppet/dpm/tests/headnode.pp
-index 44adc78b..6defa1fc 100644
---- a/src/puppet/dpm/tests/headnode.pp
-+++ b/src/puppet/dpm/tests/headnode.pp
-@@ -22,7 +22,7 @@ class{'dpm::headnode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => true,
- local_db => true,
- pools => ['mypool:100M'],
-diff --git a/src/puppet/dpm/tests/headnode_disk.pp b/src/puppet/dpm/tests/headnode_disk.pp
-index fa05c7a1..2163a99e 100644
---- a/src/puppet/dpm/tests/headnode_disk.pp
-+++ b/src/puppet/dpm/tests/headnode_disk.pp
-@@ -25,7 +25,7 @@ class{'dpm::head_disknode':
- mountpoints => ['/srv/dpm','/srv/dpm/01'],
- pools => ['mypool:100M'],
- filesystems => ["mypool:${fqdn}:/srv/dpm/01"],
-- dpmmgr_uid => '500',
-+ dpmmgr_uid => 500,
- configure_dome => true,
- configure_domeadapter => true,
- configure_legacy => false,
-diff --git a/src/puppet/dpm/tests/headnode_nodb.pp b/src/puppet/dpm/tests/headnode_nodb.pp
-index e559e9f8..d054fddb 100644
---- a/src/puppet/dpm/tests/headnode_nodb.pp
-+++ b/src/puppet/dpm/tests/headnode_nodb.pp
-@@ -21,6 +21,6 @@ class{'dpm::headnode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERA32TO64CHARACTER',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- new_installation => false,
- }
-diff --git a/src/puppet/dpm/tests/init.pp b/src/puppet/dpm/tests/init.pp
-index 4f118520..9df80e10 100644
---- a/src/puppet/dpm/tests/init.pp
-+++ b/src/puppet/dpm/tests/init.pp
-@@ -20,5 +20,5 @@ class{'dpm::head_disknode':
- token_password => 'thetokenpasswordshouldbelongerthan32chars',
- xrootd_sharedkey => 'A32TO64CHARACTERKEYTESTTESTTESTTEST',
- site_name => 'CNR_DPM_TEST',
-- volist => [dteam, lhcb],
-+ volist => ['dteam', 'lhcb'],
- }
-diff --git a/src/puppet/gridftp/metadata.json b/src/puppet/gridftp/metadata.json
-index 18799deb..873a9939 100644
---- a/src/puppet/gridftp/metadata.json
-+++ b/src/puppet/gridftp/metadata.json
-@@ -1,14 +1,40 @@
- {
-+ "name": "lcgdm-gridftp",
-+ "version": "0.2.8",
- "author": "puppet",
-- "dependencies": [],
-- "description": "This package installs and configures a gridftp server",
-+ "summary": "This package installs and configures a gridftp server",
- "license": "Apache License, Version 2.0",
-- "name": "lcgdm-gridftp",
-- "operatingsystem_support": [],
-- "project_page": "UNKNOWN",
-- "requirements": [],
- "source": "https://github.com/cern-it-sdc-id/puppet-gridftp",
-- "summary": "This package installs and configures a gridftp server",
-- "tags": [],
-- "version": "0.2.7"
-+ "project_page": "UNKNOWN",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
-+ "dependencies": [
-+
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
-+ ],
-+ "description": "This package installs and configures a gridftp server",
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/lcgdm/metadata.json b/src/puppet/lcgdm/metadata.json
-index 745bac92..6b54e9da 100644
---- a/src/puppet/lcgdm/metadata.json
-+++ b/src/puppet/lcgdm/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-lcgdm",
-+ "version": "0.3.13",
- "author": "LCGDM",
-+ "summary": "Package for managing lcgdm components",
-+ "license": "Apache-2.0",
-+ "source": "https://github.com/cern-it-sdc-id/puppet-lcgdm",
-+ "project_page": "http://lcgdm.web.cern.ch/",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -9,15 +16,32 @@
- "name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.25.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This package provides modules for managing lcgdm components",
-- "license": "Apache-2.0",
-- "name": "lcgdm-lcgdm",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/",
-- "requirements": [],
-- "source": "https://github.com/cern-it-sdc-id/puppet-lcgdm",
-- "summary": "Package for managing lcgdm components",
-- "tags": [],
-- "version": "0.3.12"
-+ "tags": [
-+
-+ ]
- }
-diff --git a/src/puppet/xrootd/metadata.json b/src/puppet/xrootd/metadata.json
-index 6add75af..c0cef13c 100644
---- a/src/puppet/xrootd/metadata.json
-+++ b/src/puppet/xrootd/metadata.json
-@@ -1,5 +1,12 @@
- {
-+ "name": "lcgdm-xrootd",
-+ "version": "0.2.9",
- "author": "puppet",
-+ "summary": "This module installs and configure a xrootd server",
-+ "license": "Apache License, Version 2.0",
-+ "source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
-+ "project_page": "http://lcgdm.web.cern.ch/dpm",
-+ "issues_url": "https://its.cern.ch/jira/projects/LCGDM",
- "dependencies": [
- {
- "name": "puppet/fetchcrl",
-@@ -9,15 +16,38 @@
- "name": "puppetlabs/stdlib",
- "version_requirement": ">= 4.25.0"
- }
-+ ],
-+ "operatingsystem_support": [
-+ {
-+ "operatingsystem": "CentOS",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "OracleLinux",
-+ "operatingsystemrelease": [
-+ "7"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "RedHat",
-+ "operatingsystemrelease": [
-+ "6","7","8"
-+ ]
-+ },
-+ {
-+ "operatingsystem": "Scientific",
-+ "operatingsystemrelease": [
-+ "6","7"
-+ ]
-+ }
-+ ],
-+ "requirements": [
-+
- ],
- "description": "This module installs and configure a xrootd server",
-- "license": "Apache License, Version 2.0",
-- "name": "lcgdm-xrootd",
-- "operatingsystem_support": [],
-- "project_page": "http://lcgdm.web.cern.ch/dpm",
-- "requirements": [],
-- "source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
-- "summary": "This module installs and configure a xrootd server",
-- "tags": [],
-- "version": "0.2.8"
-+ "tags": [
-+
-+ ]
- }
diff --git a/dmlite-tpc-crl-update.patch b/dmlite-tpc-crl-update.patch
deleted file mode 100644
index 9b51eef..0000000
--- a/dmlite-tpc-crl-update.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff --git a/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in b/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-index 062979ec..bf09c450 100644
---- a/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-+++ b/src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in
-@@ -177,7 +177,7 @@ DiskDMLite /etc/dmlite-disk.conf
- #DiskSSLCACertificateFile
- #DiskSSLCARevocationPath /etc/grid-security/certificates
- #DiskSSLCARevocationFile
-- #DiskSSLCARevocationCheck chain
-+ #DiskSSLCARevocationCheck chain no_crl_for_cert_ok
-
- # Terminate slow (stuck) transfers if bytes transferred
- # in given time window is smaller then configured tresholds
-diff --git a/src/plugins/apache-httpd/src/client/htext.h b/src/plugins/apache-httpd/src/client/htext.h
-index e748f98d..634bfe35 100644
---- a/src/plugins/apache-httpd/src/client/htext.h
-+++ b/src/plugins/apache-httpd/src/client/htext.h
-@@ -46,6 +46,7 @@ typedef enum
- HTEXTOP_CAFILE, /* CA File */
- HTEXTOP_CRLPATH, /* CRL Path */
- HTEXTOP_CRLFILE, /* CRL File */
-+ HTEXTOP_CRLMISSOK, /* CRL Missing OK */
- HTEXTOP_VERIFYPEER, /* Validate (!0) or not (0) the remote certificate */
-
- HTEXTOP_CLIENTID, /* Client ID for the requests */
-diff --git a/src/plugins/apache-httpd/src/client/htext_api.c b/src/plugins/apache-httpd/src/client/htext_api.c
-index 69022c87..7ca3a0a3 100644
---- a/src/plugins/apache-httpd/src/client/htext_api.c
-+++ b/src/plugins/apache-httpd/src/client/htext_api.c
-@@ -74,6 +74,7 @@ static option_entry option_definitions[] = {
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CAFILE */
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CRLPATH */
- { OT_STRING, (option_value) NULL }, /* HTEXTOP_CRLFILE */
-+ { OT_INT, (option_value) 1 }, /* HTEXTOP_CRLMISSOK */
- { OT_INT, (option_value) 1 }, /* HTEXTOP_VERIFYPEER */
-
- { OT_STRING, (option_value) "htext" }, /* HTEXTOP_CLIENTID */
-diff --git a/src/plugins/apache-httpd/src/client/htext_common.c b/src/plugins/apache-httpd/src/client/htext_common.c
-index e2135fae..b4fe4b43 100644
---- a/src/plugins/apache-httpd/src/client/htext_common.c
-+++ b/src/plugins/apache-httpd/src/client/htext_common.c
-@@ -120,9 +120,58 @@ int htext_error(htext_handle *handle, const char *fmt, ...)
- return n;
- }
-
-+int htext_verify_callback(int ok, X509_STORE_CTX *ctx)
-+{
-+ char buf[256], buf1[256];
-+ X509 *err_cert;
-+ X509_CRL *err_crl;
-+ int err, depth;
-+ SSL *ssl;
-+ SSL_CTX *ssl_ctx;
-+ htext_chunk *partial;
-+
-+ err_cert = X509_STORE_CTX_get_current_cert(ctx);
-+ err_crl = X509_STORE_CTX_get0_current_crl(ctx);
-+ err = X509_STORE_CTX_get_error(ctx);
-+ depth = X509_STORE_CTX_get_error_depth(ctx);
-+
-+ /*
-+ * Retrieve the pointer to the SSL of the connection currently treated
-+ * and the application specific data stored into the SSL_CTX object.
-+ */
-+ ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-+ ssl_ctx = SSL_get_SSL_CTX(ssl);
-+ partial = (htext_chunk*) SSL_CTX_get_app_data(ssl_ctx);;
-+
-+ if (!ok) {
-+ X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
-+ if (err_crl) {
-+ X509_NAME_oneline(X509_CRL_get_issuer(err_crl), buf1, 256);
-+ htext_log(partial->handle, "verify[%i] %s CRL %s issue: %s", depth, buf, buf1, X509_verify_cert_error_string(err));
-+ }
-+ else {
-+ htext_log(partial->handle, "verify[%i] %s issue: %s", depth, buf, X509_verify_cert_error_string(err));
-+ }
-+ }
-+
-+ // ignore errors with different URL for CRL in certificate and revocation list
-+ if (!ok && (err == X509_V_ERR_DIFFERENT_CRL_SCOPE)) {
-+ X509_STORE_CTX_set_error(ctx, X509_V_OK);
-+ return 1;
-+ }
-+ // ignore missing CRL
-+ if (!ok && (err == X509_V_ERR_UNABLE_TO_GET_CRL) && GETINT(partial->handle, HTEXTOP_CRLMISSOK)) {
-+ X509_STORE_CTX_set_error(ctx, X509_V_OK);
-+ return 1;
-+ }
-+
-+ return ok;
-+}
-+
- CURLcode htext_sslctx_callback(CURL *curl, void *ssl_ctx, void *pp)
- {
-- X509_STORE *store = SSL_CTX_get_cert_store((SSL_CTX*)ssl_ctx);
-+ SSL_CTX *ctx = (SSL_CTX*)ssl_ctx;
-+ X509_STORE *store = SSL_CTX_get_cert_store(ctx);
- htext_chunk *partial = (htext_chunk*) pp;
- const char *capath = GETSTR(partial->handle, HTEXTOP_CAPATH);
- const char *crlpath = GETSTR(partial->handle, HTEXTOP_CRLPATH);
-@@ -143,6 +192,9 @@ CURLcode htext_sslctx_callback(CURL *curl, void *ssl_ctx, void *pp)
-
- X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
-
-+ SSL_CTX_set_app_data(ctx, partial);
-+ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE, htext_verify_callback);
-+
- return CURLE_OK;
- }
-
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c b/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-index 4a8805ab..dbaa922b 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/copy.c
-@@ -526,6 +526,7 @@ static dav_error *dav_disk_generic_copy(const dav_resource* res, const char* upr
- if (d_conf->crlfile) {
- htext_setopt(handle, HTEXTOP_CRLFILE, d_conf->crlfile);
- }
-+ htext_setopt(handle, HTEXTOP_CRLMISSOK, d_conf->crlmissok);
- }
- if (uproxy || d_conf->capath || d_conf->cafile) {
- htext_setopt(handle, HTEXTOP_VERIFYPEER, 1);
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-index 2b875028..34d7e100 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.c
-@@ -307,12 +307,27 @@ static const char *dav_disk_cmd_crlfile(cmd_parms *cmd, void *config,
- static const char *dav_disk_cmd_crlcheck(cmd_parms *cmd, void *config,
- const char *arg)
- {
-- if (strcmp("none", arg) && strcmp("chain", arg))
-- return apr_psprintf(cmd->pool, "%s is not a recognised value", arg);
--
- dav_disk_dir_conf *conf = (dav_disk_dir_conf*) config;
-- conf->crlcheck = arg;
-- return NULL ;
-+ const char *w;
-+
-+ w = ap_getword_conf(cmd->pool, &arg);
-+ if (strcasecmp("none", w) && strcasecmp("chain", w))
-+ return apr_pstrcat(cmd->temp_pool, cmd->cmd->name, ": Invalid argument '", w, "'", NULL);
-+
-+ conf->crlcheck = w;
-+ conf->crlmissok = 0;
-+
-+ while (*arg) {
-+ w = ap_getword_conf(cmd->temp_pool, &arg);
-+ if (strcasecmp(w, "no_crl_for_cert_ok") == 0) {
-+ conf->crlmissok = 1;
-+ }
-+ else {
-+ return apr_pstrcat(cmd->temp_pool, cmd->cmd->name, ": Invalid argument '", w, "'", NULL);
-+ }
-+ }
-+
-+ return NULL;
- }
-
- /** Command list (configuration parameters) */
-@@ -335,7 +350,7 @@ static const command_rec dav_disk_cmds[] = {
- "SSL CA Certificate Revocation List (CRL) path ('/path/to/dir' - contains PEM encoded files)"),
- AP_INIT_TAKE1 ("DiskSSLCARevocationFile", dav_disk_cmd_crlfile, NULL, ACCESS_CONF,
- "SSL CA Certificate Revocation List (CRL) file ('/path/to/file' - PEM encoded)"),
-- AP_INIT_TAKE1 ("DiskSSLCARevocationCheck", dav_disk_cmd_crlcheck, NULL, ACCESS_CONF,
-+ AP_INIT_RAW_ARGS ("DiskSSLCARevocationCheck", dav_disk_cmd_crlcheck, NULL, ACCESS_CONF,
- "SSL CA Certificate Revocation List checkging (chain|none)"),
- AP_INIT_TAKE1 ("DiskLowSpeedTime", ap_set_int_slot,
- (void *)APR_OFFSETOF(dav_disk_dir_conf, low_speed_time), ACCESS_CONF,
-diff --git a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-index d3beac92..359aefc7 100644
---- a/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-+++ b/src/plugins/apache-httpd/src/mod_lcgdm_disk/mod_lcgdm_disk.h
-@@ -63,6 +63,7 @@ struct dav_disk_dir_conf
- const char *crlpath;
- const char *crlfile;
- const char *crlcheck;
-+ int crlmissok;
- int low_speed_time;
- int low_speed_limit;
- };
-diff --git a/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf b/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-index 64565ccf..8e8220df 100644
---- a/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-+++ b/src/puppet/dmlite/templates/dav/zlcgdm-dav.conf
-@@ -218,7 +218,7 @@ DiskDMLite <%= @dmlite_disk_conf %>
- <% end -%>
- <% if @ssl_tpc_crlpath -%>
- DiskSSLCARevocationPath <%= @ssl_tpc_crlpath %>
-- DiskSSLCARevocationCheck chain
-+ DiskSSLCARevocationCheck chain no_crl_for_cert_ok
- <% else -%>
- #DiskSSLCARevocationPath /etc/grid-security/certificates
- DiskSSLCARevocationCheck none
diff --git a/dmlite.spec b/dmlite.spec
index c48fd05..f5f5e44 100644
--- a/dmlite.spec
+++ b/dmlite.spec
@@ -103,8 +103,8 @@
%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
Name: dmlite
-Version: 1.15.0
-Release: 6%{?dist}%{?_with_asan:.asan}
+Version: 1.15.1
+Release: 0%{?dist}%{?_with_asan:.asan}
Summary: Lcgdm grid data management and storage framework
Group: Applications/Internet
License: ASL 2.0
@@ -112,19 +112,14 @@ URL: https://gitlab.cern.ch/lcgdm/dmlite
# The source of this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# git clone http://gitlab.cern.ch/lcgdm/dmlite.git && cd dmlite
-# git archive --prefix dmlite-1.15.0/ tags/v1.15.0c | gzip > dmlite-1.15.0.tar.gz
+# git archive --prefix dmlite-1.15.1/ tags/v1.15.1 | gzip > dmlite-1.15.1.tar.gz
# git diff 9fadf8525087f5f9..9fadf8525087f5f9^ src > dmlite-xrootd4-revert.patch
Source0: %{name}-%{version}.tar.gz
Patch0: dmlite-python3.patch
Patch1: dmlite-cmake3.patch
Patch5: dmlite-xrootd4-revert.patch
-Patch10: dmlite-fix-get-replica-by-rfn.patch
-Patch11: dmlite-fix-dmlite-disk-conf.patch
-Patch12: dmlite-fix-puppet-managed-db.patch
-Patch13: dmlite-puppet-cleanup.patch
-Patch20: dmlite-tpc-crl-update.patch
-Patch21: dmlite-log-htext-fail.patch
+Patch10: dmlite-fix-dmlite-disk-conf.patch
%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: boost-devel >= 1.48.0
@@ -853,11 +848,6 @@ This package provides the modules for the DPM configuration via puppet
%patch5 -p1
%endif
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch20 -p1
-%patch21 -p1
%build
%global build_flags -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DINSTALL_PFX_DOC=%{_pkgdocdir}
@@ -1069,6 +1059,9 @@ install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp
%changelog
+* Sat Jul 31 2021 Petr Vokac <petr.vokac(a)cern.ch> - 1.15.1-0
+- fix interoperability with older dmlite releases
+
* Fri Jul 23 2021 Petr Vokac <petr.vokac(a)cern.ch> - 1.15.0-6
- Minor bugfixes
- Puppet modules version updated
diff --git a/sources b/sources
index ae8c524..b891a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dmlite-1.15.0.tar.gz) = 2cb32808e7260f20303bc861d6dbb644370ccbe8b5074aeed5cdb48031a3aabf6a7c631a31fc7523b947b207f2e99409d32bbcc0b55453685b85aef91bf4d2a8
+SHA512 (dmlite-1.15.1.tar.gz) = 8b92eb750a91c0ea686478c4b388c816fc2d56b76729467a95c2505a02d2c88c0bb76ec3cf7c8cba3beb41010bcd8dda226bb17f022f45cf0d597571f95eeb71
https://src.fedoraproject.org/rpms/dmlite/c/478b489f661544c61c75d6a87d8ec...
2Â years, 9Â months
decathorpe pushed to pantheon-session-settings (f34). "ensure that
accountsservice interface extension is installed correctly"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 19:25:15 UTC
From c5e8bc725c51b6854f85243ef7fd19d90942e87a Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Jul 31 2021 19:20:37 +0000
Subject: ensure that accountsservice interface extension is installed correctly
---
diff --git a/pantheon-session-settings.spec b/pantheon-session-settings.spec
index 18f85d1..0c6acac 100644
--- a/pantheon-session-settings.spec
+++ b/pantheon-session-settings.spec
@@ -3,7 +3,7 @@
Name: pantheon-session-settings
Summary: Pantheon session configuration files
Version: 34.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3
URL: https://pagure.io/pantheon-fedora/session-settings
@@ -80,7 +80,7 @@ cp -p accountsservice/io.elementary.pantheon.AccountsService.policy \
%{buildroot}/%{_datadir}/polkit-1/actions/
mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces
-ln -s %{_datadir}/dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
+ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
%{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml
@@ -111,6 +111,9 @@ fi
%changelog
+* Sat Jul 31 2021 Fabio Valentini <decathorpe(a)gmail.com> - 34.1-2
+- Ensure that accountsservice interface extension is installed correctly.
+
* Fri May 14 2021 Fabio Valentini <decathorpe(a)gmail.com> - 34.1-1
- Update to version 34.1.
https://src.fedoraproject.org/rpms/pantheon-session-settings/c/c5e8bc725c...
2Â years, 9Â months
decathorpe pushed to pantheon-session-settings (rawhide). "ensure
that accountsservice interface extension is installed correctly"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 19:19:52 UTC
From 5732e82a26ecde8fb791525099d1fb45ed13e20f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Jul 31 2021 19:19:21 +0000
Subject: ensure that accountsservice interface extension is installed correctly
---
diff --git a/pantheon-session-settings.spec b/pantheon-session-settings.spec
index b9c1d49..07f2993 100644
--- a/pantheon-session-settings.spec
+++ b/pantheon-session-settings.spec
@@ -3,7 +3,7 @@
Name: pantheon-session-settings
Summary: Pantheon session configuration files
Version: 34.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3
URL: https://pagure.io/pantheon-fedora/session-settings
@@ -80,7 +80,7 @@ cp -p accountsservice/io.elementary.pantheon.AccountsService.policy \
%{buildroot}/%{_datadir}/polkit-1/actions/
mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces
-ln -s %{_datadir}/dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
+ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
%{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml
@@ -111,6 +111,9 @@ fi
%changelog
+* Sat Jul 31 2021 Fabio Valentini <decathorpe(a)gmail.com> - 34.1-3
+- Ensure that accountsservice interface extension is installed correctly.
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 34.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
https://src.fedoraproject.org/rpms/pantheon-session-settings/c/5732e82a26...
2Â years, 9Â months
mooninite pushed to vkd3d (epel8). "Update to 1.2"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-07-31 19:13:14 UTC
From ae403ae9c85ee3c4c4fe78194575185c7b65947c Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike(a)cchtml.com>
Date: Jul 31 2021 19:13:07 +0000
Subject: Update to 1.2
---
diff --git a/.gitignore b/.gitignore
index f35c8bd..d488317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/vkd3d-1.1.tar.xz
-/vkd3d-1.1.tar.xz.sign
+/vkd3d-1.2.tar.xz
+/vkd3d-1.2.tar.xz.sign
diff --git a/sources b/sources
index 250f221..8d3db87 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vkd3d-1.1.tar.xz) = e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
-SHA512 (vkd3d-1.1.tar.xz.sign) = bad3f5a08f0e49f502352f2768cf8a5c170788ec85608f1ba1555833d9f8f9f2ea34eb0cf7a4280a855ea4d66d5aa2b3f14997909105d2b344f6aef4cf9e210d
+SHA512 (vkd3d-1.2.tar.xz) = ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
+SHA512 (vkd3d-1.2.tar.xz.sign) = b2ff3bea8965f8e0d3f2f6c6e3aa9f0c6ef7b4c500e6a762fd9acb2f2f19d0294faf76f30c1c6f262da3acb96e9cd5faa227d067667d763f1fc9dc22b0aa60c3
diff --git a/vkd3d.spec b/vkd3d.spec
index 1ab657d..8ec6adf 100644
--- a/vkd3d.spec
+++ b/vkd3d.spec
@@ -1,6 +1,6 @@
Name: vkd3d
-Version: 1.1
-Release: 5%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: D3D12 to Vulkan translation library
License: LGPLv2+
@@ -48,6 +48,32 @@ Requires: libvkd3d%{?_isa} = %{version}-%{release}
Development files for vkd3d
+%package -n vkd3d-compiler
+Summary: Compiler tool for vkd3d
+
+
+%description -n vkd3d-compiler
+Compiler tool for vkd3d
+
+
+%package -n libvkd3d-shader
+Summary: Shader library for vkd3d
+
+
+%description -n libvkd3d-shader
+Shader library for vkd3d
+
+
+%package -n libvkd3d-shader-devel
+Summary: Development files for libvkd3d-shader
+Requires: libvkd3d-devel%{?_isa} = %{version}-%{release}
+Requires: libvkd3d-shader%{?_isa} = %{version}-%{release}
+
+
+%description -n libvkd3d-shader-devel
+Development files for libvkd3d-shader
+
+
%package -n libvkd3d-utils
Summary: Utility library for vkd3d
@@ -92,16 +118,34 @@ find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' -delete
%files -n libvkd3d-devel
%dir %{_includedir}/vkd3d
+%{_includedir}/vkd3d/vkd3d.h
%{_includedir}/vkd3d/vkd3d_d3d12.h
+%{_includedir}/vkd3d/vkd3d_d3d12sdklayers.h
%{_includedir}/vkd3d/vkd3d_d3dcommon.h
%{_includedir}/vkd3d/vkd3d_dxgibase.h
%{_includedir}/vkd3d/vkd3d_dxgiformat.h
-%{_includedir}/vkd3d/vkd3d.h
+%{_includedir}/vkd3d/vkd3d_types.h
%{_includedir}/vkd3d/vkd3d_windows.h
%{_libdir}/libvkd3d.so
%{_libdir}/pkgconfig/libvkd3d.pc
+%files -n vkd3d-compiler
+%{_bindir}/vkd3d-compiler
+
+
+%files -n libvkd3d-shader
+%license COPYING LICENSE
+%{_libdir}/libvkd3d-shader.so.1
+%{_libdir}/libvkd3d-shader.so.1.*
+
+
+%files -n libvkd3d-shader-devel
+%{_includedir}/vkd3d/vkd3d_shader.h
+%{_libdir}/libvkd3d-shader.so
+%{_libdir}/pkgconfig/libvkd3d-shader.pc
+
+
%files -n libvkd3d-utils
%{_libdir}/libvkd3d-utils.so.1
%{_libdir}/libvkd3d-utils.so.1.*
@@ -114,6 +158,9 @@ find %{buildroot} -regextype egrep -regex '.*\.a$|.*\.la$' -delete
%changelog
+* Tue Sep 22 2020 - Michael Cronenworth <mike(a)cchtml.com> - 1.2-1
+- version update
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
https://src.fedoraproject.org/rpms/vkd3d/c/ae403ae9c85ee3c4c4fe7819457518...
2Â years, 9Â months