rpms/voms-mysql-plugin/F-10 import.log, NONE, 1.1 voms-mysql-plugin-crypto.patch, NONE, 1.1 voms-mysql-plugin-module.patch, NONE, 1.1 voms-mysql-plugin-mysqllib.patch, NONE, 1.1 voms-mysql-plugin-underquote.patch, NONE, 1.1 voms-mysql-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/voms-mysql-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24581/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log voms-mysql-plugin-crypto.patch 
	voms-mysql-plugin-module.patch 
	voms-mysql-plugin-mysqllib.patch 
	voms-mysql-plugin-underquote.patch voms-mysql-plugin.spec 
Log Message:
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.



--- NEW FILE import.log ---
voms-mysql-plugin-3_1_1-1_fc11:F-10:voms-mysql-plugin-3.1.1-1.fc11.src.rpm:1252551105

voms-mysql-plugin-crypto.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-crypto.patch ---
diff -ur voms-mysql-plugin-3.1.1.orig/src/Makefile.am voms-mysql-plugin-3.1.1/src/Makefile.am
--- voms-mysql-plugin-3.1.1.orig/src/Makefile.am	2009-08-16 06:31:47.000000000 +0200
+++ voms-mysql-plugin-3.1.1/src/Makefile.am	2009-08-16 06:32:38.000000000 +0200
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
-libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LIBADD = $(MYSQL_LIBS) -lcrypto
 libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)

voms-mysql-plugin-module.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE voms-mysql-plugin-module.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/src/Makefile.am voms-mysql-plugin-3.1.0/src/Makefile.am
--- voms-mysql-plugin-3.1.0.orig/src/Makefile.am	2007-11-20 19:07:57.000000000 +0100
+++ voms-mysql-plugin-3.1.0/src/Makefile.am	2009-06-30 12:49:42.316374480 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libvomsmysql.la
 libvomsmysql_la_SOURCES = mysqlwrap.cc mysqlwrap.h dbwrap.h
 libvomsmysql_la_LIBADD = $(MYSQL_LIBS)
+libvomsmysql_la_LDFLAGS = -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = $(MYSQL_CFLAGS)
 

voms-mysql-plugin-mysqllib.patch:
 mysql.m4 |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

--- NEW FILE voms-mysql-plugin-mysqllib.patch ---
diff -ur voms-mysql-plugin-3.1.0.orig/project/mysql.m4 voms-mysql-plugin-3.1.0/project/mysql.m4
--- voms-mysql-plugin-3.1.0.orig/project/mysql.m4	2007-11-20 16:15:32.000000000 +0100
+++ voms-mysql-plugin-3.1.0/project/mysql.m4	2009-07-01 07:08:58.782378737 +0200
@@ -37,10 +37,10 @@
     result=no
     ac_cv_mysql_valid=no
 
-    AC_PATH_PROG(PMYSQL,mysql,no,$MYSQL_BIN_PATH)
+    AC_PATH_PROG(PMYSQL,mysql_config,no,$MYSQL_BIN_PATH)
 
     if test "$PMYSQL" != "no" ; then
-        MYSQL_VERSION=`$PMYSQL --version | cut -d' ' -f6 | tr -cd '0-9.'`
+        MYSQL_VERSION=`$PMYSQL --version | tr -cd '0-9.'`
 
         mysql_version_between(3.0.0,$MYSQL_VERSION,3.999.999,
             mysql_greater_than_3=no,mysql_greater_than_3=yes)
@@ -53,20 +53,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
 
-    if test -n "$with_mysql_prefix" -a "$with_mysql_prefix" != "/usr" -a "x$result" = "xyes" ; then
-		MYSQL_CFLAGS="-I$with_mysql_prefix/include -I$with_mysql_prefix/include/mysql"
-		MYSQL_LIBS="-L$with_mysql_prefix/lib -L$with_mysql_prefix/lib/mysql"
-    else
-        MYSQL_CFLAGS=""
-	MYSQL_LIBS=""
-    fi
-
     if test "x$result" = "xyes" ; then
       if test "x$mysql_greater_than_3" = "xyes" ; then
-        MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient -lz"
+        MYSQL_CFLAGS=`$PMYSQL --include`
       else
-	MYSQL_LIBS="$MYSQL_LIBS -lmysqlclient"
+        MYSQL_CFLAGS=`$PMYSQL --cflags`
       fi
+      MYSQL_LIBS=`$PMYSQL --libs`
         
       CFLAGS="$MYSQL_CFLAGS $CFLAGS"
       LIBS="$MYSQL_LIBS $LIBS"
@@ -94,8 +87,8 @@
         MYSQL_INSTALL_PATH=$with_mysql_prefix
 	ifelse([$3], , :, [$3])
     else
-	MYSQL_CFLAGS="-I/usr/include/mysql"
-	MYSQL_LIBS="-l/usr/lib/mysql"
+	MYSQL_CFLAGS=
+	MYSQL_LIBS=
 	ifelse([$4], , :, [$4])
     fi
 

voms-mysql-plugin-underquote.patch:
 glite.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE voms-mysql-plugin-underquote.patch ---
--- voms-mysql-plugin-3.1.0.orig/project/glite.m4	2005-09-26 09:36:56.000000000 +0200
+++ voms-mysql-plugin-3.1.0/project/glite.m4	2009-07-01 07:19:47.816378148 +0200
@@ -4,7 +4,7 @@
 dnl - GLITE_CFLAGS
 dnl - DISTTAR
 
-AC_DEFUN(AC_GLITE,
+AC_DEFUN([AC_GLITE],
 [
     AC_ARG_WITH(glite_location,
         [  --with-glite-location=PFX     prefix where GLITE is installed. (/opt/glite)],


--- NEW FILE voms-mysql-plugin.spec ---
Name:		voms-mysql-plugin
Version:	3.1.1
Release:	1%{?dist}
Summary:	VOMS server plugin for MySQL

Group:		System Environment/Libraries
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-mysql_R_3_1_1 \
#		  -d voms-mysql-plugin-3.1.1 org.glite.security.voms-mysql
#		tar -z -c --exclude CVS -f voms-mysql-plugin-3.1.1.tar.gz \
#		  voms-mysql-plugin-3.1.1
Source:		%{name}-%{version}.tar.gz
#		Make the mysql library detection portable
#		https://savannah.cern.ch/bugs/?54438
Patch0:		%{name}-mysqllib.patch
#		Add proper LDFLAGS
#		https://savannah.cern.ch/bugs/?54439
Patch1:		%{name}-module.patch
#		Fix underquoted macro
#		https://savannah.cern.ch/bugs/?54440
Patch2:		%{name}-underquote.patch
#		Add missing library to avoid undefined symbols
#		https://savannah.cern.ch/bugs/?54441
Patch3:		%{name}-crypto.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	voms-server%{?_isa}
BuildRequires:	libtool
BuildRequires:	mysql-devel%{?_isa}
BuildRequires:	openssl%{?_isa}

%description
In grid computing, and whenever the access to resources may be controlled
by parties external to the resource provider, users may be grouped to
Virtual Organizations (VOs). This package provides a VO Membership Service
(VOMS), which informs on that association between users and their VOs:
groups, roles and capabilities.

This package offers the MySQL implementation for the VOMS server.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# Fix directory hardwiring
for f in `find . -name Makefile.am`; do
    sed	-e 's!\(^sysconfdir *= *\)\$(prefix)/etc!\1 at sysconfdir@!' -i $f
done

./bootstrap

%build
%configure --libdir=%{_libdir}/voms --sysconfdir=%{_datadir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.a
rm $RPM_BUILD_ROOT%{_libdir}/voms/libvomsmysql.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/voms/voms-mysql.data
%{_datadir}/voms/voms-mysql-compat.data
%dir %{_libdir}/voms
%{_libdir}/voms/libvomsmysql.so

%changelog
* Sat Aug 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.1-1
- Update to version 3.1.1.

* Tue Jun 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1.0-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Sep 2009 16:09:53 -0000	1.1
+++ .cvsignore	10 Sep 2009 02:52:09 -0000	1.2
@@ -0,0 +1 @@
+voms-mysql-plugin-3.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms-mysql-plugin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Sep 2009 16:09:53 -0000	1.1
+++ sources	10 Sep 2009 02:52:09 -0000	1.2
@@ -0,0 +1 @@
+b8cfcc652e64e2ec3702155c754cdd6e  voms-mysql-plugin-3.1.1.tar.gz