aalvarez pushed to dpm-dsi (master). "Update for 1.9.4 upstream release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 09:21:06 UTC 2015
>From c6ebc75f08f34d5d7a4af789e981c00f531820c7 Mon Sep 17 00:00:00 2001
From: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date: Tue, 7 Apr 2015 10:59:42 +0200
Subject: Update for 1.9.4 upstream release
diff --git a/.gitignore b/.gitignore
index 46f5d8f..1482ea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/dpm-dsi-1.8.2.tar.gz
-/dpm-dsi-1.8.3.tar.gz
-/dpm-dsi-1.9.0.tar.gz
-/dpm-dsi-1.9.3.tar.gz
+/*.tar.gz
+/*.rpm
+
diff --git a/dpm-dsi-64.patch b/dpm-dsi-64.patch
new file mode 100644
index 0000000..2c92841
--- /dev/null
+++ b/dpm-dsi-64.patch
@@ -0,0 +1,14 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 11413)
++++ CMakeLists.txt (working copy)
+@@ -9,6 +9,9 @@
+ set(dpm-dsi_MINOR 9)
+ set(dpm-dsi_PATCH 4)
+
++# 64 bits sizes
++add_definitions (-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
++
+ # Build dependencies
+ find_package(DMLITE REQUIRED)
+ find_package(GRIDFTP REQUIRED)
diff --git a/dpm-dsi-eof.patch b/dpm-dsi-eof.patch
deleted file mode 100644
index 0555c40..0000000
--- a/dpm-dsi-eof.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/dmlite_gridftp.c
-===================================================================
---- src/dmlite_gridftp.c (.../dpm-dsi_1_9_3c) (révision 10416)
-+++ src/dmlite_gridftp.c (.../dpm-dsi_1_9_3d) (révision 10416)
-@@ -825,9 +825,9 @@
-
- /* Perform the actual read operation */
- bytes_read = dmlite_fread(dmlite_handle_obj->fd, buffer, bytes_length);
-- /* Check for end of file reached (0 bytes read) */
--
-- if (bytes_read < 0) { /* Check for errors too */
-+ if (bytes_read == 0) /* EOF */
-+ goto done;
-+ if (bytes_read < 0) { /* Check for errors */
- dmlite_handle_obj->cur_result = posix_error2gfs_result(_gfs_name, dmlite_handle_obj,
- EFAULT, "failed read");
- goto done;
diff --git a/dpm-dsi-fts2_issue.patch b/dpm-dsi-fts2_issue.patch
deleted file mode 100644
index 18ae0bc..0000000
--- a/dpm-dsi-fts2_issue.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: src/dmlite_internal.c
-===================================================================
---- src/dmlite_internal.c (.../tags/dpm-dsi_1_9_3d) (revision 10465)
-+++ src/dmlite_internal.c (.../trunk) (revision 10465)
-@@ -399,7 +399,7 @@
- dmlite_handle_obj->is_replica = GLOBUS_TRUE;
- dmlite_query = dmlite_location_obj->chunks[0].url.query;
- } else if (local || dmlite_errno(dmlite_context_obj) == ENOENT) {
-- if (dmlite_accessr(dmlite_context_obj, rfn, mode)) {
-+ if (!(flags & O_INSECURE) && dmlite_accessr(dmlite_context_obj, rfn, mode)) {
- dmlite_gfs_log(dmlite_handle_obj, GLOBUS_GFS_LOG_ERR, "access to RFN denied :: %s :: %s",
- rfn, dmlite_error(dmlite_context_obj));
- goto errout;
-Index: src/dmlite_gridftp.c
-===================================================================
---- src/dmlite_gridftp.c (.../tags/dpm-dsi_1_9_3d) (revision 10465)
-+++ src/dmlite_gridftp.c (.../trunk) (revision 10465)
-@@ -178,13 +178,14 @@
- struct dmlite_xstat dmlite_xstat_obj;
- struct dmlite_dir * dir_fd;
- struct dmlite_xstat * dir_entry_xstat;
-+ struct stat tmpstat;
- int nfiles, ctx_err;
- const char * localpath = dmlite_gfs_fixpath(stat_info->pathname, GLOBUS_FALSE);
- const char * rfn = dmlite_gfs_fixpath(stat_info->pathname, GLOBUS_TRUE);
-
- GlobusGFSName(globus_l_gfs_dmlite_stat);
-
-- dmlite_gfs_log(dmlite_handle_obj, GLOBUS_GFS_LOG_INFO, "stat :: %s", localpath);
-+ dmlite_gfs_log(dmlite_handle_obj, GLOBUS_GFS_LOG_INFO, "stat :: %s", stat_info->pathname);
-
- /* Get a dmlite_context object */
- dmlite_context_obj = dmlite_get_context(dmlite_handle_obj, &ctx_err);
-@@ -211,7 +212,31 @@
- finstat:
- /* File like info on the entry is easy to handle */
- if (!S_ISDIR(dmlite_xstat_obj.stat.st_mode) || stat_info->file_only) {
-- dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_INFO, "stat :: %s :: entry info only", localpath);
-+ dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_INFO, "stat :: single entry");
-+ /* Workaround for partially written replicas */
-+ if (dmlite_xstat_obj.stat.st_size != 0)
-+ goto giveup;
-+ dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_WARN, "stat :: zero size replica");
-+ if (dmlite_handle_obj->fd) {
-+ /* Ignore this error */
-+ posix_error2gfs_result(_gfs_name, dmlite_handle_obj, EINVAL, "session already has a file open");
-+ goto giveup;
-+ }
-+ if (!dmlite_gfs_open(dmlite_context_obj, dmlite_handle_obj, rfn, O_RDONLY | O_INSECURE)) {
-+ /* Ignore this error */
-+ dmlite_error2gfs_result(_gfs_name, dmlite_handle_obj, dmlite_context_obj);
-+ goto giveup;
-+ }
-+ if (dmlite_fstat(dmlite_handle_obj->fd, &tmpstat)) {
-+ /* Ignore this error */
-+ dmlite_error2gfs_result(_gfs_name, dmlite_handle_obj, dmlite_context_obj);
-+ dmlite_gfs_close(NULL, dmlite_handle_obj, 0);
-+ goto giveup;
-+ }
-+ dmlite_xstat_obj.stat.st_size = tmpstat.st_size;
-+ dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_WARN, "stat :: actual file size is %lld", tmpstat.st_size);
-+ dmlite_gfs_close(NULL, dmlite_handle_obj, 0);
-+giveup:
- /* Allocate the stat array */
- gfs_stat_array = (globus_gfs_stat_t *)globus_malloc(sizeof(globus_gfs_stat_t));
- if (!gfs_stat_array) {
-@@ -222,7 +247,7 @@
- stat_count = 1;
- } else { /* Going through directory is a bit more work */
- nfiles = dmlite_xstat_obj.stat.st_nlink;
-- dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_INFO, "stat :: %s :: full dir info with %d files", localpath, nfiles);
-+ dmlite_gfs_log(NULL, GLOBUS_GFS_LOG_INFO, "stat :: full directory with %d files", nfiles);
-
- /* Allocate the stat array */
- gfs_stat_array = (globus_gfs_stat_t *)globus_malloc(sizeof(globus_gfs_stat_t) * nfiles);
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index 50a5852..0e4af87 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,31 +1,30 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
-Version: 1.9.3
-Release: 5%{?dist}
+Version: 1.9.4
+Release: 1%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
# The source of this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_9_3c dpm-dsi-1.9.3
-# tar -czvf dpm-dsi-1.9.3.tar.gz dpm-dsi-1.9.3
+# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_9_4d dpm-dsi-1.9.4
+# tar -czvf dpm-dsi-1.9.4.tar.gz dpm-dsi-1.9.4
Source0: %{name}-%{version}.tar.gz
-# https://its.cern.ch/jira/browse/LCGDM-1408
-Patch0: dpm-dsi-eof.patch
-Patch1: dpm-dsi-fts2_issue.patch
+Patch0: %{name}-64.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: dmlite-devel
BuildRequires: globus-gridftp-server-devel
+BuildRequires: globus-common-progs
BuildRequires: voms-devel
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(post): chkconfig
Requires(postun): initscripts
-Requires: globus-gridftp-server-progs%{?_isa}
-Requires: dmlite-libs >= 0.6.2
+Requires: globus-gridftp-server-progs%{?_isa} >= 7.20
+Requires: dmlite-libs >= 0.7.1
Provides: DPM-gridftp-server = %{version}-%{release}
Obsoletes: DPM-gridftp-server <= 1.8.1
@@ -48,7 +47,6 @@ required to expose the data using this protocol.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0
-%patch1 -p0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -90,6 +88,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Tue Apr 08 2015 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 1.9.4-1
+- Update for new upstream release
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/no-headers.patch b/no-headers.patch
deleted file mode 100644
index 6ac00bb..0000000
--- a/no-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: include/CMakeLists.txt
-===================================================================
---- include/CMakeLists.txt (revision 8788)
-+++ include/CMakeLists.txt (working copy)
-@@ -1,5 +1,2 @@
- cmake_minimum_required (VERSION 2.6)
-
--install (FILES dmlite_gridftp.h dmlite_internal.h
-- DESTINATION usr/include
--)
-
diff --git a/sources b/sources
index 64c65fe..10923d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b74bbbb28efb8bbdb1d173fa008e6bad dpm-dsi-1.9.3.tar.gz
+f14741387c9e526c7673e31f7a6b5f1d dpm-dsi-1.9.4.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dpm-dsi.git/commit/?h=master&id=c6ebc75f08f34d5d7a4af789e981c00f531820c7
More information about the scm-commits
mailing list