diff --git a/.gitignore b/.gitignore index 6051acf..010f027 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/voms-1.9.18.1.tar.gz +/voms-1.9.19.2.tar.gz diff --git a/sources b/sources index 3af6b71..7a2d374 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23fcb6dfabeac20bed5b750b88795eb0 voms-1.9.18.1.tar.gz +047f397219c766df39886c8d32cfba5b voms-1.9.19.2.tar.gz diff --git a/voms-portability.patch b/voms-portability.patch index e518f8a..8899063 100644 --- a/voms-portability.patch +++ b/voms-portability.patch @@ -1,22 +1,10 @@ -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 -@@ -0,5 +0,5 @@ - AC_INIT([GLite Security VOMS], [1.9.18]) --AC_PREREQ(2.59) -+AC_PREREQ(2.57) - AC_CONFIG_AUX_DIR([./project]) - AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src/utils/voms_proxy_destroy.cc]) -diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4 ---- voms-1.9.11.orig/project/acinclude.m4 2009-07-16 15:10:39.000000000 +0200 -+++ voms-1.9.11/project/acinclude.m4 2009-09-08 14:13:33.246338019 +0200 -@@ -904,12 +904,16 @@ - +diff -ur voms-1.9.19.2.orig/project/acinclude.m4 voms-1.9.19.2/project/acinclude.m4 +--- voms-1.9.19.2.orig/project/acinclude.m4 2010-09-13 17:21:35.000000000 +0200 ++++ voms-1.9.19.2/project/acinclude.m4 2010-11-02 20:07:56.716554039 +0100 +@@ -925,11 +925,15 @@ AC_DEFUN([PUT_PRIVATES], [ -- AH_BOTTOM([#ifdef __GNUC__ -+ AH_BOTTOM([#if defined(__GNUC__) + AH_BOTTOM([#ifdef __GNUC__ +#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) #define UNUSED(z) z __attribute__ ((unused)) +#else @@ -30,399 +18,24 @@ diff -ur voms-1.9.11.orig/project/acinclude.m4 voms-1.9.11/project/acinclude.m4 #define PRIVATE #define PUBLIC #endif])]) -diff -ur voms-1.9.11.orig/src/api/ccapi/Makefile.am voms-1.9.11/src/api/ccapi/Makefile.am ---- voms-1.9.11.orig/src/api/ccapi/Makefile.am 2009-07-16 15:10:40.000000000 +0200 -+++ voms-1.9.11/src/api/ccapi/Makefile.am 2009-09-08 14:13:33.247337541 +0200 -@@ -16,7 +16,7 @@ - libvomsapi_nog_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_nog_la_CPPFLAGS = \ -+libvomsapi_nog_la_CXXFLAGS = \ - $(NO_GLOBUS_FLAGS) \ - -DNOGLOBUS \ - $(API_INCLUDES) -@@ -41,7 +41,7 @@ - libvomsapi_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_la_CPPFLAGS = \ -+libvomsapi_la_CXXFLAGS = \ - $(NO_GLOBUS_FLAGS) \ - -DNOGLOBUS \ - $(API_INCLUDES) -@@ -70,7 +70,7 @@ - libvomsc_la_SOURCES = \ - $(CSOURCES) - --libvomsc_la_CPPFLAGS = \ -+libvomsc_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_CFLAGS) -@@ -94,10 +94,10 @@ - #noinst_PROGRAMS = test ctest - #test_SOURCES = test.cc - #test_LDADD = libvomsapi.la --#test_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS) -+#test_CXXFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS) - #ctest_SOURCES = ctest.c - #ctest_LDADD = libvomsc.la --#ctest_CPPFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS) -+#ctest_CFLAGS = -I$(top_srcdir)/src/include $(GLOBUS_CFLAGS) - - EXTRA_LTLIBRARIES = \ - libvomsapi_gcc32.la \ -@@ -123,7 +123,7 @@ - libvomsapi_gcc32_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc32_la_CPPFLAGS = \ -+libvomsapi_gcc32_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32_CFLAGS) -@@ -139,7 +139,7 @@ - libvomsapi_gcc32dbg_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc32dbg_la_CPPFLAGS = \ -+libvomsapi_gcc32dbg_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(GLOBUS_GCC32DBG_CFLAGS) \ - $(API_INCLUDES) -@@ -155,7 +155,7 @@ - libvomsapi_gcc32pthr_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc32pthr_la_CPPFLAGS = \ -+libvomsapi_gcc32pthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32PTHR_CFLAGS) -@@ -171,7 +171,7 @@ - libvomsapi_gcc32dbgpthr_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc32dbgpthr_la_CPPFLAGS = \ -+libvomsapi_gcc32dbgpthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32DBGPTHR_CFLAGS) -@@ -187,7 +187,7 @@ - libvomsc_gcc32_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc32_la_CPPFLAGS = \ -+libvomsc_gcc32_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32_CFLAGS) -@@ -203,7 +203,7 @@ - libvomsc_gcc32dbg_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc32dbg_la_CPPFLAGS = \ -+libvomsc_gcc32dbg_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32DBG_CFLAGS) -@@ -219,7 +219,7 @@ - libvomsc_gcc32pthr_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc32pthr_la_CPPFLAGS = \ -+libvomsc_gcc32pthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32PTHR_CFLAGS) -@@ -235,7 +235,7 @@ - libvomsc_gcc32dbgpthr_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc32dbgpthr_la_CPPFLAGS = \ -+libvomsc_gcc32dbgpthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC32DBGPTHR_CFLAGS) -@@ -254,7 +254,7 @@ - libvomsapi_gcc64_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc64_la_CPPFLAGS = \ -+libvomsapi_gcc64_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64_CFLAGS) -@@ -270,7 +270,7 @@ - libvomsapi_gcc64dbg_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc64dbg_la_CPPFLAGS = \ -+libvomsapi_gcc64dbg_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64DBG_CFLAGS) -@@ -286,7 +286,7 @@ - libvomsapi_gcc64pthr_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc64pthr_la_CPPFLAGS = \ -+libvomsapi_gcc64pthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64PTHR_CFLAGS) -@@ -302,7 +302,7 @@ - libvomsapi_gcc64dbgpthr_la_SOURCES = \ - $(CCSOURCES) - --libvomsapi_gcc64dbgpthr_la_CPPFLAGS = \ -+libvomsapi_gcc64dbgpthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64DBGPTHR_CFLAGS) -@@ -318,7 +318,7 @@ - libvomsc_gcc64_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc64_la_CPPFLAGS = \ -+libvomsc_gcc64_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64_CFLAGS) -@@ -334,7 +334,7 @@ - libvomsc_gcc64dbg_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc64dbg_la_CPPFLAGS = \ -+libvomsc_gcc64dbg_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64DBG_CFLAGS) -@@ -350,7 +350,7 @@ - libvomsc_gcc64pthr_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc64pthr_la_CPPFLAGS = \ -+libvomsc_gcc64pthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64PTHR_CFLAGS) -@@ -367,7 +367,7 @@ - libvomsc_gcc64dbgpthr_la_SOURCES = \ - $(CSOURCES) - --libvomsc_gcc64dbgpthr_la_CPPFLAGS = \ -+libvomsc_gcc64dbgpthr_la_CXXFLAGS = \ - -I$(top_srcdir)/src/include \ - $(API_INCLUDES) \ - $(GLOBUS_GCC64DBGPTHR_CFLAGS) -diff -ur voms-1.9.11.orig/src/socklib/Makefile.am voms-1.9.11/src/socklib/Makefile.am ---- voms-1.9.11.orig/src/socklib/Makefile.am 2009-07-16 15:10:41.000000000 +0200 -+++ voms-1.9.11/src/socklib/Makefile.am 2009-09-08 14:16:29.063338874 +0200 -@@ -12,7 +12,7 @@ - libsock_server_la_SOURCES = Server.cpp tokens.c globuswrap.c - libsock_nog_la_SOURCES = Client.cpp - --libsock_nog_la_CPPFLAGS = \ -+libsock_nog_la_CXXFLAGS = \ - $(NO_GLOBUS_FLAGS) \ +diff -ur voms-1.9.19.2.orig/src/socklib/Makefile.am voms-1.9.19.2/src/socklib/Makefile.am +--- voms-1.9.19.2.orig/src/socklib/Makefile.am 2009-07-16 15:10:41.000000000 +0200 ++++ voms-1.9.19.2/src/socklib/Makefile.am 2010-11-02 20:07:31.341803717 +0100 +@@ -107,7 +107,7 @@ + libsock_server_gcc32dbgpthr_la_CPPFLAGS = \ -I $(top_srcdir)/src/include \ -I $(top_srcdir)/src/sslutils \ -@@ -21,17 +21,18 @@ - libsock_nog_la_LIBADD = \ - -lcrypto -lssl - --libsock_server_la_CPPFLAGS = \ -+libsock_server_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_CFLAGS) -+libsock_server_la_CFLAGS = $(libsock_server_la_CXXFLAGS) - - libsock_server_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils.la \ - $(top_builddir)/src/common/libutilc.la \ - $(GLOBUS_GSS_LIBS) - --libsock_la_CPPFLAGS = \ -+libsock_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_CFLAGS) -@@ -68,10 +69,11 @@ - - libsock_server_gcc32_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc32_la_CPPFLAGS = \ -+libsock_server_gcc32_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32_CFLAGS) -+libsock_server_gcc32_la_CFLAGS = $(libsock_server_gcc32_la_CXXFLAGS) - - libsock_server_gcc32_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc32.la \ -@@ -80,10 +82,11 @@ - - libsock_server_gcc32dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc32dbg_la_CPPFLAGS = \ -+libsock_server_gcc32dbg_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32DBG_CFLAGS) -+libsock_server_gcc32dbg_la_CFLAGS = $(libsock_server_gcc32dbg_la_CXXFLAGS) - - libsock_server_gcc32dbg_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc32dbg.la \ -@@ -92,10 +95,11 @@ - - libsock_server_gcc32pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc32pthr_la_CPPFLAGS = \ -+libsock_server_gcc32pthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32PTHR_CFLAGS) -+libsock_server_gcc32pthr_la_CFLAGS = $(libsock_server_gcc32pthr_la_CXXFLAGS) - - libsock_server_gcc32pthr_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc32pthr.la \ -@@ -104,10 +108,11 @@ - - libsock_server_gcc32dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc32dbgpthr_la_CPPFLAGS = \ -+libsock_server_gcc32dbgpthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32DBG_CFLAGS) -+libsock_server_gcc32dbgpthr_la_CFLAGS = $(libsock_server_gcc32dbgpthr_la_CXXFLAGS) +- $(GLOBUS_GCC32DBG_CFLAGS) ++ $(GLOBUS_GCC32DBGPTHR_CFLAGS) libsock_server_gcc32dbgpthr_la_LIBADD = \ $(top_builddir)/src/sslutils/libssl_utils_gcc32dbgpthr.la \ -@@ -116,10 +121,11 @@ - - libsock_server_gcc64_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc64_la_CPPFLAGS = \ -+libsock_server_gcc64_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64_CFLAGS) -+libsock_server_gcc64_la_CFLAGS = $(libsock_server_gcc64_la_CXXFLAGS) - - libsock_server_gcc64_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc64.la \ -@@ -128,10 +134,11 @@ - - libsock_server_gcc64dbg_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc64dbg_la_CPPFLAGS = \ -+libsock_server_gcc64dbg_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64DBG_CFLAGS) -+libsock_server_gcc64dbg_la_CFLAGS = $(libsock_server_gcc64dbg_la_CXXFLAGS) - - libsock_server_gcc64dbg_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc64dbg.la \ -@@ -140,10 +147,11 @@ - - libsock_server_gcc64pthr_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc64pthr_la_CPPFLAGS = \ -+libsock_server_gcc64pthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64PTHR_CFLAGS) -+libsock_server_gcc64pthr_la_CFLAGS = $(libsock_server_gcc64pthr_la_CXXFLAGS) - - libsock_server_gcc64pthr_la_LIBADD = \ - $(top_builddir)/src/sslutils/libssl_utils_gcc64pthr.la \ -@@ -152,10 +160,11 @@ - - libsock_server_gcc64dbgpthr_la_SOURCES = Server.cpp tokens.c globuswrap.c - --libsock_server_gcc64dbgpthr_la_CPPFLAGS = \ -+libsock_server_gcc64dbgpthr_la_CXXFLAGS = \ +@@ -155,7 +155,7 @@ + libsock_server_gcc64dbgpthr_la_CPPFLAGS = \ -I $(top_srcdir)/src/include \ -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64DBG_CFLAGS) -+libsock_server_gcc64dbgpthr_la_CFLAGS = $(libsock_server_gcc64dbgpthr_la_CXXFLAGS) +- $(GLOBUS_GCC64DBG_CFLAGS) ++ $(GLOBUS_GCC64DBGPTHR_CFLAGS) libsock_server_gcc64dbgpthr_la_LIBADD = \ $(top_builddir)/src/sslutils/libssl_utils_gcc64dbgpthr.la \ -@@ -188,7 +197,7 @@ - libsock_gcc32_la_SOURCES = \ - $(SOURCES) - --libsock_gcc32_la_CPPFLAGS = \ -+libsock_gcc32_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32_CFLAGS) -@@ -201,7 +210,7 @@ - libsock_gcc32dbg_la_SOURCES = \ - $(SOURCES) - --libsock_gcc32dbg_la_CPPFLAGS = \ -+libsock_gcc32dbg_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32DBG_CFLAGS) -@@ -214,7 +223,7 @@ - libsock_gcc32pthr_la_SOURCES = \ - $(SOURCES) - --libsock_gcc32pthr_la_CPPFLAGS = \ -+libsock_gcc32pthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32PTHR_CFLAGS) -@@ -227,7 +236,7 @@ - libsock_gcc32dbgpthr_la_SOURCES = \ - $(SOURCES) - --libsock_gcc32dbgpthr_la_CPPFLAGS = \ -+libsock_gcc32dbgpthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC32DBG_CFLAGS) -@@ -240,7 +249,7 @@ - libsock_gcc64_la_SOURCES = \ - $(SOURCES) - --libsock_gcc64_la_CPPFLAGS = \ -+libsock_gcc64_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64_CFLAGS) -@@ -253,7 +262,7 @@ - libsock_gcc64dbg_la_SOURCES = \ - $(SOURCES) - --libsock_gcc64dbg_la_CPPFLAGS = \ -+libsock_gcc64dbg_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64DBG_CFLAGS) -@@ -266,7 +275,7 @@ - libsock_gcc64pthr_la_SOURCES = \ - $(SOURCES) - --libsock_gcc64pthr_la_CPPFLAGS = \ -+libsock_gcc64pthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64PTHR_CFLAGS) -@@ -279,7 +288,7 @@ - libsock_gcc64dbgpthr_la_SOURCES = \ - $(SOURCES) - --libsock_gcc64dbgpthr_la_CPPFLAGS = \ -+libsock_gcc64dbgpthr_la_CXXFLAGS = \ - -I $(top_srcdir)/src/include \ - -I $(top_srcdir)/src/sslutils \ - $(GLOBUS_GCC64DBG_CFLAGS) diff --git a/voms.spec b/voms.spec index 0f7a7b7..020cd35 100644 --- a/voms.spec +++ b/voms.spec @@ -15,8 +15,8 @@ %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} Name: voms -Version: 1.9.18.1 -Release: 3%{?dist} +Version: 1.9.19.2 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Group: System Environment/Libraries @@ -24,9 +24,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_18_1 \ -# -d voms-1.9.18.1 org.glite.security.voms -# tar -z -c --exclude CVS -f voms-1.9.18.1.tar.gz voms-1.9.18.1 +# -r glite-security-voms_R_1_9_19_2 \ +# -d voms-1.9.19.2 org.glite.security.voms +# tar -z -c --exclude CVS -f voms-1.9.19.2.tar.gz voms-1.9.19.2 Source: %{name}-%{version}.tar.gz # Post-install setup instructions: Source1: %{name}.INSTALL @@ -510,7 +510,10 @@ fi %endif %changelog -* Sun Oct 17 2010 Mattias Ellert - 1.9.18.1-3 +* Mon Nov 01 2010 Mattias Ellert - 1.9.19.2-1 +- Upstream 1.9.19.2 (CVS tag glite-security-voms_R_1_9_19_2) + +* Sun Oct 17 2010 Mattias Ellert - 1.9.18.1-3 - Add posttrans scriptlet to recover /etc/vomses * Fri Oct 15 2010 Mattias Ellert - 1.9.18.1-2