rpms/globus-gatekeeper/EL-5 globus-gatekeeper-setup.patch, NONE, 1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Mon Oct 19 18:18:44 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-gatekeeper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1333/EL-5
Modified Files:
.cvsignore sources
Added Files:
globus-gatekeeper-setup.patch globus-gatekeeper.patch
globus-gatekeeper.spec import.log
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated
globus-gatekeeper-setup.patch:
setup-globus-gatekeeper | 2 +-
setup-globus-gatekeeper.pl | 28 +++++++++++-----------------
2 files changed, 12 insertions(+), 18 deletions(-)
--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper 2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper 2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
#! /bin/sh
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl 2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl 2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
if (!defined($gpath))
{
- $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
- die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+ $gpath = "/usr";
}
@INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
print "Creating gatekeeper configuration file...\n";
@@ -66,27 +61,26 @@
-x509_user_cert $x509_user_cert
-x509_user_key $x509_user_key
-gridmap $gridmap
- -home $globusdir
- -e libexec
- -logfile var/globus-gatekeeper.log
+ -e $Globus::Core::Path::sbindir
+ -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
-port 2119
- -grid_services etc/grid-services
+ -grid_services $Globus::Core::Path::sysconfdir/grid-services
-inetd
EOF
print "Done\n";
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
{
print "Creating gatekeeper log directory...\n";
- system "mkdir -p $globusdir/var";
+ system "mkdir -p $Globus::Core::Path::localstatedir/log";
print "Done\n";
}
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
{
print "Creating grid services directory...\n";
- system "mkdir -p $globusdir/etc/grid-services";
+ system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
print "Done\n";
}
globus-gatekeeper.patch:
Makefile.am | 4 +---
configure.in | 4 ----
globus_gatekeeper.c | 45 +++------------------------------------------
3 files changed, 4 insertions(+), 49 deletions(-)
--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in 2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in 2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
esac
AC_SUBST(UNICOS_LIBS)
-if test "x$GLOBUS_THREADS" != "xnone"; then
- AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
AC_CHECK_HEADERS(proj.h)
AC_CHECK_HEADERS(netinet/tcp.h)
AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c 2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c 2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
#include <proj.h>
#endif
-#if !defined(MAXPATHLEN)
-# define MAXPATHLEN PATH_MAX
-#endif
-
#ifndef HAVE_SETENV
extern int setenv();
#endif
@@ -122,6 +118,7 @@
#endif
#include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
/******************************************************************************
Type definitions
@@ -179,7 +176,7 @@
# define GRAM_K5_EXE "globus-k5"
#endif
#ifndef GLOBUS_LIBEXECDIR
-# define GLOBUS_LIBEXECDIR "libexec"
+# define GLOBUS_LIBEXECDIR "sbin"
#endif
#ifndef GLOBUS_GATEKEEPER_HOME
# define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
#define LOGFILE ""
#endif
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
#define FAILED_AUTHORIZATION 1
#define FAILED_SERVICELOOKUP 2
#define FAILED_SERVER 3
@@ -600,34 +593,7 @@
* gatekeeperhome (-home path) when not run from inetd.
* otherwise it is NULL
*/
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
- /*
- * There is a memory corruption bug in the getcwd in
- * glibc-2.1.1 and earlier
- *
- * Solaris 2.5.1 does not have a correct implementation
- * of getcwd either.
- *
- */
- {
- char tmppath[PATH_MAX];
-
- if(getwd(tmppath))
- {
- gatekeeperhome = strdup(tmppath);
- }
- }
-#else
- {
- char *tmppath = NULL;
- int size = 1;
- while ( (tmppath = getcwd (NULL, size)) == NULL )
- {
- size++;
- }
- gatekeeperhome = tmppath;
- }
-#endif
+ GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
run_from_inetd = 0;
}
else
@@ -964,11 +930,6 @@
foreground = 1;
}
- if (gatekeeperhome)
- {
- setenv("GLOBUS_LOCATION",gatekeeperhome,1);
- }
-
setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
if (globuspwd)
{
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am 2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am 2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
EXTRA_DIST=
sbin_PROGRAMS= \
- globus-gatekeeper
-
-libexec_PROGRAMS = \
+ globus-gatekeeper \
globus-k5
globus_gatekeeper_SOURCES = \
--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif
Name: globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version: 5.0
%global setupversion 2.2
Release: 1%{?dist}
Summary: Globus Toolkit - Globus Gatekeeper
Group: Applications/Internet
License: ASL 2.0
URL: http://www.globus.org/
# Source is extracted from the globus toolkit installer:
# wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
# tar -jxf gt4.2.1-all-source-installer.tar.bz2
# mv gt4.2.1-all-source-installer/source-trees/gatekeeper/source globus_gatekeeper-5.0
# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
# tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source: %{_name}-%{version}.tar.gz
# Source1 is extracted from the globus toolkit installer:
# wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
# tar -jxf gt4.2.1-all-source-installer.tar.bz2
# mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
# tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1: %{_name}_setup-%{setupversion}.tar.gz
# Fixes for FHS installation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0: %{name}.patch
# Fixes for FHS installation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1: %{name}-setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: %{name}-setup = %{setupversion}
Requires: globus-common
Requires: globus-common-setup >= 2
Requires: globus-gatekeeper-setup >= 2
BuildRequires: grid-packaging-tools
BuildRequires: globus-gss-assist-devel%{?_isa} >= 3
BuildRequires: globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires: globus-core%{?_isa} >= 4
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name} package contains:
Globus Gatekeeper
Globus Gatekeeper Setup
%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -
%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
%{_datadir}/globus/globus-bootstrap.sh
%configure --with-flavor=%{flavor}
make %{?_smp_mflags}
# setup package
cd %{_name}_setup-%{setupversion}
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
%{_datadir}/globus/globus-bootstrap.sh
%configure --without-flavor
make %{?_smp_mflags}
cd -
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -
# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF
# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
$GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \
| sed s!^!%{_prefix}! > package.filelist
%clean
rm -rf $RPM_BUILD_ROOT
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup
%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated
--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:EL-5:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976299
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Oct 2009 16:26:16 -0000 1.1
+++ .cvsignore 19 Oct 2009 18:18:44 -0000 1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Oct 2009 16:26:16 -0000 1.1
+++ sources 19 Oct 2009 18:18:44 -0000 1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5 globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f globus_gatekeeper_setup-2.2.tar.gz
More information about the fedora-extras-commits
mailing list