[lcgdm/el4] Update to version 1.8.2
Mattias Ellert
ellert at fedoraproject.org
Thu Dec 8 16:29:13 UTC 2011
commit 95206e9f6ce131e75dedd757ee189f4c16d66c9a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Dec 8 17:26:02 2011 +0100
Update to version 1.8.2
lcgdm-dlopen.patch | 26 ++++----
lcgdm-paths.patch | 32 +++++-----
lcgdm-shliblink.patch | 124 ++++++++++++++++++-----------------
lcgdm.spec | 175 +++++++++++++++++++++++++++++++++++++++++++++----
sources | 2 +-
5 files changed, 256 insertions(+), 103 deletions(-)
---
diff --git a/lcgdm-dlopen.patch b/lcgdm-dlopen.patch
index e8dd21c..b142612 100644
--- a/lcgdm-dlopen.patch
+++ b/lcgdm-dlopen.patch
@@ -1,6 +1,6 @@
-diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
---- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.516887874 +0200
-+++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-02 11:17:40.409077859 +0200
+diff -ur lcgdm-1.8.2.orig/config/Imake.rules lcgdm-1.8.2/config/Imake.rules
+--- lcgdm-1.8.2.orig/config/Imake.rules 2011-12-06 15:29:45.424784129 +0100
++++ lcgdm-1.8.2/config/Imake.rules 2011-12-06 15:30:52.691786014 +0100
@@ -165,6 +165,13 @@
ln -s SharedLibraryTargetName(libname).rev $@.`echo rev|cut -f1 -d.`
#endif
@@ -15,18 +15,18 @@ diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
#ifndef MakeDir
#define MakeDir(dirname,owner,group,mode) @@\
dirname: @@\
-diff -ur lcgdm-1.8.1.2.orig/security/Csec_api_loader.c lcgdm-1.8.1.2/security/Csec_api_loader.c
---- lcgdm-1.8.1.2.orig/security/Csec_api_loader.c 2011-05-31 12:22:47.560887292 +0200
-+++ lcgdm-1.8.1.2/security/Csec_api_loader.c 2011-09-02 11:37:45.353365158 +0200
-@@ -224,6 +224,7 @@
+diff -ur lcgdm-1.8.2.orig/security/Csec_api_loader.c lcgdm-1.8.2/security/Csec_api_loader.c
+--- lcgdm-1.8.2.orig/security/Csec_api_loader.c 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/security/Csec_api_loader.c 2011-12-06 15:30:52.693786002 +0100
+@@ -222,6 +222,7 @@
void *Csec_get_shlib(Csec_context_t *ctx) {
char filename[CA_MAXNAMELEN];
char filename_thread[CA_MAXNAMELEN];
+ char fullpath[CA_MAXNAMELEN];
char suffix[CA_MAXNAMELEN];
char symname[256];
- char symname_pthr[256];
-@@ -305,6 +306,12 @@
+ void *handle;
+@@ -302,6 +303,12 @@
filename_thread,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename_thread, RTLD_NOW);
@@ -39,7 +39,7 @@ diff -ur lcgdm-1.8.1.2.orig/security/Csec_api_loader.c lcgdm-1.8.1.2/security/Cs
}
if (handle == NULL) {
-@@ -313,6 +320,12 @@
+@@ -310,6 +317,12 @@
filename,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename, RTLD_NOW);
@@ -52,9 +52,9 @@ diff -ur lcgdm-1.8.1.2.orig/security/Csec_api_loader.c lcgdm-1.8.1.2/security/Cs
}
if (handle == NULL) {
-diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
---- lcgdm-1.8.1.2.orig/security/Imakefile 2011-05-31 12:22:47.556887347 +0200
-+++ lcgdm-1.8.1.2/security/Imakefile 2011-09-02 11:48:42.616788053 +0200
+diff -ur lcgdm-1.8.2.orig/security/Imakefile lcgdm-1.8.2/security/Imakefile
+--- lcgdm-1.8.2.orig/security/Imakefile 2011-12-06 15:29:45.458784131 +0100
++++ lcgdm-1.8.2/security/Imakefile 2011-12-06 15:30:52.746786015 +0100
@@ -13,7 +13,8 @@
include FileName(..,VERSION)
diff --git a/lcgdm-paths.patch b/lcgdm-paths.patch
index 28c7938..0f60601 100644
--- a/lcgdm-paths.patch
+++ b/lcgdm-paths.patch
@@ -1,7 +1,7 @@
-diff -ur lcgdm-1.8.1.2.orig/config/site.def lcgdm-1.8.1.2/config/site.def
---- lcgdm-1.8.1.2.orig/config/site.def 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/config/site.def 2011-09-03 11:06:17.993504727 +0200
-@@ -81,7 +81,7 @@
+diff -ur lcgdm-1.8.2.orig/config/site.def lcgdm-1.8.2/config/site.def
+--- lcgdm-1.8.2.orig/config/site.def 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/config/site.def 2011-12-06 15:25:44.791777417 +0100
+@@ -82,7 +82,7 @@
#if defined(_WIN32)
#define InstallPythonDir \\cern.ch\dfs\Applications\CERN\LFC\lib\python
#else
@@ -10,9 +10,9 @@ diff -ur lcgdm-1.8.1.2.orig/config/site.def lcgdm-1.8.1.2/config/site.def
#endif
#define LibManDir $(prefix)/share/man/man3
#define LibManSuffix 3
-diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
---- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-05-31 12:22:45.000000000 +0200
-+++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 11:06:17.995504701 +0200
+diff -ur lcgdm-1.8.2.orig/dpm/Imakefile lcgdm-1.8.2/dpm/Imakefile
+--- lcgdm-1.8.2.orig/dpm/Imakefile 2011-12-06 15:23:16.705773287 +0100
++++ lcgdm-1.8.2/dpm/Imakefile 2011-12-06 15:25:44.792777417 +0100
@@ -8,11 +8,10 @@
#if BuildInterfaces
@@ -29,7 +29,7 @@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
SWIG_LOCATION = SwigLocation
SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
#endif
-@@ -246,14 +245,14 @@
+@@ -249,14 +248,14 @@
_dpm2.so \
dpm2.py
IDPM_IFCE = $(PERLDIR) \
@@ -49,7 +49,7 @@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
#endif
DPMLIB_OBJS = dpm_abortfiles.Osuf \
-@@ -424,28 +423,28 @@
+@@ -430,28 +429,28 @@
RemoveFiles(dpm_perlwrap.o dpm_perlwrap.c)
$(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS -o dpm_perlwrap.c dpm.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_perlwrap.c
@@ -85,7 +85,7 @@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
InstallProgram(dpm-listspaces,$(BIN),root,bin,755)
MakeDir($(BIN),root,bin,0755)
-@@ -458,7 +457,7 @@
+@@ -464,7 +463,7 @@
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
@@ -94,9 +94,9 @@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESSERVER) $(MANPAGESIFCE)
-diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
---- lcgdm-1.8.1.2.orig/ns/Imakefile.lfc 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/ns/Imakefile.lfc 2011-09-03 11:06:17.996504688 +0200
+diff -ur lcgdm-1.8.2.orig/ns/Imakefile.lfc lcgdm-1.8.2/ns/Imakefile.lfc
+--- lcgdm-1.8.2.orig/ns/Imakefile.lfc 2011-12-06 15:23:16.644773285 +0100
++++ lcgdm-1.8.2/ns/Imakefile.lfc 2011-12-06 15:25:44.845777421 +0100
@@ -22,11 +22,10 @@
#if BuildInterfaces
@@ -113,7 +113,7 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
SWIG_LOCATION = SwigLocation
SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
#endif
-@@ -247,17 +246,17 @@
+@@ -248,17 +247,17 @@
_lfc2thr.so\
lfc2thr.py
ILFC_IFCE = $(PERLDIR) \
@@ -140,7 +140,7 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
#endif
NSDAEMON_OBJS = Cns_main.Osuf \
-@@ -484,53 +483,53 @@
+@@ -485,53 +484,53 @@
RemoveFiles(lfc_perlwrap.o lfc_perlwrap.c)
$(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC -o lfc_perlwrap.c lfc.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_perlwrap.c
@@ -207,4 +207,4 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
+MakeDir($(PYTHONDIR),root,root,0755)
#endif
- install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESLIBRARY) $(MANPAGESSERVER) $(MANPAGESIFCE)
+ install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESLIBRARY) $(MANPAGESSERVER) $(MANPAGESIFCE) $(MANPAGESARGUS)
diff --git a/lcgdm-shliblink.patch b/lcgdm-shliblink.patch
index 7d1288b..759bc29 100644
--- a/lcgdm-shliblink.patch
+++ b/lcgdm-shliblink.patch
@@ -1,6 +1,6 @@
-diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
---- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-03 23:03:33.188011657 +0200
+diff -ur lcgdm-1.8.2.orig/config/Imake.rules lcgdm-1.8.2/config/Imake.rules
+--- lcgdm-1.8.2.orig/config/Imake.rules 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/config/Imake.rules 2011-12-06 15:07:24.684746736 +0100
@@ -95,7 +95,7 @@
#ifndef NormalProgramTarget
#define NormalProgramTarget(program,objects,deplibs,libs) \
@@ -10,9 +10,9 @@ diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
#endif
#ifndef MakeSubdirs
-diff -ur lcgdm-1.8.1.2.orig/config/Imake.tmpl lcgdm-1.8.1.2/config/Imake.tmpl
---- lcgdm-1.8.1.2.orig/config/Imake.tmpl 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/config/Imake.tmpl 2011-09-03 23:04:51.455986760 +0200
+diff -ur lcgdm-1.8.2.orig/config/Imake.tmpl lcgdm-1.8.2/config/Imake.tmpl
+--- lcgdm-1.8.2.orig/config/Imake.tmpl 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/config/Imake.tmpl 2011-12-06 15:07:24.685746742 +0100
@@ -59,7 +59,7 @@
CP = cp
#if !defined(SOLARIS)
@@ -22,9 +22,9 @@ diff -ur lcgdm-1.8.1.2.orig/config/Imake.tmpl lcgdm-1.8.1.2/config/Imake.tmpl
#else
IDCMD = /usr/xpg4/bin/id
#endif
-diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefile
---- lcgdm-1.8.1.2.orig/dicomcopy/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/dicomcopy/Imakefile 2011-09-03 23:03:33.188011657 +0200
+diff -ur lcgdm-1.8.2.orig/dicomcopy/Imakefile lcgdm-1.8.2/dicomcopy/Imakefile
+--- lcgdm-1.8.2.orig/dicomcopy/Imakefile 2011-12-06 14:35:17.000000000 +0100
++++ lcgdm-1.8.2/dicomcopy/Imakefile 2011-12-06 15:07:24.835746758 +0100
@@ -31,7 +31,7 @@
#if SOLARIS
LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl -ldl
@@ -61,9 +61,9 @@ diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefil
install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL)
-diff -ur lcgdm-1.8.1.2.orig/dli/Imakefile lcgdm-1.8.1.2/dli/Imakefile
---- lcgdm-1.8.1.2.orig/dli/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/dli/Imakefile 2011-09-03 23:03:33.189011644 +0200
+diff -ur lcgdm-1.8.2.orig/dli/Imakefile lcgdm-1.8.2/dli/Imakefile
+--- lcgdm-1.8.2.orig/dli/Imakefile 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/dli/Imakefile 2011-12-06 15:07:24.835746758 +0100
@@ -13,9 +13,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -85,9 +85,9 @@ diff -ur lcgdm-1.8.1.2.orig/dli/Imakefile lcgdm-1.8.1.2/dli/Imakefile
rc.lfc-dli: lfc-dli.scripts
sed -e 's#DPMCONFIGFILE=.*#DPMCONFIGFILE=$(DPMCONFIG)#' \
-e 's#PREFIX=.*#PREFIX=$(prefix)#' $? > $@
-diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
---- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-05-31 12:22:45.000000000 +0200
-+++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 23:03:33.190011631 +0200
+diff -ur lcgdm-1.8.2.orig/dpm/Imakefile lcgdm-1.8.2/dpm/Imakefile
+--- lcgdm-1.8.2.orig/dpm/Imakefile 2011-12-06 14:35:16.000000000 +0100
++++ lcgdm-1.8.2/dpm/Imakefile 2011-12-06 15:07:24.836746753 +0100
@@ -45,12 +45,12 @@
#endif
INCLUDES = FileName(..,h)
@@ -121,9 +121,9 @@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile
---- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-05-31 12:22:46.000000000 +0200
-+++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-03 23:03:33.190011631 +0200
+diff -ur lcgdm-1.8.2.orig/dpmcopy/Imakefile lcgdm-1.8.2/dpmcopy/Imakefile
+--- lcgdm-1.8.2.orig/dpmcopy/Imakefile 2011-12-06 14:35:16.000000000 +0100
++++ lcgdm-1.8.2/dpmcopy/Imakefile 2011-12-06 15:07:24.837746750 +0100
@@ -27,7 +27,7 @@
#if EMIBuild
GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include
@@ -172,9 +172,9 @@ diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.8.1.2.orig/lib/Imakefile lcgdm-1.8.1.2/lib/Imakefile
---- lcgdm-1.8.1.2.orig/lib/Imakefile 2011-05-31 12:22:46.000000000 +0200
-+++ lcgdm-1.8.1.2/lib/Imakefile 2011-09-03 23:03:33.191011618 +0200
+diff -ur lcgdm-1.8.2.orig/lib/Imakefile lcgdm-1.8.2/lib/Imakefile
+--- lcgdm-1.8.2.orig/lib/Imakefile 2011-12-06 14:35:16.000000000 +0100
++++ lcgdm-1.8.2/lib/Imakefile 2011-12-06 15:07:24.837746750 +0100
@@ -34,7 +34,9 @@
install: $(LIB) FileName($(LIB),LibraryTargetName(dpm))
@@ -205,10 +205,10 @@ diff -ur lcgdm-1.8.1.2.orig/lib/Imakefile lcgdm-1.8.1.2/lib/Imakefile
liblcgdm.a: $(COMMONLIB) $(SECURITYLIB)
-diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
---- lcgdm-1.8.1.2.orig/ns/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/ns/Imakefile 2011-09-03 23:03:33.192011604 +0200
-@@ -45,27 +45,27 @@
+diff -ur lcgdm-1.8.2.orig/ns/Imakefile lcgdm-1.8.2/ns/Imakefile
+--- lcgdm-1.8.2.orig/ns/Imakefile 2011-12-06 14:35:17.000000000 +0100
++++ lcgdm-1.8.2/ns/Imakefile 2011-12-06 15:15:16.275759891 +0100
+@@ -51,29 +51,29 @@
INCLUDES = FileName(..,h)
TOPLIBRARYNAME = TopLibraryName
#if _AIX
@@ -224,8 +224,10 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm
#else
#if linux
+
-LIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm
+
#else
#if sgi
-LIBS = -L../lib -l$(TOPLIBRARYNAME)
@@ -243,7 +245,7 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
#endif
#endif
#endif
-@@ -80,7 +80,7 @@
+@@ -88,7 +88,7 @@
#if _WIN32
NSLIB = ns.lib
#else
@@ -252,7 +254,7 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
#endif
SPOOL = NsSpool
LOGFILE = FileName($(SPOOL),log)
-@@ -107,7 +107,7 @@
+@@ -115,7 +115,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -261,9 +263,9 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
#else
#if UsePostgres
DBOBJS = Cns_libpq_ifce.Osuf
-diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.dpns lcgdm-1.8.1.2/ns/Imakefile.dpns
---- lcgdm-1.8.1.2.orig/ns/Imakefile.dpns 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/ns/Imakefile.dpns 2011-09-03 23:03:33.192011604 +0200
+diff -ur lcgdm-1.8.2.orig/ns/Imakefile.dpns lcgdm-1.8.2/ns/Imakefile.dpns
+--- lcgdm-1.8.2.orig/ns/Imakefile.dpns 2011-12-06 14:35:17.000000000 +0100
++++ lcgdm-1.8.2/ns/Imakefile.dpns 2011-12-06 15:10:27.559751835 +0100
@@ -22,7 +22,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -273,21 +275,21 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.dpns lcgdm-1.8.1.2/ns/Imakefile.dpns
COMM######################### RULES ##############################
-@@ -307,9 +307,9 @@
+@@ -308,9 +308,9 @@
NormalProgramTarget(dpns-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
#if UseOracle && !defined(_WIN32)
dpnsdaemon: $(NSDAEMON_OBJS) $(DEPLIB)
-- $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID)"
-+ $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID)"
+- $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID) $(LIBSEMSG)"
++ $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID) $(LIBSEMSG)"
#else
--NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID))
-+NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID))
+-NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID) $(LIBSEMSG))
++NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID) $(LIBSEMSG))
#endif
NormalProgramTarget(dpns-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
NormalProgramTarget(dpns-enterusrmap,nsenterusrmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
-diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
---- lcgdm-1.8.1.2.orig/ns/Imakefile.lfc 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/ns/Imakefile.lfc 2011-09-03 23:03:33.193011590 +0200
+diff -ur lcgdm-1.8.2.orig/ns/Imakefile.lfc lcgdm-1.8.2/ns/Imakefile.lfc
+--- lcgdm-1.8.2.orig/ns/Imakefile.lfc 2011-12-06 14:35:17.000000000 +0100
++++ lcgdm-1.8.2/ns/Imakefile.lfc 2011-12-06 15:11:45.189754000 +0100
@@ -33,7 +33,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -297,21 +299,21 @@ diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
COMM######################### RULES ##############################
-@@ -378,9 +378,9 @@
+@@ -379,9 +379,9 @@
NormalProgramTarget(lfc-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
#if UseOracle && !defined(_WIN32)
lfcdaemon: $(NSDAEMON_OBJS) $(DEPLIB)
-- $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID)"
-+ $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID)"
+- $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID) $(LIBSEMSG)"
++ $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID) $(LIBSEMSG)"
#else
--NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID))
-+NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID))
+-NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID) $(LIBSEMSG))
++NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID) $(LIBSEMSG))
#endif
NormalProgramTarget(lfc-delcomment,nsdelcomment.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
NormalProgramTarget(lfc-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
-diff -ur lcgdm-1.8.1.2.orig/rfio/Imakefile lcgdm-1.8.1.2/rfio/Imakefile
---- lcgdm-1.8.1.2.orig/rfio/Imakefile 2011-05-31 12:22:45.000000000 +0200
-+++ lcgdm-1.8.1.2/rfio/Imakefile 2011-09-03 23:03:33.194011577 +0200
+diff -ur lcgdm-1.8.2.orig/rfio/Imakefile lcgdm-1.8.2/rfio/Imakefile
+--- lcgdm-1.8.2.orig/rfio/Imakefile 2011-12-06 14:35:16.000000000 +0100
++++ lcgdm-1.8.2/rfio/Imakefile 2011-12-06 15:07:24.877746739 +0100
@@ -94,24 +94,24 @@
#endif
FFLAGS = $(FFOPTFLAGS) $(FPPUFL)
@@ -352,9 +354,9 @@ diff -ur lcgdm-1.8.1.2.orig/rfio/Imakefile lcgdm-1.8.1.2/rfio/Imakefile
#endif
LIBS = $(OPTLIBS)
-diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
---- lcgdm-1.8.1.2.orig/security/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/security/Imakefile 2011-09-03 23:03:33.195011564 +0200
+diff -ur lcgdm-1.8.2.orig/security/Imakefile lcgdm-1.8.2/security/Imakefile
+--- lcgdm-1.8.2.orig/security/Imakefile 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/security/Imakefile 2011-12-06 15:07:24.878746741 +0100
@@ -57,12 +57,12 @@
#define SecAuthMechGSI -DGSI
#if EMIBuild
@@ -371,9 +373,9 @@ diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
#endif
#else
#define GSIMech
-diff -ur lcgdm-1.8.1.2.orig/shlib/Imakefile lcgdm-1.8.1.2/shlib/Imakefile
---- lcgdm-1.8.1.2.orig/shlib/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/shlib/Imakefile 2011-09-03 23:03:33.195011564 +0200
+diff -ur lcgdm-1.8.2.orig/shlib/Imakefile lcgdm-1.8.2/shlib/Imakefile
+--- lcgdm-1.8.2.orig/shlib/Imakefile 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/shlib/Imakefile 2011-12-06 15:07:24.879746742 +0100
@@ -35,7 +35,6 @@
install: $(LIB) FileName($(LIB),SharedLibraryTargetName(dpm))
@@ -391,9 +393,9 @@ diff -ur lcgdm-1.8.1.2.orig/shlib/Imakefile lcgdm-1.8.1.2/shlib/Imakefile
@-rm -rf tmp
liblcgdm.sl liblcgdm.so liblcgdm.dylib: $(COMMONLIB) $(SECURITYLIB)
-diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile
---- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-03 23:03:33.196011551 +0200
+diff -ur lcgdm-1.8.2.orig/srmv1/Imakefile lcgdm-1.8.2/srmv1/Imakefile
+--- lcgdm-1.8.2.orig/srmv1/Imakefile 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/srmv1/Imakefile 2011-12-06 15:07:24.879746742 +0100
@@ -53,9 +53,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -424,9 +426,9 @@ diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile
---- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-05-31 12:22:47.000000000 +0200
-+++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-03 23:03:33.197011538 +0200
+diff -ur lcgdm-1.8.2.orig/srmv2/Imakefile lcgdm-1.8.2/srmv2/Imakefile
+--- lcgdm-1.8.2.orig/srmv2/Imakefile 2011-12-06 14:35:18.000000000 +0100
++++ lcgdm-1.8.2/srmv2/Imakefile 2011-12-06 15:07:24.880746741 +0100
@@ -53,9 +53,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -457,9 +459,9 @@ diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile
---- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-05-31 12:22:46.000000000 +0200
-+++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-03 23:03:33.198011525 +0200
+diff -ur lcgdm-1.8.2.orig/srmv2.2/Imakefile lcgdm-1.8.2/srmv2.2/Imakefile
+--- lcgdm-1.8.2.orig/srmv2.2/Imakefile 2011-12-06 14:35:16.000000000 +0100
++++ lcgdm-1.8.2/srmv2.2/Imakefile 2011-12-06 15:07:24.881746739 +0100
@@ -54,9 +54,9 @@
INCLUDES = FileName(..,h)
BACKEND_LIBS = DepLibraryTargetName(dpmcopy,dpmcopy)
diff --git a/lcgdm.spec b/lcgdm.spec
index d486a9c..33a18d9 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -28,15 +28,15 @@
%endif
Name: lcgdm
-Version: 1.8.1.2
-Release: 2%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
License: ASL 2.0
URL: http://glite.web.cern.ch/glite/
-# LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_1_2_emi lcgdm-1.8.1.2
-# tar --exclude .svn -z -c -f lcgdm-1.8.1.2.tar.gz lcgdm-1.8.1.2
+# LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_2_3 lcgdm-1.8.2
+# tar --exclude .svn -z -c -f lcgdm-1.8.2.tar.gz lcgdm-1.8.2
Source0: %{name}-%{version}.tar.gz
Source1: README.Fedora.lfc-mysql
Source2: README.Fedora.lfc-postgres
@@ -599,6 +599,7 @@ sed -e 's/\(BuildDLI *\)YES/\1NO/' \
-e 's/\(BuildNameServerLibrary *\)YES/\1NO/' -i config/site.def
sed '/^\#define.*YES/d' -i config/Project.tmpl config/Library.tmpl
sed '/^SECURITYDIR =/d' -i config/Project.tmpl
+sed 's/\(install:\).*/\1/' -i h/Imakefile
make -f Makefile.ini Makefiles
@@ -661,6 +662,7 @@ sed -e 's/\(BuildDPMClient *\)YES/\1NO/' \
-e 's/\(BuildRfioServer *\)YES/\1NO/' -i config/site.def
sed '/^\#define.*YES/d' -i config/Project.tmpl config/Library.tmpl
sed '/^SECURITYDIR =/d' -i config/Project.tmpl
+sed 's/\(install:\).*/\1/' -i h/Imakefile
make -f Makefile.ini Makefiles
@@ -759,8 +761,9 @@ touch ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
# lfcdaemon configuration file
-cp -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
+sed -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
@@ -881,8 +884,9 @@ touch ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
# lfcdaemon configuration file
-cp -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.conf
+sed -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
@@ -1005,6 +1009,17 @@ sed -e 's/\(\.TH [^ ]* \)1/\18/' \
rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1
touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
+# dpm-buildfsv binary and man page
+mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-buildfsv \
+ ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-buildfsv
+touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
+chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
+sed -e 's/\(\.TH [^ ]* \)1/\18/' \
+ ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1 | gzip -9 -n -c > \
+ ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
+rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1
+touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-buildfsv.8
+
# dpnsdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
@@ -1020,6 +1035,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
# dpnsdaemon configuration file
sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
+ -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
@@ -1259,6 +1275,17 @@ sed -e 's/\(\.TH [^ ]* \)1/\18/' \
rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1
touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
+# dpm-buildfsv binary and man page
+mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-buildfsv \
+ ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-buildfsv
+touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
+chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
+sed -e 's/\(\.TH [^ ]* \)1/\18/' \
+ ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1 | gzip -9 -n -c > \
+ ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
+rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1
+touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-buildfsv.8
+
# dpnsdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
@@ -1274,6 +1301,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
# dpnsdaemon configuration file
sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
+ -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
@@ -1721,6 +1749,58 @@ getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
exit 0
%post -n dpm-server-mysql
+updatedpm () {
+ [ -r /etc/sysconfig/dpm ] && . /etc/sysconfig/dpm
+ [ -z "$DPMCONFIGFILE" ] && DPMCONFIGFILE=/etc/DPMCONFIG
+ [ -r $DPMCONFIGFILE ] || return 0
+
+ dpmcfg=$(cat $DPMCONFIGFILE)
+
+ cfg1=$(echo $dpmcfg | cut -f1 -d@)
+ cfg2=$(echo $dpmcfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=dpm_db
+
+ mycfg=$(mktemp)
+ cat > $mycfg <<-EOF
+ [client]
+ user=$user
+ password=$passwd
+ EOF
+
+ mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
+
+ vmajor=$($mysql -e "select major from schema_version_dpm" 2>/dev/null)
+ vminor=$($mysql -e "select minor from schema_version_dpm" 2>/dev/null)
+ vpatch=$($mysql -e "select patch from schema_version_dpm" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ rm $mycfg
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 2 -a $vpatch -eq 0 ] ; then
+ $mysql <<-EOF
+ ALTER TABLE dpm_fs ADD weight INTEGER;
+ UPDATE dpm_fs SET weight = 1;
+ UPDATE schema_version_dpm SET major = 3, minor = 3, patch = 0;
+ EOF
+ fi
+
+ rm $mycfg
+ return 0
+}
+
+updatedpm
+
%{_sbindir}/update-alternatives --install %{_sbindir}/dpm dpm \
%{_libdir}/dpm-mysql/dpm 20 \
--slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
@@ -1736,7 +1816,11 @@ exit 0
--slave %{_sbindir}/dpm-shutdown dpm-shutdown \
%{_libdir}/dpm-mysql/dpm-shutdown \
--slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
- %{_libdir}/dpm-mysql/dpm-shutdown.8.gz
+ %{_libdir}/dpm-mysql/dpm-shutdown.8.gz \
+ --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
+ %{_libdir}/dpm-mysql/dpm-buildfsv \
+ --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
+ %{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
if [ $1 = 1 ]; then
if [ -r %{_initrddir}/dpm ]; then
@@ -1745,6 +1829,50 @@ if [ $1 = 1 ]; then
fi
%post -n dpm-server-postgres
+updatedpm () {
+ [ -r /etc/sysconfig/dpm ] && . /etc/sysconfig/dpm
+ [ -z "$DPMCONFIGFILE" ] && DPMCONFIGFILE=/etc/DPMCONFIG
+ [ -r $DPMCONFIGFILE ] || return 0
+
+ dpmcfg=$(cat $DPMCONFIGFILE)
+
+ cfg1=$(echo $dpmcfg | cut -f1 -d@)
+ cfg2=$(echo $dpmcfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=dpm_db
+
+ export PGPASSWORD=$passwd
+ psql="psql -t -q -U $user $db"
+
+ vmajor=$($psql -c "select major from schema_version_dpm" 2>/dev/null)
+ vminor=$($psql -c "select minor from schema_version_dpm" 2>/dev/null)
+ vpatch=$($psql -c "select patch from schema_version_dpm" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 2 -a $vpatch -eq 0 ] ; then
+ $psql <<-EOF
+ ALTER TABLE dpm_fs ADD weight INTEGER;
+ UPDATE dpm_fs SET weight = 1;
+ UPDATE schema_version_dpm SET major = 3, minor = 3, patch = 0;
+ EOF
+ fi
+
+ return 0
+}
+
+updatedpm
+
%{_sbindir}/update-alternatives --install %{_sbindir}/dpm dpm \
%{_libdir}/dpm-postgres/dpm 10 \
--slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
@@ -1760,7 +1888,11 @@ fi
--slave %{_sbindir}/dpm-shutdown dpm-shutdown \
%{_libdir}/dpm-postgres/dpm-shutdown \
--slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
- %{_libdir}/dpm-postgres/dpm-shutdown.8.gz
+ %{_libdir}/dpm-postgres/dpm-shutdown.8.gz \
+ --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
+ %{_libdir}/dpm-postgres/dpm-buildfsv \
+ --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
+ %{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
if [ $1 = 1 ]; then
if [ -r %{_initrddir}/dpm ]; then
@@ -1785,7 +1917,11 @@ fi
--slave %{_sbindir}/dpm-shutdown dpm-shutdown \
%{_libdir}/dpm-mysql/dpm-shutdown \
--slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
- %{_libdir}/dpm-mysql/dpm-shutdown.8.gz
+ %{_libdir}/dpm-mysql/dpm-shutdown.8.gz \
+ --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
+ %{_libdir}/dpm-mysql/dpm-buildfsv \
+ --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
+ %{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
%triggerpostun -n dpm-server-postgres -- dpm-postgres < 1.8.1.2-2
# Restore alternatives removed by dpm-postgres preun
@@ -1804,7 +1940,11 @@ fi
--slave %{_sbindir}/dpm-shutdown dpm-shutdown \
%{_libdir}/dpm-postgres/dpm-shutdown \
--slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
- %{_libdir}/dpm-postgres/dpm-shutdown.8.gz
+ %{_libdir}/dpm-postgres/dpm-shutdown.8.gz \
+ --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
+ %{_libdir}/dpm-postgres/dpm-buildfsv \
+ --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
+ %{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
%preun -n dpm-server-mysql
export LANG=C
@@ -2709,10 +2849,14 @@ fi
%ghost %{_sbindir}/dpm
%{_libdir}/dpm-mysql/dpm-shutdown
%ghost %{_sbindir}/dpm-shutdown
+%{_libdir}/dpm-mysql/dpm-buildfsv
+%ghost %{_sbindir}/dpm-buildfsv
%doc %{_libdir}/dpm-mysql/dpm.8*
%ghost %{_mandir}/man8/dpm.8*
%doc %{_libdir}/dpm-mysql/dpm-shutdown.8*
%ghost %{_mandir}/man8/dpm-shutdown.8*
+%doc %{_libdir}/dpm-mysql/dpm-buildfsv.8*
+%ghost %{_mandir}/man8/dpm-buildfsv.8*
%{_libdir}/dpm-mysql/DPMCONFIG.templ
%ghost %{_datadir}/dpm/DPMCONFIG.templ
%dir %{_sysconfdir}/dpm-mysql
@@ -2737,10 +2881,14 @@ fi
%ghost %{_sbindir}/dpm
%{_libdir}/dpm-postgres/dpm-shutdown
%ghost %{_sbindir}/dpm-shutdown
+%{_libdir}/dpm-postgres/dpm-buildfsv
+%ghost %{_sbindir}/dpm-buildfsv
%doc %{_libdir}/dpm-postgres/dpm.8*
%ghost %{_mandir}/man8/dpm.8*
%doc %{_libdir}/dpm-postgres/dpm-shutdown.8*
%ghost %{_mandir}/man8/dpm-shutdown.8*
+%doc %{_libdir}/dpm-postgres/dpm-buildfsv.8*
+%ghost %{_mandir}/man8/dpm-buildfsv.8*
%{_libdir}/dpm-postgres/DPMCONFIG.templ
%ghost %{_datadir}/dpm/DPMCONFIG.templ
%dir %{_sysconfdir}/dpm-postgres
@@ -2944,6 +3092,9 @@ fi
%doc %{_mandir}/man8/dpm-rfiod.8*
%changelog
+* Tue Dec 06 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.2-1
+- Update to version 1.8.2
+
* Thu Nov 10 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.1.2-2
- Implement new package names agreed with upstream
diff --git a/sources b/sources
index f08b6db..adca0f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f25bb284d8f8464770314da1a409545 lcgdm-1.8.1.2.tar.gz
+f1125c6bc0edf6a6215a9f00172794eb lcgdm-1.8.2.tar.gz
More information about the scm-commits
mailing list