diff --git a/.cvsignore b/.cvsignore index 92287ea..cc7b0ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -voms-1.9.12.1.tar.gz +voms-1.9.14.2.tar.gz diff --git a/import.log b/import.log index 86767f4..70d91e5 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ voms-1_9_11-4_fc11:HEAD:voms-1.9.11-4.fc11.src.rpm:1252549706 voms-1_9_12_1-1_fc11:HEAD:voms-1.9.12.1-1.fc11.src.rpm:1253508983 +voms-1_9_14_2-1_fc11:HEAD:voms-1.9.14.2-1.fc11.src.rpm:1256140426 diff --git a/sources b/sources index d76ddc7..52aca18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f4df625122198faa509453e9df9950e voms-1.9.12.1.tar.gz +b7d5b886e61d73c343a6686d5aa3eafe voms-1.9.14.2.tar.gz diff --git a/voms-expat.patch b/voms-expat.patch new file mode 100644 index 0000000..3bb482a --- /dev/null +++ b/voms-expat.patch @@ -0,0 +1,38 @@ +diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4 +--- voms-1.9.14.2.orig/project/expat.m4 2009-02-04 15:54:28.000000000 +0100 ++++ voms-1.9.14.2/project/expat.m4 2009-10-20 12:39:11.202112514 +0200 +@@ -19,13 +19,13 @@ + ac_save_CFLAGS=$CFLAGS + ac_save_LIBS=$LIBS + if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then +- EXPAT_CFLAGS="-I$with_expat_prefix/include" ++ EXPAT_CFLAGS="-I$with_expat_prefix/include" + EXPAT_LIBS="-L$with_expat_prefix/lib" +- EXPAT_LIBS64="-L$with_expat_prefix/lib64" ++ EXPAT_LIBS64="-L$with_expat_prefix/lib64" + else + EXPAT_CFLAGS="" +- EXPAT_LIBS="-L/usr/lib" +- EXPAT_LIBS64="-L/usr/lib64" ++ EXPAT_LIBS="" ++ EXPAT_LIBS64="" + fi + + EXPAT_LIBS="$EXPAT_LIBS -lexpat" +@@ -49,13 +49,13 @@ + # echo "ac_cv_expat_valid64=$ac_cv_expat_valid64" + if test x$ac_cv_expat_valid64 = xyes ; then + EXPAT_INSTALL_PATH=$with_expat_prefix +- EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a" +- EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat" ++ EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a" ++ EXPAT_LIBS=$EXPAT_LIBS64 + AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)]) + ifelse([$2], , :, [$2]) + elif test x$ac_cv_expat_valid = xyes ; then + EXPAT_INSTALL_PATH=$with_expat_prefix +- EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a" ++ EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a" + AC_MSG_RESULT([$ac_cv_expat_valid (in lib)]) + ifelse([$2], , :, [$2]) + else diff --git a/voms-nolib64.patch b/voms-nolib64.patch index 76d33c8..f04931e 100644 --- a/voms-nolib64.patch +++ b/voms-nolib64.patch @@ -1,7 +1,7 @@ -diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac ---- voms-1.9.8.1.orig/configure.ac 2009-04-16 15:57:03.000000000 +0200 -+++ voms-1.9.8.1/configure.ac 2009-07-02 12:16:10.035379837 +0200 -@@ -37,10 +37,6 @@ +diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac +--- voms-1.9.14.2.orig/configure.ac 2009-10-15 10:29:56.000000000 +0200 ++++ voms-1.9.14.2/configure.ac 2009-10-20 09:30:50.748114823 +0200 +@@ -36,18 +36,6 @@ AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE @@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac - AC_SUBST([libdir], ['${exec_prefix}/lib64']) -fi - +-if test -h /usr/lib64 ; then +- libdir='${exec_prefix}/lib' +-fi +- +-if ! test -e /usr/lib64 ; then +- libdir='${exec_prefix}/lib' +-fi +- AC_EXPAT([], have_expat=yes, have_expat=no) # taken from org.glite AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no) # taken from org.glite AC_GLOBUS([], have_globus=yes, have_globus=no) diff --git a/voms-portability.patch b/voms-portability.patch index c492cf2..f38137f 100644 --- a/voms-portability.patch +++ b/voms-portability.patch @@ -1,9 +1,8 @@ diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac --- voms-1.9.11.orig/configure.ac 2009-07-16 15:10:39.000000000 +0200 +++ voms-1.9.11/configure.ac 2009-09-08 14:13:33.244334250 +0200 -@@ -1,6 +1,6 @@ - - AC_INIT([GLite Security VOMS], [1.9.12]) +@@ -0,5 +0,5 @@ + AC_INIT([GLite Security VOMS], [1.9.14]) -AC_PREREQ(2.59) +AC_PREREQ(2.57) AC_CONFIG_AUX_DIR([./project]) diff --git a/voms-shell-syntax.patch b/voms-shell-syntax.patch index 2ae449d..032905b 100644 --- a/voms-shell-syntax.patch +++ b/voms-shell-syntax.patch @@ -1,29 +1,30 @@ -diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in ---- voms-1.9.8.1.orig/src/install/mysql2oracle.in 2005-09-27 16:23:56.000000000 +0200 -+++ voms-1.9.8.1/src/install/mysql2oracle.in 2009-07-02 18:40:14.000000000 +0200 -@@ -2,7 +2,7 @@ - #!/bin/sh +diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in +--- voms-1.9.14.2.orig/src/install/mysql2oracle.in 2009-07-16 15:10:40.000000000 +0200 ++++ voms-1.9.14.2/src/install/mysql2oracle.in 2009-10-20 10:47:24.767113029 +0200 +@@ -1,8 +1,7 @@ +-#!/bin/sh ++#!/bin/bash #set -x -function usage() -+function usage - { +-{ ++usage () { echo echo "usage : mysql2oracle [OPTIONS]" -diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping ---- voms-1.9.8.1.orig/src/install/voms-ping 2008-12-23 11:46:01.000000000 +0100 -+++ voms-1.9.8.1/src/install/voms-ping 2009-07-02 18:42:24.000000000 +0200 -@@ -25,7 +25,8 @@ + echo +diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping +--- voms-1.9.14.2.orig/src/install/voms-ping 2008-12-23 11:46:01.000000000 +0100 ++++ voms-1.9.14.2/src/install/voms-ping 2009-10-20 10:46:58.686114743 +0200 +@@ -25,7 +25,7 @@ echo " ]" } -function test_vo { -+function test_vo -+{ ++test_vo() { local voname="$1" local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf | grep '^--port' | sed 's/^--port=//'` local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-` -@@ -41,7 +42,7 @@ +@@ -41,7 +41,7 @@ "$voname" "localhost" "$port" "$dn" "$voname" EOF rm -f /tmp/oo diff --git a/voms.spec b/voms.spec index 2c2072c..97311bb 100644 --- a/voms.spec +++ b/voms.spec @@ -1,7 +1,7 @@ %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: voms -Version: 1.9.12.1 +Version: 1.9.14.2 Release: 1%{?dist} Summary: Virtual Organization Membership Service @@ -10,9 +10,9 @@ License: ASL 2.0 URL: http://glite.web.cern.ch/glite/ # The source tarball is created from a CVS checkout: # cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \ -# -r glite-security-voms_R_1_9_12_1 \ -# -d voms-1.9.12.1 org.glite.security.voms -# tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1 +# -r glite-security-voms_R_1_9_14_2 \ +# -d voms-1.9.14.2 org.glite.security.voms +# tar -z -c --exclude CVS -f voms-1.9.14.2.tar.gz voms-1.9.14.2 Source: %{name}-%{version}.tar.gz # Post-install setup instructions: Source1: %{name}.INSTALL @@ -61,6 +61,9 @@ Patch13: %{name}-openssl.patch # Unconditional use of PIPE_BUF # https://savannah.cern.ch/bugs/?55405 Patch14: %{name}-pipe-buf.patch +# Make sure -L/usr/lib and -L/usr/lib64 is not used +# https://savannah.cern.ch/bugs/?57261 +Patch15: %{name}-expat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: globus-gssapi-gsi-devel%{?_isa} @@ -78,7 +81,7 @@ BuildRequires: tex(latex) BuildRequires: tetex-latex %endif -BuildRequires: java-devel +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: bouncycastle >= 1.39 BuildRequires: jakarta-commons-cli @@ -217,6 +220,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # Fix bad permissions (which otherwise end up in the debuginfo package) find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \ @@ -456,6 +460,9 @@ fi %doc %{_javadocdir}/vomsjapi-%{version} %changelog +* Tue Oct 20 2009 Mattias Ellert - 1.9.14.2-1 +- Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2) + * Fri Sep 18 2009 Mattias Ellert - 1.9.12.1-1 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)