aalvarez pushed to dpm-dsi (el5). "Merge branch 'master' into el5 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 09:59:05 UTC 2015
>From 7ffa0203fcb8009dc446a0ed923551d47005c13a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 13 Feb 2013 13:59:43 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index d6751d1..00d8d4e 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -96,6 +96,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Wed Dec 19 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.9.0-1
- Update for new upstream release
--
cgit v0.10.2
>From bda37597d38deb59ce4e01f8b9b84e48b05d17a9 Mon Sep 17 00:00:00 2001
From: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date: Mon, 6 May 2013 17:48:48 +0200
Subject: Removed devel package, and %{_isa} suffix from the globus server
dependency
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index 00d8d4e..d87cc96 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -10,6 +10,9 @@ URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_9_0 dpm-dsi-1.9.0
# tar -czvf dpm-dsi-1.9.0.tar.gz dpm-dsi-1.9.0
Source0: %{name}-%{version}.tar.gz
+# It does not make sense to provide internal header files
+# https://svnweb.cern.ch/trac/lcgdm/changeset/8789/dpm-dsi/trunk
+Patch0: no-headers.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -20,7 +23,7 @@ Requires(preun): chkconfig
Requires(preun): initscripts
Requires(post): chkconfig
Requires(postun): initscripts
-Requires: globus-gridftp-server-progs%{?_isa}
+Requires: globus-gridftp-server-progs
Provides: DPM-gridftp-server = %{version}-%{release}
Obsoletes: DPM-gridftp-server <= 1.8.1
Provides: DPM-DSI = %{version}-%{release}
@@ -39,17 +42,9 @@ Globus provides open source grid software, including a server implementation
of the GridFTP protocol. This plugin implements the DPM backend specifics
required to expose the data using this protocol.
-%package devel
-Summary: DPM GridFTP plugin development headers and libraries
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-This package contains common development libraries and header files for the
-DPM GridFTP plugin.
-
%prep
%setup -q -n %{name}-%{version}
+%patch0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -74,11 +69,6 @@ rm -rf %{buildroot}
%{_localstatedir}/log/dpm-gsiftp
%doc LICENSE RELEASE-NOTES
-%files devel
-%defattr(-,root,root)
-%{_includedir}/dmlite_gridftp.h
-%{_includedir}/dmlite_internal.h
-
%post
/sbin/chkconfig --add dpm-gsiftp
/sbin/ldconfig
@@ -96,6 +86,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Mon May 06 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.0-3
+- Removed devel package
+- Removed %{?_isa} suffix from globus-gridftp-server-progs
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/no-headers.patch b/no-headers.patch
new file mode 100644
index 0000000..6ac00bb
--- /dev/null
+++ b/no-headers.patch
@@ -0,0 +1,11 @@
+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
+-)
+
--
cgit v0.10.2
>From f36b2e1b13262716c0d59fc847e5d0e1183c7f6e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 3 Aug 2013 02:44:28 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index d87cc96..eadfec0 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -86,6 +86,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Mon May 06 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.0-3
- Removed devel package
- Removed %{?_isa} suffix from globus-gridftp-server-progs
--
cgit v0.10.2
>From 702344055392c0fd44a863854facaa2688c94423 Mon Sep 17 00:00:00 2001
From: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date: Wed, 12 Mar 2014 09:18:29 +0100
Subject: update for 1.9.3 upstream release
diff --git a/.gitignore b/.gitignore
index 4d0961f..46f5d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/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
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index eadfec0..eb6edf7 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,29 +1,29 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
-Version: 1.9.0
-Release: 4%{?dist}
+Version: 1.9.3
+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_0 dpm-dsi-1.9.0
-# tar -czvf dpm-dsi-1.9.0.tar.gz dpm-dsi-1.9.0
+# 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
Source0: %{name}-%{version}.tar.gz
-# It does not make sense to provide internal header files
-# https://svnweb.cern.ch/trac/lcgdm/changeset/8789/dpm-dsi/trunk
-Patch0: no-headers.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: dmlite-devel
BuildRequires: globus-gridftp-server-devel
+BuildRequires: voms-devel
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(post): chkconfig
Requires(postun): initscripts
-Requires: globus-gridftp-server-progs
+Requires: globus-gridftp-server-progs%{?_isa}
+Requires: dmlite-libs >= 0.6.2
+
Provides: DPM-gridftp-server = %{version}-%{release}
Obsoletes: DPM-gridftp-server <= 1.8.1
Provides: DPM-DSI = %{version}-%{release}
@@ -44,7 +44,6 @@ required to expose the data using this protocol.
%prep
%setup -q -n %{name}-%{version}
-%patch0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -86,6 +85,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Wed Mar 12 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.3-1
+- Update for new upstream release
+- Fixed bogus date
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -112,7 +115,7 @@ fi
* Mon Nov 28 2011 Dan Horák <dan[at]danny.cz> - 1.8.2-6
- fix build on 64-bit arches (s390x, sparc64 and possibly others)
-* Wed Nov 15 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-5
+* Tue Nov 15 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-5
- Removed architecture from globus-gridftp-server-progs requires
* Wed Nov 09 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-4
diff --git a/sources b/sources
index 391aa1c..cc2b8cf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
9ae3915b47f7b19907a55f60569e1168 dpm-dsi-1.9.0.tar.gz
+b74bbbb28efb8bbdb1d173fa008e6bad dpm-dsi-1.9.3.tar.gz
--
cgit v0.10.2
>From 11ceb6705fc5f126dc55b13694fd3714ac033c8f Mon Sep 17 00:00:00 2001
From: aalvarez <aalvarez at cern.ch>
Date: Thu, 15 May 2014 08:47:11 +0200
Subject: Patch for proper EOF handling
diff --git a/dpm-dsi-eof.patch b/dpm-dsi-eof.patch
new file mode 100644
index 0000000..0555c40
--- /dev/null
+++ b/dpm-dsi-eof.patch
@@ -0,0 +1,17 @@
+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.spec b/dpm-dsi.spec
index eb6edf7..643db4b 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -10,6 +10,8 @@ URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
# 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
Source0: %{name}-%{version}.tar.gz
+# https://its.cern.ch/jira/browse/LCGDM-1408
+Patch0: dpm-dsi-eof.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -44,6 +46,7 @@ required to expose the data using this protocol.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -85,6 +88,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Thu May 15 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.3-2
+- Patch for proper EOF handling
+
* Wed Mar 12 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.3-1
- Update for new upstream release
- Fixed bogus date
diff --git a/sources b/sources
index cc2b8cf..64c65fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9ae3915b47f7b19907a55f60569e1168 dpm-dsi-1.9.0.tar.gz
b74bbbb28efb8bbdb1d173fa008e6bad dpm-dsi-1.9.3.tar.gz
--
cgit v0.10.2
>From 413c54d92c867fc2bd03114e4945d2fbb3c44785 Mon Sep 17 00:00:00 2001
From: simonm <michal.simon at cern.ch>
Date: Fri, 23 May 2014 19:05:29 +0200
Subject: Patch for the FTS2 issue
diff --git a/dpm-dsi-fts2_issue.patch b/dpm-dsi-fts2_issue.patch
new file mode 100644
index 0000000..18ae0bc
--- /dev/null
+++ b/dpm-dsi-fts2_issue.patch
@@ -0,0 +1,75 @@
+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);
--
cgit v0.10.2
>From 477ceb01b21cc773afdd56f309d497fceba2bc7c Mon Sep 17 00:00:00 2001
From: simonm <michal.simon at cern.ch>
Date: Fri, 23 May 2014 19:07:08 +0200
Subject: Patch for the FTS2 issue
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index 643db4b..cb4a063 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -12,6 +12,7 @@ URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
Source0: %{name}-%{version}.tar.gz
# https://its.cern.ch/jira/browse/LCGDM-1408
Patch0: dpm-dsi-eof.patch
+Patch1: dpm-dsi-fts2_issue.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -47,6 +48,7 @@ required to expose the data using this protocol.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0
+%patch1 -p0
%build
%cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -88,6 +90,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Fri May 23 2014 Michal Simon <michal.simon at cern.ch> - 1.9.3-3
+- Patch for the FTS2 issue
+
* Thu May 15 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.3-2
- Patch for proper EOF handling
--
cgit v0.10.2
>From 1cd66261437286cf95aae56d3637b4a8479c3e97 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 7 Jun 2014 03:00:52 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index cb4a063..47f4a77 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -90,6 +90,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Fri May 23 2014 Michal Simon <michal.simon at cern.ch> - 1.9.3-3
- Patch for the FTS2 issue
--
cgit v0.10.2
>From 0ad8af6027b3c0cfb867a3a0324009982eddbdb0 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 16 Aug 2014 09:42:12 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index 47f4a77..50a5852 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,7 +1,7 @@
Name: dpm-dsi
Summary: Disk Pool Manager (DPM) plugin for the Globus GridFTP server
Version: 1.9.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
@@ -90,6 +90,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* 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
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>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=el5&id=646feaef6bf401ddc5735614c36dd2f609c6930c
More information about the scm-commits
mailing list