rpms/voms/F-12 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch, 1.1, 1.2 voms-portability.patch, 1.2, 1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Wed Oct 21 15:56:51 UTC 2009
- Previous message (by thread): rpms/selinux-policy/F-12 modules-minimum.conf, 1.40, 1.41 modules-targeted.conf, 1.149, 1.150 policy-F12.patch, 1.114, 1.115 selinux-policy.spec, 1.947, 1.948
- Next message (by thread): rpms/voms/F-11 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch, 1.1, 1.2 voms-portability.patch, 1.2, 1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/voms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25478/F-12
Modified Files:
.cvsignore import.log sources voms-nolib64.patch
voms-portability.patch voms-shell-syntax.patch voms.spec
Added Files:
voms-expat.patch
Log Message:
* Tue Oct 20 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.2-1
- Upstream 1.9.14.2 (CVS tag glite-security-voms_R_1_9_14_2)
voms-expat.patch:
expat.m4 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE voms-expat.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 21 Sep 2009 04:57:59 -0000 1.3
+++ .cvsignore 21 Oct 2009 15:56:48 -0000 1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 21 Sep 2009 04:57:59 -0000 1.2
+++ import.log 21 Oct 2009 15:56:48 -0000 1.3
@@ -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:F-12:voms-1.9.14.2-1.fc11.src.rpm:1256140565
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 21 Sep 2009 04:57:59 -0000 1.3
+++ sources 21 Oct 2009 15:56:48 -0000 1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe voms-1.9.14.2.tar.gz
voms-nolib64.patch:
configure.ac | 12 ------------
1 file changed, 12 deletions(-)
Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch 10 Sep 2009 02:31:49 -0000 1.1
+++ voms-nolib64.patch 21 Oct 2009 15:56:48 -0000 1.2
@@ -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
- 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)
voms-portability.patch:
configure.ac | 2 -
project/acinclude.m4 | 8 +++++--
src/api/ccapi/Makefile.am | 42 ++++++++++++++++++++---------------------
src/socklib/Makefile.am | 47 +++++++++++++++++++++++++++-------------------
4 files changed, 56 insertions(+), 43 deletions(-)
Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch 21 Sep 2009 04:57:59 -0000 1.2
+++ voms-portability.patch 21 Oct 2009 15:56:48 -0000 1.3
@@ -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])
voms-shell-syntax.patch:
mysql2oracle.in | 5 ++---
voms-ping | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch 10 Sep 2009 02:31:49 -0000 1.1
+++ voms-shell-syntax.patch 21 Oct 2009 15:56:48 -0000 1.2
@@ -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
Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec 21 Sep 2009 04:57:59 -0000 1.2
+++ voms.spec 21 Oct 2009 15:56:48 -0000 1.3
@@ -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
%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 <mattias.ellert at fysast.uu.se> - 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 <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
- Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
- Previous message (by thread): rpms/selinux-policy/F-12 modules-minimum.conf, 1.40, 1.41 modules-targeted.conf, 1.149, 1.150 policy-F12.patch, 1.114, 1.115 selinux-policy.spec, 1.947, 1.948
- Next message (by thread): rpms/voms/F-11 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch, 1.1, 1.2 voms-portability.patch, 1.2, 1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list