rpms/voms/F-12 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
Mattias Ellert
ellert at fedoraproject.org
Thu Dec 31 14:11:52 UTC 2009
- Previous message (by thread): rpms/voms/devel voms-deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
- Next message (by thread): rpms/voms/F-11 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
- 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-serv1775/F-12
Modified Files:
.cvsignore import.log sources voms-distribution-globus.patch
voms.spec
Added Files:
voms-deps.patch
Log Message:
* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
voms-deps.patch:
client/Makefile.am | 2 +-
server/Makefile.am | 2 +-
utils/Makefile.am | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE voms-deps.patch ---
diff -ur voms-1.9.14.3.orig/src/client/Makefile.am voms-1.9.14.3/src/client/Makefile.am
--- voms-1.9.14.3.orig/src/client/Makefile.am 2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/client/Makefile.am 2009-12-29 00:18:17.405868413 +0100
@@ -12,7 +12,7 @@
voms_proxy_init_LDADD = \
$(top_builddir)/src/api/ccapi/libvomsapi_nog.la \
$(top_builddir)/src/sslutils/libssl_utils_nog.la \
- $(EXPAT_LIBS)
+ $(OPENSSL_LIBS) -lpthread
AM_CPPFLAGS = -I$(top_srcdir)/src/api/ccapi \
-I$(top_srcdir)/src/include \
diff -ur voms-1.9.14.3.orig/src/server/Makefile.am voms-1.9.14.3/src/server/Makefile.am
--- voms-1.9.14.3.orig/src/server/Makefile.am 2009-04-07 11:05:29.000000000 +0200
+++ voms-1.9.14.3/src/server/Makefile.am 2009-12-29 00:19:18.580869075 +0100
@@ -20,7 +20,7 @@
$(top_builddir)/src/replib/librep.la \
$(top_builddir)/src/log/liblog.la \
$(top_builddir)/src/api/ccapi/$(USE_CCAPI_LIB) \
- $(EXPAT_LIBS)
+ $(EXPAT_LIBS) -lpthread
voms_LDFLAGS =
diff -ur voms-1.9.14.3.orig/src/utils/Makefile.am voms-1.9.14.3/src/utils/Makefile.am
--- voms-1.9.14.3.orig/src/utils/Makefile.am 2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.14.3/src/utils/Makefile.am 2009-12-29 00:16:31.097869074 +0100
@@ -12,7 +12,7 @@
$(top_builddir)/src/replib/librep.la \
$(top_builddir)/src/log/liblog.la \
$(top_builddir)/src/sslutils/libssl_utils_nog.la \
- $(EXPAT_LIBS)
+ $(OPENSSL_LIBS) -lpthread
voms_proxy_destroy_SOURCES = \
voms_proxy_destroy.cc
@@ -22,7 +22,7 @@
$(top_builddir)/src/sslutils/libssl_utils_nog.la \
$(top_builddir)/src/replib/librep.la \
$(top_builddir)/src/log/liblog.la \
- $(EXPAT_LIBS)
+ $(OPENSSL_LIBS) -lpthread
voms_proxy_fake_SOURCES = \
vomsfake.h \
@@ -41,7 +41,7 @@
$(top_builddir)/src/ac/libattributes_nog.la \
$(top_builddir)/src/common/libutilc_nog.la \
$(top_builddir)/src/replib/librep.la \
- $(top_builddir)/src/sslutils/libssl_utils_nog.la
+ $(top_builddir)/src/sslutils/libssl_utils_nog.la -lpthread
AM_CPPFLAGS = \
-I$(top_srcdir)/src/api/ccapi \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 21 Oct 2009 15:56:48 -0000 1.4
+++ .cvsignore 31 Dec 2009 14:11:51 -0000 1.5
@@ -1 +1 @@
-voms-1.9.14.2.tar.gz
+voms-1.9.14.3.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 21 Oct 2009 15:56:48 -0000 1.3
+++ import.log 31 Dec 2009 14:11:52 -0000 1.4
@@ -1,3 +1,4 @@
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
+voms-1_9_14_3-1_fc12:F-12:voms-1.9.14.3-1.fc12.src.rpm:1262268646
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 21 Oct 2009 15:56:48 -0000 1.4
+++ sources 31 Dec 2009 14:11:52 -0000 1.5
@@ -1 +1 @@
-b7d5b886e61d73c343a6686d5aa3eafe voms-1.9.14.2.tar.gz
+b80d8fc095632807513dab16ae1fe803 voms-1.9.14.3.tar.gz
voms-distribution-globus.patch:
acinclude.m4 | 46 +++++++++++-----------------------------------
1 file changed, 11 insertions(+), 35 deletions(-)
Index: voms-distribution-globus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-distribution-globus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-distribution-globus.patch 10 Sep 2009 02:31:49 -0000 1.1
+++ voms-distribution-globus.patch 31 Dec 2009 14:11:52 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur voms-1.9.8.1.orig/project/acinclude.m4 voms-1.9.8.1/project/acinclude.m4
---- voms-1.9.8.1.orig/project/acinclude.m4 2009-04-07 11:05:28.000000000 +0200
-+++ voms-1.9.8.1/project/acinclude.m4 2009-06-30 09:04:36.933377506 +0200
+diff -ur voms-1.9.14.3.orig/project/acinclude.m4 voms-1.9.14.3/project/acinclude.m4
+--- voms-1.9.14.3.orig/project/acinclude.m4 2009-11-03 13:30:30.000000000 +0100
++++ voms-1.9.14.3/project/acinclude.m4 2009-12-28 19:29:15.238768642 +0100
@@ -66,11 +66,6 @@
# ---------------------------------------------
AC_DEFUN([AC_OPENSSL],
@@ -13,27 +13,45 @@ diff -ur voms-1.9.8.1.orig/project/acinc
AC_ARG_WITH(openssl_libs,
[ --with-openssl-libs do you want OpenSSL only libs? (yes)],
[ with_openssl_libs="$withval"],
-@@ -80,16 +75,11 @@
+@@ -80,34 +75,9 @@
AC_MSG_ERROR([Value of --with-openssl-libs must be either "yes" or "no"])
fi
- SAVE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-- LD_LIBRARY_PATH="$with_openssl_prefix/lib"
+-
-
- AC_LANG_PUSH(C)
-- AC_CHECK_LIB(crypto, CRYPTO_num_locks, [found=yes], [found=no])
+-
+- save_LIBS=$LIBS
+- LIBS="-L$with_openssl_prefix/lib64 -lcrypto"
+- AC_TRY_LINK([#include <openssl/opensslv.h>],
+- [int version = OPENSSL_VERSION_NUMBER; ],
+- [found64=yes], [found64=no])
+-
+- LIBS="$with_openssl_prefix/lib -lcrypto"
+- AC_TRY_LINK([#include <openssl/opensslv.h>],
+- [int version = OPENSSL_VERSION_NUMBER; ],
+- [found32=yes], [found32=no])
- AC_LANG_POP(C)
+-
+- LIBS=$save_LIBS
+-
+- if test "x$found64" = "xyes" ; then
+- NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+- OPENSSL_LIBS="-L$with_openssl_prefix/lib64 -lcrypto -lssl"
+- found=yes
+- elif test "x$found32" = "xyes" ; then
+- NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
+- OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
+- found=yes
+- fi
+ PKG_CHECK_MODULES(OPENSSL, [openssl], [
+ NO_GLOBUS_FLAGS=$OPENSSL_CFLAGS
+ found=yes], [found=no])
if test "x$found" = "xyes"; then
-- NO_GLOBUS_FLAGS="-I$with_openssl_prefix/include"
-- OPENSSL_LIBS="-L$with_openssl_prefix/lib -lcrypto -lssl"
AC_SUBST(NO_GLOBUS_FLAGS)
- AC_SUBST(OPENSSL_LIBS)
- AC_MSG_CHECKING([for system OpenSSL version])
-@@ -105,11 +95,10 @@
+@@ -125,11 +95,10 @@
#include <openssl/opensslv.h>
OPENSSL_VERSION_TEXT
HERE
@@ -46,7 +64,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
])
# AC_GLOBUS checks globus prefix, looks for globus
-@@ -119,6 +108,11 @@
+@@ -139,6 +108,11 @@
# -------------------------------------------------------
AC_DEFUN([AC_GLOBUS],
[
@@ -58,7 +76,7 @@ diff -ur voms-1.9.8.1.orig/project/acinc
AC_ARG_WITH(globus_prefix,
[ --with-globus-prefix=PFX prefix where GLOBUS is installed. (/opt/globus)],
[with_globus_prefix="$withval"],
-@@ -165,6 +159,8 @@
+@@ -185,6 +159,8 @@
AC_MSG_RESULT([found $GLOBUS_FLAVORS ($with_globus_flavor selected)])
Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- voms.spec 21 Oct 2009 15:56:48 -0000 1.3
+++ voms.spec 31 Dec 2009 14:11:52 -0000 1.4
@@ -1,7 +1,7 @@
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: voms
-Version: 1.9.14.2
+Version: 1.9.14.3
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_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
+# -r glite-security-voms_R_1_9_14_3 \
+# -d voms-1.9.14.3 org.glite.security.voms
+# tar -z -c --exclude CVS -f voms-1.9.14.3.tar.gz voms-1.9.14.3
Source: %{name}-%{version}.tar.gz
# Post-install setup instructions:
Source1: %{name}.INSTALL
@@ -64,6 +64,9 @@ 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
+# Add missing dependencies for stricter binutils
+# https://savannah.cern.ch/bugs/?60979
+Patch16: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: globus-gssapi-gsi-devel%{?_isa}
@@ -221,6 +224,7 @@ Virtual Organization Membership Service
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
# Fix bad permissions (which otherwise end up in the debuginfo package)
find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -460,6 +464,9 @@ fi
%doc %{_javadocdir}/vomsjapi-%{version}
%changelog
+* Mon Dec 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.14.3-1
+- Upstream 1.9.14.3 (CVS tag glite-security-voms_R_1_9_14_3)
+
* 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)
- Previous message (by thread): rpms/voms/devel voms-deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
- Next message (by thread): rpms/voms/F-11 voms-deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5 voms-distribution-globus.patch, 1.1, 1.2 voms.spec, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list