rpms/lcgdm/EL-5 README.Fedora.dpm-mysql, NONE, 1.1 README.Fedora.dpm-postgres, NONE, 1.1 README.Fedora.dpns-mysql, NONE, 1.1 README.Fedora.dpns-postgres, NONE, 1.1 README.Fedora.lfc-mysql, NONE, 1.1 README.Fedora.lfc-postgres, NONE, 1.1 import.log, NONE, 1.1 lcgdm-dlopen.patch, NONE, 1.1 lcgdm-gsoap.patch, NONE, 1.1 lcgdm-imake.patch, NONE, 1.1 lcgdm-ld.patch, NONE, 1.1 lcgdm-man.patch, NONE, 1.1 lcgdm-paths.patch, NONE, 1.1 lcgdm-porting.patch, NONE, 1.1 lcgdm-shliblink.patch, NONE, 1.1 lcgdm-typo.patch, NONE, 1.1 lcgdm-usr.patch, NONE, 1.1 lcgdm-withsoname.patch, NONE, 1.1 lcgdm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Thu Apr 8 09:28:34 UTC 2010
- Previous message: rpms/lcgdm/F-11 README.Fedora.dpm-mysql, NONE, 1.1 README.Fedora.dpm-postgres, NONE, 1.1 README.Fedora.dpns-mysql, NONE, 1.1 README.Fedora.dpns-postgres, NONE, 1.1 README.Fedora.lfc-mysql, NONE, 1.1 README.Fedora.lfc-postgres, NONE, 1.1 import.log, NONE, 1.1 lcgdm-dlopen.patch, NONE, 1.1 lcgdm-gsoap.patch, NONE, 1.1 lcgdm-imake.patch, NONE, 1.1 lcgdm-ld.patch, NONE, 1.1 lcgdm-man.patch, NONE, 1.1 lcgdm-paths.patch, NONE, 1.1 lcgdm-porting.patch, NONE, 1.1 lcgdm-shliblink.patch, NONE, 1.1 lcgdm-typo.patch, NONE, 1.1 lcgdm-usr.patch, NONE, 1.1 lcgdm-withsoname.patch, NONE, 1.1 lcgdm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/abiword/F-11 abiword-2.8.3-desktop.patch, NONE, 1.1 abiword.spec, 1.81, 1.82 abiword-2.7.6-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/lcgdm/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3151/EL-5
Modified Files:
.cvsignore sources
Added Files:
README.Fedora.dpm-mysql README.Fedora.dpm-postgres
README.Fedora.dpns-mysql README.Fedora.dpns-postgres
README.Fedora.lfc-mysql README.Fedora.lfc-postgres import.log
lcgdm-dlopen.patch lcgdm-gsoap.patch lcgdm-imake.patch
lcgdm-ld.patch lcgdm-man.patch lcgdm-paths.patch
lcgdm-porting.patch lcgdm-shliblink.patch lcgdm-typo.patch
lcgdm-usr.patch lcgdm-withsoname.patch lcgdm.spec
Log Message:
* Thu Apr 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.4-2
- Fix priorities for alternatives
- Add -p flag to install commands
--- NEW FILE README.Fedora.dpm-mysql ---
How to set up an DPM server with a mysql backend
================================================
The DPM server is run by the dpmmgr user. This user requires a copy of
the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/dpmmgr/dpmcert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/dpmmgr/dpmkey.pem
chown dpmmgr:dpmmgr /etc/grid-security/dpmmgr/dpm*
Create the DPM database on the mysql server:
mysql -u root < /usr/share/dpm/create_dpm_tables_mysql.sql
Select a username and password for this mysql database table. Replace
<user> and <password> in the commands below with your choice, also
replace <hostname> with the hostname of the DPM server:
mysql -u root
mysql> use mysql
mysql> grant all on dpm_db.* to <user>@localhost identified by '<password>';
mysql> grant all on dpm_db.* to <user>@<hostname> identified by '<password>';
mysql> quit
Let the DPM server know about the account information and make sure
only the dpmmgr user can read this information:
touch /etc/DPMCONFIG
chmod 600 /etc/DPMCONFIG
chown dpmmgr:dpmmgr /etc/DPMCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/DPMCONFIG
If the /<dbname> part is omitted the database "dpm_db" will be used.
If you have a firewall, open the DPM server port (5015).
Once the configuration is completed, start the DPM server:
service dpm-mysql start
If you want to start the service automatically at boot time:
chkconfig --add dpm-mysql
--- NEW FILE README.Fedora.dpm-postgres ---
How to set up an DPM server with a postgres backend
===================================================
The DPM server is run by the dpmmgr user. This user requires a copy of
the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/dpmmgr/dpmcert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/dpmmgr/dpmkey.pem
chown dpmmgr:dpmmgr /etc/grid-security/dpmmgr/dpm*
Create a postgres database user for the DPM server:
createuser -P <user>
The command above will prompt you for a password for the new user.
Create the DPM database:
createdb -O <user> <dbname>
Create the DPM database tables:
psql -W -U <user> <dbname> -f /usr/share/dpm/create_dpm_tables_postgres.sql
Let the DPM server know about the account information and make sure
only the dpmmgr user can read this information:
touch /etc/DPMCONFIG
chmod 600 /etc/DPMCONFIG
chown dpmmgr:dpmmgr /etc/DPMCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/DPMCONFIG
If the /<dbname> part is omitted the database "dpm_db" will be used.
If you have a firewall, open the DPM server port (5015).
Once the configuration is completed, start the DPM server:
service dpm-postgres start
If you want to start the service automatically at boot time:
chkconfig --add dpm-postgres
--- NEW FILE README.Fedora.dpns-mysql ---
How to set up an DPM nameserver with a mysql backend
====================================================
The DPM nameserver (DPNS) is run by the dpmmgr user. This user
requires a copy of the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/dpmmgr/dpmcert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/dpmmgr/dpmkey.pem
chown dpmmgr:dpmmgr /etc/grid-security/dpmmgr/dpm*
Create the DPNS database on the mysql server:
mysql -u root < /usr/share/dpm/create_dpns_tables_mysql.sql
Select a username and password for this mysql database table. Replace
<user> and <password> in the commands below with your choice, also
replace <hostname> with the hostname of the DPNS server:
mysql -u root
mysql> use mysql
mysql> grant all on cns_db.* to <user>@localhost identified by '<password>';
mysql> grant all on cns_db.* to <user>@<hostname> identified by '<password>';
mysql> quit
Let the DPNS server know about the account information and make sure
only the dpmmgr user can read this information:
touch /etc/DPNSCONFIG
chmod 600 /etc/DPNSCONFIG
chown dpmmgr:dpmmgr /etc/DPNSCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/DPNSCONFIG
If the /<dbname> part is omitted the database "cns_db" will be used.
If you have a firewall, open the DPNS server port (5010).
Once the configuration is completed, start the DPNS server:
service dpm-mysql-nameserver start
If you want to start the service automatically at boot time:
chkconfig --add dpm-mysql-nameserver
--- NEW FILE README.Fedora.dpns-postgres ---
How to set up an DPM nameserver with a postgres backend
=======================================================
The DPM nameserver (DPNS) is run by the dpmmgr user. This user
requires a copy of the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/dpmmgr/dpmcert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/dpmmgr/dpmkey.pem
chown dpmmgr:dpmmgr /etc/grid-security/dpmmgr/dpm*
Create a postgres database user for the DPNS server:
createuser -P <user>
The command above will prompt you for a password for the new user.
Create the DPNS database:
createdb -O <user> <dbname>
Create the DPNS database tables:
psql -W -U <user> <dbname> -f /usr/share/dpm/create_dpns_tables_postgres.sql
Let the DPNS server know about the account information and make sure
only the dpmmgr user can read this information:
touch /etc/DPNSCONFIG
chmod 600 /etc/DPNSCONFIG
chown dpmmgr:dpmmgr /etc/DPNSCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/DPNSCONFIG
If the /<dbname> part is omitted the database "cns_db" will be used.
If you have a firewall, open the DPNS server port (5010).
Once the configuration is completed, start the DPNS server:
service dpm-postgres-nameserver start
If you want to start the service automatically at boot time:
chkconfig --add dpm-postgres-nameserver
--- NEW FILE README.Fedora.lfc-mysql ---
How to set up an LFC server with a mysql backend
================================================
The LFC server is run by the lfcmgr user. This user requires a copy of
the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/lfcmgr/lfccert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/lfcmgr/lfckey.pem
chown lfcmgr:lfcmgr /etc/grid-security/lfcmgr/lfc*
Create the LFC database on the mysql server:
mysql -u root < /usr/share/lfc/create_lfc_tables_mysql.sql
Select a username and password for this mysql database table. Replace
<user> and <password> in the commands below with your choice, also
replace <hostname> with the hostname of the LFC server:
mysql -u root
mysql> use mysql
mysql> grant all on cns_db.* to <user>@localhost identified by '<password>';
mysql> grant all on cns_db.* to <user>@<hostname> identified by '<password>';
mysql> quit
Let the LFC server know about the account information and make sure
only the lfcmgr user can read this information:
touch /etc/NSCONFIG
chmod 600 /etc/NSCONFIG
chown lfcmgr:lfcmgr /etc/NSCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/NSCONFIG
If the /<dbname> part is omitted the database "cns_db" will be used.
If you have a firewall, open the LFC server port (5010).
Once the configuration is completed, start the LFC server:
service lfc-mysql start
If you want to start the service automatically at boot time:
chkconfig --add lfc-mysql
--- NEW FILE README.Fedora.lfc-postgres ---
How to set up an LFC server with a postgres backend
===================================================
The LFC server is run by the lfcmgr user. This user requires a copy of
the host certificate files:
cp -p /etc/grid-security/hostcert.pem /etc/grid-security/lfcmgr/lfccert.pem
cp -p /etc/grid-security/hostkey.pem /etc/grid-security/lfcmgr/lfckey.pem
chown lfcmgr:lfcmgr /etc/grid-security/lfcmgr/lfc*
Create a postgres database user for the LFC server:
createuser -P <user>
The command above will prompt you for a password for the new user.
Create the LFC database:
createdb -O <user> <dbname>
Create the LFC database tables:
psql -W -U <user> <dbname> -f /usr/share/lfc/create_lfc_tables_postgres.sql
Let the LFC server know about the account information and make sure
only the lfcmgr user can read this information:
touch /etc/NSCONFIG
chmod 600 /etc/NSCONFIG
chown lfcmgr:lfcmgr /etc/NSCONFIG
echo <user>/<password>@<dbserver>/<dbname> > /etc/NSCONFIG
If the /<dbname> part is omitted the database "cns_db" will be used.
If you have a firewall, open the LFC server port (5010).
Once the configuration is completed, start the LFC server:
service lfc-postgres start
If you want to start the service automatically at boot time:
chkconfig --add lfc-postgres
--- NEW FILE import.log ---
lcgdm-1_7_4_4-2_fc12:EL-5:lcgdm-1.7.4.4-2.fc12.src.rpm:1270718896
lcgdm-dlopen.patch:
Csec_api_loader.c | 11 +++++++++++
1 file changed, 11 insertions(+)
--- NEW FILE lcgdm-dlopen.patch ---
diff -ur LCG-DM-1.7.3.1.orig/security/Csec_api_loader.c LCG-DM-1.7.3.1/security/Csec_api_loader.c
--- LCG-DM-1.7.3.1.orig/security/Csec_api_loader.c 2008-10-01 16:02:10.000000000 +0200
+++ LCG-DM-1.7.3.1/security/Csec_api_loader.c 2009-12-07 14:54:56.007186981 +0100
@@ -221,6 +221,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];
void *handle;
@@ -301,6 +302,11 @@
filename_thread,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename_thread, RTLD_NOW);
+ if (handle == NULL) {
+ strcpy(fullpath, "@@LIBDIR@@/lcgdm/");
+ strcat(fullpath, filename_thread);
+ handle = dlopen(fullpath, RTLD_NOW);
+ }
}
if (handle == NULL) {
@@ -308,6 +314,11 @@
filename,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename, RTLD_NOW);
+ if (handle == NULL) {
+ strcpy(fullpath, "@@LIBDIR@@/lcgdm/");
+ strcat(fullpath, filename);
+ handle = dlopen(fullpath, RTLD_NOW);
+ }
}
if (handle == NULL) {
lcgdm-gsoap.patch:
dli/Imakefile | 14 ++++++--------
dpmcopy/Imakefile | 12 +++++-------
srmv1/Imakefile | 14 ++++++--------
srmv2.2/Imakefile | 18 ++++++++++--------
srmv2/Imakefile | 17 +++++++++--------
test/srmv1/Imakefile | 8 ++------
test/srmv2.2/Imakefile | 8 ++------
test/srmv2/Imakefile | 9 ++-------
8 files changed, 42 insertions(+), 58 deletions(-)
--- NEW FILE lcgdm-gsoap.patch ---
diff -ur lcgdm-1.7.4.4.orig/dli/Imakefile lcgdm-1.7.4.4/dli/Imakefile
--- lcgdm-1.7.4.4.orig/dli/Imakefile 2010-04-03 10:31:57.057794667 +0200
+++ lcgdm-1.7.4.4/dli/Imakefile 2010-04-03 10:36:09.809544645 +0200
@@ -48,21 +48,18 @@
SRV_OBJS = dli.Osuf \
dlilogit.Osuf \
dliC.Osuf \
- dliServer.Osuf \
- stdsoap2.Osuf
+ dliServer.Osuf
all: $(SERVER) $(CLIENT)
-dliH.h dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: DataLocationInterface.h
+dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: dliH.h
+dliH.h: DataLocationInterface.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p dli DataLocationInterface.h
DataLocationInterface.h: DataLocationInterface.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -t typemap.dat DataLocationInterface.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
-NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS))
-NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),)
+NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) -lgsoap)
+NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf,$(DEPLIB),-lgsoap)
rc.lfc-dli: lfc-dli.scripts
$(CP) $? $@
lfc-dli.conf.templ: lfc-dli.sysconfig
@@ -110,5 +107,6 @@
COMM###################### DEPENDENCIES ##########################
dli.Osuf: dliH.h DataLocationInterface.nsmap
+lfc-dli-client.Osuf: dliH.h DataLocationInterface.nsmap
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/dpmcopy/Imakefile lcgdm-1.7.4.4/dpmcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dpmcopy/Imakefile 2010-04-03 10:31:57.058794443 +0200
+++ lcgdm-1.7.4.4/dpmcopy/Imakefile 2010-04-03 10:32:25.308544823 +0200
@@ -96,8 +96,7 @@
../dpm/dpmlogit.Osuf \
../dpm/sendrep.Osuf \
srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
all: $(SERVER)
@@ -119,7 +118,8 @@
proc INAME=dpm_oracle_ifce INCLUDE=$(INCLUDES) CHAR_MAP=STRING PARSE=FULL $(WNT_SYS_INCLUDE)
#define YES 1
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srm.v2.2.h
+srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.2.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
@@ -130,14 +130,12 @@
$(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c
send2dpmcopyd.Osuf: send2dpmcopyd.c
$(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) send2dpmcopyd.c
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
#if UseOracle && !defined(_WIN32)
dpmcopyd: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB)"
+ $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB) -lgsoap"
#else
-NormalProgramTarget(dpmcopyd,$(SRV_OBJS), $(DEPLIB), $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(dpmcopyd,$(SRV_OBJS), $(DEPLIB), $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.dpmcopyd: dpmcopyd.scripts.oracle
diff -ur lcgdm-1.7.4.4.orig/srmv1/Imakefile lcgdm-1.7.4.4/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/srmv1/Imakefile 2010-04-03 10:31:57.060793436 +0200
+++ lcgdm-1.7.4.4/srmv1/Imakefile 2010-04-03 10:32:25.308544823 +0200
@@ -100,24 +100,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv1C.Osuf \
- srmv1Server.Osuf \
- stdsoap2.Osuf
+ srmv1Server.Osuf
all: $(SERVER)
-srmv1H.h srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srm.v1.1.h
+srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srmv1H.h
+srmv1H.h: srm.v1.1.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv1 srm.v1.1.h
srm.v1.1.h: srm.v1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -w -y -t typemap.dat srm.v1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv1: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv1,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv1,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv1: srmv1.scripts.oracle
@@ -180,5 +177,6 @@
COMM###################### DEPENDENCIES ##########################
srmv1.Osuf: srmv1H.h ISRM.nsmap
+srmv1_procreq.Osuf: srmv1H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/srmv2/Imakefile lcgdm-1.7.4.4/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2/Imakefile 2010-04-03 10:31:57.060793436 +0200
+++ lcgdm-1.7.4.4/srmv2/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -104,24 +104,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv2C.Osuf \
- srmv2Server.Osuf \
- stdsoap2.Osuf
+ srmv2Server.Osuf
all: $(SERVER)
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.1.1.h
+srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.1.1.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.1.1.h
srm.v2.1.1.h: srm.v2.1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv2: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv2,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv2,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv2: srmv2.scripts.oracle
@@ -184,5 +181,9 @@
COMM###################### DEPENDENCIES ##########################
srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
+srmv2_dirreq.Osuf: srmv2H.h
+srmv2_permreq.Osuf: srmv2H.h
+srmv2_spacereq.Osuf: srmv2H.h
+srmv2_xferreq.Osuf: srmv2H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/srmv2.2/Imakefile lcgdm-1.7.4.4/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2.2/Imakefile 2010-04-03 10:31:57.061793143 +0200
+++ lcgdm-1.7.4.4/srmv2.2/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -106,24 +106,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv2C.Osuf \
- srmv2Server.Osuf \
- stdsoap2.Osuf
+ srmv2Server.Osuf
all: $(SERVER)
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.2.h
+srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.2.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv2.2: $(SRV_OBJS) $(DEPLIB) $(BACKEND_LIBS)
- $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv2.2: srmv2.2.scripts.oracle
@@ -188,5 +185,10 @@
COMM###################### DEPENDENCIES ##########################
srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
+srmv2_dirreq.Osuf: srmv2H.h
+srmv2_discovreq.Osuf: srmv2H.h
+srmv2_permreq.Osuf: srmv2H.h
+srmv2_spacereq.Osuf: srmv2H.h
+srmv2_xferreq.Osuf: srmv2H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/test/srmv1/Imakefile lcgdm-1.7.4.4/test/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv1/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv1/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -40,8 +40,7 @@
srmv1Stress
SOAP_OBJS = srmv1C.Osuf \
- srmv1Client.Osuf \
- stdsoap2.Osuf
+ srmv1Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv1),$(PROGS) $(SCRIPTS))
@@ -52,9 +51,6 @@
srm.v1.1.h: srm.v1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -w -y -t typemap.dat srm.v1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
install: $(PROGSBIN)
install.man:
@@ -64,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2/Imakefile lcgdm-1.7.4.4/test/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv2/Imakefile 2010-04-03 10:32:25.310544654 +0200
@@ -40,8 +40,7 @@
srmv2Stress
SOAP_OBJS = srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv2),$(PROGS) $(SCRIPTS))
@@ -52,10 +51,6 @@
srm.v2.1.1.h: srm.v2.1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
-
install: $(PROGSBIN)
install.man:
@@ -65,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile lcgdm-1.7.4.4/test/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv2.2/Imakefile 2010-04-03 10:32:25.310544654 +0200
@@ -40,8 +40,7 @@
srmv2Stress
SOAP_OBJS = srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv2.2),$(PROGS) $(SCRIPTS))
@@ -52,9 +51,6 @@
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
install: $(PROGSBIN)
install.man:
@@ -64,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################
lcgdm-imake.patch:
Imakefile | 3 +--
Makefile.ini | 4 +---
test/Imakefile | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)
--- NEW FILE lcgdm-imake.patch ---
diff -ur LCG-DM-1.7.3.1.orig/Imakefile LCG-DM-1.7.3.1/Imakefile
--- LCG-DM-1.7.3.1.orig/Imakefile 2009-02-19 00:14:09.000000000 +0100
+++ LCG-DM-1.7.3.1/Imakefile 2009-12-07 13:00:29.682188046 +0100
@@ -111,10 +111,9 @@
(cd test; $(MAKE) all)
Makefiles:
- @. ./setosflags ;\
for i in $(SUBDIRS) test ;\
do (echo " $$i:" ; cd $$i ;\
- ../imake/imake -I../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\
+ imake -Ui386 -I../config ;\
$(MAKE) $(MFLAGS) $@ \
) ; done ;
diff -ur LCG-DM-1.7.3.1.orig/Makefile.ini LCG-DM-1.7.3.1/Makefile.ini
--- LCG-DM-1.7.3.1.orig/Makefile.ini 1999-10-22 11:44:58.000000000 +0200
+++ LCG-DM-1.7.3.1/Makefile.ini 2009-12-07 12:59:47.138188149 +0100
@@ -15,7 +15,5 @@
test: Makefiles
(cd test; $(MAKE) all)
Makefiles:
- @. ./setosflags ;\
- (cd imake; $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$$BOOTSTRAPCFLAGS") ;\
- imake/imake -v -Iconfig -DOSMajorVersion=$$OSMAJNO -DOSMinorVersion=$$OSMINNO
+ imake -Ui386 -Iconfig
$(MAKE) $@
diff -ur LCG-DM-1.7.3.1.orig/test/Imakefile LCG-DM-1.7.3.1/test/Imakefile
--- LCG-DM-1.7.3.1.orig/test/Imakefile 2008-09-24 13:25:01.000000000 +0200
+++ LCG-DM-1.7.3.1/test/Imakefile 2009-12-07 13:01:10.579186477 +0100
@@ -27,12 +27,11 @@
@echo Not supported on this platform
#else
Makefiles:
- @. ../setosflags ;\
for i in $(SUBDIRS) ;\
do (if [ -d $$i ] ;\
then \
(echo " $$i:" ; cd $$i ;\
- ../../imake/imake -I../../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\
+ imake -Ui386 -I../../config ;\
$(MAKE) $(MFLAGS) $@) ;\
else \
(echo "ERROR : No directory $$i" ;\
lcgdm-ld.patch:
config/Imake.rules | 2 +-
config/Win32.rules | 2 +-
dicomcopy/Imakefile | 2 +-
dpm/Imakefile | 6 +++---
ns/Imakefile.lfc | 10 +++++-----
scripts/RLS-Atlas-migration/bin/Makefile | 6 +++---
scripts/RLS-Cms-migration/bin/Makefile | 6 +++---
scripts/RLS-migration/bin/Makefile | 4 ++--
security/Imakefile | 10 +++++-----
shlib/Imakefile | 4 ++--
test/srmv1/Imakefile | 2 +-
test/srmv2.2/Imakefile | 2 +-
test/srmv2/Imakefile | 2 +-
13 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE lcgdm-ld.patch ---
diff -ur lcgdm-1.7.4.4.orig/config/Imake.rules lcgdm-1.7.4.4/config/Imake.rules
--- lcgdm-1.7.4.4.orig/config/Imake.rules 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/Imake.rules 2010-03-29 19:33:39.744544929 +0200
@@ -95,7 +95,7 @@
#ifndef NormalProgramTarget
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
- $(LD) -o $@ $(LDFLAGS) objects libs
+ $(CC) -o $@ $(LDFLAGS) objects libs
#endif
#ifndef MakeSubdirs
diff -ur lcgdm-1.7.4.4.orig/config/Win32.rules lcgdm-1.7.4.4/config/Win32.rules
--- lcgdm-1.7.4.4.orig/config/Win32.rules 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/Win32.rules 2010-03-29 19:33:39.744544929 +0200
@@ -41,7 +41,7 @@
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
- $(LD) @<< @@\
+ $(CC) @<< @@\
/out:$@ $(LDFLAGS) objects libs @@\
<<
diff -ur lcgdm-1.7.4.4.orig/dicomcopy/Imakefile lcgdm-1.7.4.4/dicomcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dicomcopy/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/dicomcopy/Imakefile 2010-03-29 19:33:39.744544929 +0200
@@ -146,7 +146,7 @@
NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf)
SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
+ $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL)
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 19:33:17.300544220 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 19:36:35.762544752 +0200
@@ -418,21 +418,21 @@
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
- $(LD) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
dpm.py : _dpm.so
_dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm_wrap.o dpm_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_DPNS dpm.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
dpm2.py : _dpm2.so
_dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm2_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
--- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-03-29 19:33:17.301544486 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-03-29 19:36:57.283545361 +0200
@@ -466,14 +466,14 @@
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
- $(LD) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
lfc.py : _lfc.so
_lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h
RemoveFiles(lfc_wrap.o lfc_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
@@ -485,7 +485,7 @@
RemoveFiles(lfc2_wrap.o lfc2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
@@ -495,7 +495,7 @@
RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfcthr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
@@ -505,7 +505,7 @@
RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2thr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-Atlas-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-Atlas-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-Atlas-migration/bin/Makefile 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-Atlas-migration/bin/Makefile 2010-03-29 19:33:39.746544622 +0200
@@ -41,11 +41,11 @@
all: $(PROGS)
migrate_info: migrate_info.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../LCG-DM/ns/libns.a: FORCE
cd ../../LCG-DM/ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-Cms-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-Cms-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-Cms-migration/bin/Makefile 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-Cms-migration/bin/Makefile 2010-03-29 19:33:39.747544678 +0200
@@ -41,11 +41,11 @@
all: $(PROGS)
migrate_info: migrate_info.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../../ns/libns.a: FORCE
cd ../../../ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/scripts/RLS-migration/bin/Makefile lcgdm-1.7.4.4/scripts/RLS-migration/bin/Makefile
--- lcgdm-1.7.4.4.orig/scripts/RLS-migration/bin/Makefile 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/scripts/RLS-migration/bin/Makefile 2010-03-29 19:33:39.747544678 +0200
@@ -39,9 +39,9 @@
all: $(PROGS)
migrate_path: migrate_path.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS)
migrate_files: migrate_files.o $(DEPLIBS)
- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS)
../../../ns/libns.a: FORCE
cd ../../../ns ; $(MAKE) libns.a
diff -ur lcgdm-1.7.4.4.orig/security/Imakefile lcgdm-1.7.4.4/security/Imakefile
--- lcgdm-1.7.4.4.orig/security/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/security/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -165,10 +165,10 @@
#if UseGSI
SharedLibraryTargetName(Csec_plugin_GSI_thread): Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS)
SharedLibraryTargetName(Csec_plugin_GSI): Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS)
Csec_plugin_GSI.Osuf: Csec_plugin_GSS.c
$(CC) $(CFLAGS) SecAuthMechGSI SecIncludeDirGSI -o $@ -c Csec_plugin_GSS.c
@@ -185,7 +185,7 @@
#if UseKRB5
SharedLibraryTargetName(Csec_plugin_KRB5): Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS)
Csec_plugin_KRB5.Osuf: Csec_plugin_GSS.c
$(CC) $(CFLAGS) SecAuthMechKRB5 SecIncludeDirKRB5 -o $@ -c Csec_plugin_GSS.c
@@ -196,14 +196,14 @@
#if UseKRB4
SharedLibraryTargetName(Csec_plugin_KRB4): Csec_plugin_KRB4.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS)
Csec_plugin_KRB4.Osuf: Csec_plugin_KRB4.c
$(CC) $(CFLAGS) SecIncludeDirKRB4 -o $@ -c Csec_plugin_KRB4.c
#endif
SharedLibraryTargetName(Csec_plugin_ID): Csec_plugin_ID.Osuf
- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS)
+ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS)
Csec_plugin_ID.Osuf: Csec_plugin_ID.c
$(CC) $(CFLAGS) -o $@ -c Csec_plugin_ID.c
diff -ur lcgdm-1.7.4.4.orig/shlib/Imakefile lcgdm-1.7.4.4/shlib/Imakefile
--- lcgdm-1.7.4.4.orig/shlib/Imakefile 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/shlib/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -60,7 +60,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
@-rm -rf tmp
liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB)
@@ -69,7 +69,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
@-rm -rf tmp
libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB)
diff -ur lcgdm-1.7.4.4.orig/test/srmv1/Imakefile lcgdm-1.7.4.4/test/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv1/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv1/Imakefile 2010-03-29 19:33:39.748544664 +0200
@@ -64,7 +64,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2/Imakefile lcgdm-1.7.4.4/test/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv2/Imakefile 2010-03-29 19:33:39.749544441 +0200
@@ -65,7 +65,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile lcgdm-1.7.4.4/test/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile 2010-03-29 16:21:46.000000000 +0200
+++ lcgdm-1.7.4.4/test/srmv2.2/Imakefile 2010-03-29 19:33:39.749544441 +0200
@@ -64,7 +64,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
COMM###################### CLEANING RULES ########################
lcgdm-man.patch:
common/Cgetopt.man | 99 ++++++++++++++++++++++++--------------------------
common/Cglobals.man | 12 +++---
common/Cmutex.man | 4 +-
common/Cpool.man | 2 -
common/Csched.man | 2 -
ns/Cns_access.man | 2 -
ns/Cns_accessr.man | 2 -
ns/Cns_startsess.man | 4 +-
ns/Cns_starttrans.man | 2 -
rfio/rfio_access.man | 2 -
rfio/rfio_readdir.man | 4 +-
security/Csec_api.man | 4 +-
12 files changed, 69 insertions(+), 70 deletions(-)
--- NEW FILE lcgdm-man.patch ---
diff -ur lcgdm-1.7.4.4.orig/common/Cgetopt.man lcgdm-1.7.4.4/common/Cgetopt.man
--- lcgdm-1.7.4.4.orig/common/Cgetopt.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/Cgetopt.man 2010-03-29 20:20:18.716732420 +0200
@@ -49,9 +49,9 @@
The
.B Cgetopt
function incrementally parses a command line argument list
-.BI argv
+.I argv
and returns the next known option character. An option character is known if it has been specified in the string of accepted option characters,
-.BI optstring .
+.IR optstring .
.P
The
.B Cgetopt_long
@@ -60,44 +60,45 @@
but it accepts options in two forms: words and characters. The
.B Cgetopt_long
function provides a superset of the functionality of
-.B Cgetopt
+.BR Cgetopt .
The additional functionality is described in the section CGETOPT_LONG.
.P
The option string
-.BI optstring
+.I optstring
may contain the following elements: individual characters, and characters followed by a colon to indicate an option argument is to follow. For example, an option string
.B x
recognizes an option
-.B x ,
+.BR -x ,
and an option string
.B x:
recognizes an option and argument
-.B x argument .
+.B -x
+.IR argument .
It does not matter to
.B Cgetopt
if a following argument has leading white space.
.P
On return from
-.BI Cgetopt ,
-.BI Coptarg
+.BR Cgetopt ,
+.I Coptarg
points to an option argument, if it is anticipated, and the variable
-.BI Coptind
+.I Coptind
contains the index to the next
-.BI argv
+.I argv
argument for a subsequent call to
-.B Cgetopt .
+.BR Cgetopt .
The variable
-.BI Coptopt
+.I Coptopt
saves the last known option character returned by
-.B Cgetopt .
+.BR Cgetopt .
.P
-The variable
-.BI Copterr
+The variables
+.I Copterr
and
-.BI Coptind
+.I Coptind
are both initialized to 1.
The
-.BI Coptind
+.I Coptind
variable may be set to another value before a set of calls to
.B Cgetopt
in order to skip over more or less argv entries.
@@ -105,11 +106,11 @@
In order to use
.B Cgetopt
to evaluate multiple sets of arguments, or to evaluate a single set of arguments multiple times, the variable
-.BI Coptreset
+.I Coptreset
must be set to 1 before the second and each additional set of calls to
-.B Cgetopt ,
+.BR Cgetopt ,
and the variable
-.BI Coptind
+.I Coptind
must be reinitialized.
.P
The
@@ -128,13 +129,13 @@
can be used in two ways. In the first way, every long option understood by the program has a coresponding short option, and the option structure is only used to translate from long option to short options. When used in this fashion,
.B Cgetopt_long
behaves identically to
-.B Cgetopt.
+.BR Cgetopt .
This is good way to add long option processing to an existing program with the minimum of rewriting.
.P
In the second mechanism, a long option set a flag in the
-.BI option
+.I Coptions_t
structure passed, or will store a pointer to the command line argument in the
-.BI option
+.I Coptions_t
structure passed to it for options that take arguments. Additionally, the long option's argument may be specified as a single argument with an equal sign, e.g
.B myprogram --myoption=somevalue
.P
@@ -165,31 +166,31 @@
.P
The
-.BI name
+.I name
field should contain the option name without the leading double dash.
.P
The
-.BI has_arg
-field should be one of
-.B NO_ARGUMENT
-no argument to the option is expect.
-.B REQUIRED_ARGUMENT
+.I has_arg
+field should be one of:
+.BR NO_ARGUMENT ,
+no argument to the option is expected.
+.BR REQUIRED_ARGUMENT ,
an argument to the option is required.
-.B OPTIONAL_ARGUMENT
+.BR OPTIONAL_ARGUMENT ,
an argument to the option may be presented.
.P
If
-.BI flag
+.I flag
is non-NULL, then the integer pointed to by it will set to the value in the
-.BI val
+.I val
field. If the
-.BI flag
+.I flag
field is NULL, then the
-.BI val
+.I val
field will be returned. Setting
-.BI flag
+.I flag
to NULL and setting
-.BI val
+.I val
to the corresponding short option will make this function act just
like
.B Cgetopt.
@@ -197,16 +198,16 @@
If the
.B Cgetopt
function encounters a character not found in the string
-.BI optstring
+.I optstring
or detects a missing option argument it writes an error message to
.B stderr
and returns
-.B ? .
+.BR ? .
Setting
-.BI Copterr
+.I Copterr
to a zero will disable these error messages.
If
-.BI optstring
+.I optstring
has a leading
.B :
then a missing option argument causes a
@@ -218,7 +219,7 @@
; this is reasonable but reduces the amount of error checking possible.
.SH CGETOPT_LONG EXTENSIONS
The
-.BI Coptreset
+.I Coptreset
variable was added to make it possible to call the
.B Cgetopt
function multiple times.
@@ -272,7 +273,7 @@
{"buffy", NO_ARGUMENT, NULL, 'b'},
{"floride", REQUIRED_ARGUMENT, NULL, 'f'},
{"daggerset", NO_ARGUMENT, &daggerset, 1},
- {NULL, 0, NULL, 0}
+ {NULL, 0, NULL, 0}
};
Coptind = 1; /* Required */
@@ -310,9 +311,7 @@
.SH HISTORY
The
.B Cgetopt
-function appeared
-.Bx 4.3 .
-The
+function appeared in BSD 4.3. The
.B Cgetopt_long
function first appeared in GNU libiberty. This implementation was imported to NetBSD from a Kerberos distribution.
.SH BUGS
@@ -324,12 +323,12 @@
.B -p1003.2-92
to decouple
.B Cgetopt
-from <stdio.h> .
+from <stdio.h>.
.P
A single dash
.B -
may be specified as an character in
-.BI optstring ,
+.IR optstring ,
however it should
.B never
have an argument associated with it.
@@ -340,7 +339,7 @@
as an option flag.
This practice is wrong, and should not be used in any current development.
It is provided for backward compatibility
-.B only .
+.BR only .
By default, a single dash causes
.B Cgetopt
to return -1.
@@ -354,7 +353,7 @@
as an option.
This practice is wrong, and should not be used in any current development.
It is provided for backward compatibility
-.B only .
+.BR only .
The following code fragment works in most cases.
.ft CW
.nf
@@ -382,7 +381,7 @@
.fi
.P
The
-.BI OPTIONAL_ARGUMENT
+.B OPTIONAL_ARGUMENT
always eats the following argument unless the argument is included via the
.B --option=argument
notation.
diff -ur lcgdm-1.7.4.4.orig/common/Cglobals.man lcgdm-1.7.4.4/common/Cglobals.man
--- lcgdm-1.7.4.4.orig/common/Cglobals.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/Cglobals.man 2010-03-29 20:20:18.717795403 +0200
@@ -45,7 +45,7 @@
.br
a \fB#define\fP macro that replaces all occurences of any global variable that needs to be thread-specific to this Cglobal's function.
.RE
-In order to satisfy packages not compiled with threads turned on, or that do not initialize \fBCASTOR\fP Thread Interface's \fBCthread\fP, any such global variable is also explicitely defined in \fBCglobals\fP.
+In order to satisfy packages not compiled with threads turned on, or that do not initialize \fBCASTOR\fP Thread Interface's \fBCthread\fP, any such global variable is also explicitly defined in \fBCglobals\fP.
.P
For example, taking the global error variable \fBserrno\fP, \fBCglobals\fP source code contains:
.RS
@@ -55,7 +55,7 @@
.RS
if \fBCglobals_init\fP was not (successfully) called, return the address of the global variable \fBserrno\fP
.br
-else return the adress of a thread-safe specific memory, instanciated at the first call to this function, that holds the content of the current instance of the thread-specific value of \fBserrno\fP
+else return the address of a thread-safe specific memory, instanciated at the first call to this function, that holds the content of the current instance of the thread-specific value of \fBserrno\fP
.RE
.RE
.P
@@ -67,11 +67,11 @@
.I getspec
function address that, given a static
.I key
-adress, returns the adress of a Thread-Specific memory into
+address, returns the address of a Thread-Specific memory into
.I addr
content. This uses an internal structure inside \fBCthread\fP, allocated on the heap, that is associated bijectively to
.I key
-address. \fBCthread\fP always explicitely allocates such internal structure to any
+address. \fBCthread\fP always explicitly allocates such internal structure to any
.I key
address if it is unknown at the moment of the call to
.I getspec.
@@ -97,7 +97,7 @@
.I addr
value, previously instanciated with a
.I getspec
-call, and possibly allocated on the heap by \fBCglobals\fP if necessary, will internally explicitely call the Operating System Thread-Specific functions that will put the value of
+call, and possibly allocated on the heap by \fBCglobals\fP if necessary, will internally explicitly call the Operating System Thread-Specific functions that will put the value of
.I address
as something thread-specific, bijectively associated to another member of the internal structure of \fBCthread\fP, itself bijective to
.I key.
@@ -119,7 +119,7 @@
.I addr
content, at return of \fBCglobals_get\fP, is not NULL, you can safely fill this memory with any value, provided you does not exceed the
.I size
-bytes length speficied in your previous call to \fBCglobals_get\fP. Because of applications that are \fBnot\fP multi-threaded, the initial value of
+bytes length specified in your previous call to \fBCglobals_get\fP. Because of applications that are \fBnot\fP multi-threaded, the initial value of
.I key
has then an importance, that's why it is necessary to always declare it with an initial value of -1.
.P
diff -ur lcgdm-1.7.4.4.orig/common/Cmutex.man lcgdm-1.7.4.4/common/Cmutex.man
--- lcgdm-1.7.4.4.orig/common/Cmutex.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/Cmutex.man 2010-03-29 20:20:18.717795403 +0200
@@ -28,7 +28,7 @@
.P
Please note that the \fBCmutex\fP package is initially meant to be interfaced with \fBCthread\fP only.
.P
-\fBCmutex_lock\fP takes as argument the adress
+\fBCmutex_lock\fP takes as argument the address
.BI addr
of anything that is static in your userspace, such as a 'static int variable;' address (see \fBEXAMPLE\fP section below), and a
.BI timeout
@@ -117,7 +117,7 @@
.nf
/*
* Here follows an example. The call to \fBCthread_init\fP routine shows
- * that multi-threaded mode is explicitely activated by the application
+ * that multi-threaded mode is explicitly activated by the application
* (you will then have to link with the thread library). Neverthless,
* you can very well call some other external library, and leave as it is
* the \fBCmutex\fP calls.
diff -ur lcgdm-1.7.4.4.orig/common/Cpool.man lcgdm-1.7.4.4/common/Cpool.man
--- lcgdm-1.7.4.4.orig/common/Cpool.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/Cpool.man 2010-03-29 20:20:18.717795403 +0200
@@ -24,7 +24,7 @@
\fBCpool\fP is a layer built upon \fBCthread\fP, the \fPCASTOR Thread\fP interface. It allows the user to create dedicated pools, and then to assign to one of them a given routine to execute.
.P
-The created processes or threads will remain alive, unless the routines assigned to are crashing, or explicitely calling an exit statement, like exit() or pthread_exit().
+The created processes or threads will remain alive, unless the routines assigned to are crashing, or explicitly calling an exit statement, like exit() or pthread_exit().
.P
Typical use might be writing a server, with a bunch of pre-created processes or pools (depending on the environment with which \fBCthread\fP has been compiled), and assign to a given pool a routine with the socket file descriptor as argument address.
.P
diff -ur lcgdm-1.7.4.4.orig/common/Csched.man lcgdm-1.7.4.4/common/Csched.man
--- lcgdm-1.7.4.4.orig/common/Csched.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/Csched.man 2010-03-29 20:20:18.718795389 +0200
@@ -98,7 +98,7 @@
.B not
mean that all those schedulings are supported on the platform you are running on. In particular, only
.I CSCHED_OTHER
-is officially supported everywhere. The other scheduling policies are totally system dependant and do not conform to any standardisation. Please be aware, also, that using a scheduling other than
+is officially supported everywhere. The other scheduling policies are totally system dependent and do not conform to any standardisation. Please be aware, also, that using a scheduling other than
.I CSCHED_OTHER
is an opendoor to processor deadlock...
.P
diff -ur lcgdm-1.7.4.4.orig/ns/Cns_access.man lcgdm-1.7.4.4/ns/Cns_access.man
--- lcgdm-1.7.4.4.orig/ns/Cns_access.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns_access.man 2010-03-29 20:20:18.724550373 +0200
@@ -46,7 +46,7 @@
.I amode
the bit pattern is built by an OR of the constants defined in
.RB < unistd.h >
-under Unix or to be explicitely defined under Windows/NT:
+under Unix or to be explicitly defined under Windows/NT:
.RS
.TP
.B R_OK
diff -ur lcgdm-1.7.4.4.orig/ns/Cns_accessr.man lcgdm-1.7.4.4/ns/Cns_accessr.man
--- lcgdm-1.7.4.4.orig/ns/Cns_accessr.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns_accessr.man 2010-03-29 20:20:18.724550373 +0200
@@ -45,7 +45,7 @@
.I amode
the bit pattern is built by an OR of the constants defined in
.RB < unistd.h >
-under Unix or to be explicitely defined under Windows/NT:
+under Unix or to be explicitly defined under Windows/NT:
.RS
.TP
.B R_OK
diff -ur lcgdm-1.7.4.4.orig/ns/Cns_startsess.man lcgdm-1.7.4.4/ns/Cns_startsess.man
--- lcgdm-1.7.4.4.orig/ns/Cns_startsess.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns_startsess.man 2010-03-29 20:20:18.724550373 +0200
@@ -17,12 +17,12 @@
starts session.
The connection to the Name Server is kept open until
.B Cns_endsess
-is explicitely called.
+is explicitly called.
Requests issued between
.B Cns_startsess
and
.B Cns_endsess
-are independant from each other and are individually committed or rolled back.
+are independent from each other and are individually committed or rolled back.
The
.I comment
is logged in the server log.
diff -ur lcgdm-1.7.4.4.orig/ns/Cns_starttrans.man lcgdm-1.7.4.4/ns/Cns_starttrans.man
--- lcgdm-1.7.4.4.orig/ns/Cns_starttrans.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns_starttrans.man 2010-03-29 20:20:18.724550373 +0200
@@ -20,7 +20,7 @@
.B Cns_aborttrans
or
.B Cns_endtrans
-is explicitely called.
+is explicitly called.
If all the DB update operations between
.B Cns_starttrans
and
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_access.man lcgdm-1.7.4.4/rfio/rfio_access.man
--- lcgdm-1.7.4.4.orig/rfio/rfio_access.man 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_access.man 2010-03-29 20:20:22.656552829 +0200
@@ -48,7 +48,7 @@
.I amode
the bit pattern is built by an OR of the constants defined in
.RB < unistd.h >
-under Unix or to be explicitely defined under Windows/NT:
+under Unix or to be explicitly defined under Windows/NT:
.RS
.TP
.B R_OK
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_readdir.man lcgdm-1.7.4.4/rfio/rfio_readdir.man
--- lcgdm-1.7.4.4.orig/rfio/rfio_readdir.man 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_readdir.man 2010-03-29 20:20:28.199552975 +0200
@@ -20,8 +20,8 @@
.SH DESCRIPTION
.B rfio_readdir
reads the directory opened by
-.B rfio_opendir
-. This routine returns a pointer to a structure containing the current directory
+.BR rfio_opendir .
+This routine returns a pointer to a structure containing the current directory
entry.
.TP
.I dirp
diff -ur lcgdm-1.7.4.4.orig/security/Csec_api.man lcgdm-1.7.4.4/security/Csec_api.man
--- lcgdm-1.7.4.4.orig/security/Csec_api.man 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/security/Csec_api.man 2010-03-29 20:20:28.199552975 +0200
@@ -76,7 +76,7 @@
framework for errors.
.sp
.TP
-.B "Csec_client_initContext,Csec_server_initContext,Csec_server_reinitContext
+.B Csec_client_initContext, Csec_server_initContext, Csec_server_reinitContext
Allow to initialize the
.B Csec_context_t
structure. The service type parameter defines which type of key will be used by the service. Its value can be:
@@ -96,7 +96,7 @@
A CASTOR tape host type key (e.g. castortape/machine_name at DOMAIN for KRB5) will be used
.RE
.TP
-.B Csec_client_establishContext,Csec_server_establishContext
+.B Csec_client_establishContext, Csec_server_establishContext
Given a initialized context and an opened socket, establishes a security context according to the chosen security mechanism.
.TP
.B Csec_client_setSecurityOpts, Csec_server_setSecurityOpts
lcgdm-paths.patch:
config/site.def | 8 ++++----
configure | 13 +++++++++++++
dpm/Imakefile | 20 ++++++++++----------
ns/Imakefile.lfc | 36 ++++++++++++++++++------------------
4 files changed, 45 insertions(+), 32 deletions(-)
--- NEW FILE lcgdm-paths.patch ---
diff -ur lcgdm-1.7.4.4.orig/config/site.def lcgdm-1.7.4.4/config/site.def
--- lcgdm-1.7.4.4.orig/config/site.def 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/site.def 2010-03-29 19:27:36.803627866 +0200
@@ -29,7 +29,7 @@
#define CupvConfigFile /etc/CUPVCONFIG
#endif
#define CupvHost "UNUSED"
-#define CupvSpool /usr/spool/upv
+#define CupvSpool /var/spool/upv
#define DicomcopySpool /var/log/dicomcopy
#define DliSpool /var/log/dli
#define DomainName cern.ch
@@ -73,12 +73,12 @@
#if defined(_WIN32)
#define InstallPerlDir \\cern.ch\dfs\Applications\CERN\LFC\lib\perl
#else
-#define InstallPerlDir $(prefix)/$(_lib)/perl
+#define InstallPerlDir $(shell perl -MConfig -e '$$x = $$Config{vendorarchexp}; $$x =~ s!$$Config{prefix}!$(prefix)! ; print $$x')
#endif
#if defined(_WIN32)
#define InstallPythonDir \\cern.ch\dfs\Applications\CERN\LFC\lib\python
#else
-#define InstallPythonDir $(prefix)/$(_lib)/python
+#define InstallPythonDir $(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,'$(prefix)')")
#endif
#define LibManDir $(prefix)/share/man/man3
#define LibManSuffix 3
@@ -119,7 +119,7 @@
#define RemoteHostsList /etc/shift.remhosts
#endif
#define RfioSpool /var/log/rfio
-#define SacctDir /usr/spool/sacct
+#define SacctDir /var/spool/sacct
#if defined(_WIN32)
#define ShiftConfigFile %%SystemRoot%%\\system32\\drivers\\etc\\shift.conf
#else
diff -ur lcgdm-1.7.4.4.orig/configure lcgdm-1.7.4.4/configure
--- lcgdm-1.7.4.4.orig/configure 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/configure 2010-03-29 19:27:36.804794633 +0200
@@ -177,6 +177,19 @@
$SITE_DEF >$SITE_DEF.new
mv $SITE_DEF.new $SITE_DEF
;;
+ --with-sysconf-dir*)
+ if [ '--with-sysconf-dir' = "$1" ]; then
+ location="$2"
+ shift
+ else
+ location=`echo $1 | cut -d= -f 2`
+ fi
+ shift
+ [ 'yes' = "$VERBOSE" ] && echo "Sysconf dir: $location"
+ sed -e "s# SysconfDir\ .*\$# SysconfDir $location#" \
+ $SITE_DEF >$SITE_DEF.new
+ mv $SITE_DEF.new $SITE_DEF
+ ;;
--with-gsoap-location*)
if [ '--with-gsoap-location' = "$1" ]; then
location="$2"
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 19:27:36.804794633 +0200
@@ -242,14 +242,14 @@
_dpm2.so \
dpm2.py
IDPM_IFCE = $(PERLDIR) \
- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \
+ $(PYTHONDIR) \
FileName($(BIN),ProgramTargetName(dpm-listspaces)) \
FileName($(PERLDIR),dpm.so) \
FileName($(PERLDIR),dpm.pm) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm2.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm2.py)
+ FileName($(PYTHONDIR),_dpm.so) \
+ FileName($(PYTHONDIR),dpm.py) \
+ FileName($(PYTHONDIR),_dpm2.so) \
+ FileName($(PYTHONDIR),dpm2.py)
#endif
DPMLIB_OBJS = dpm_abortfiles.Osuf \
@@ -436,10 +436,10 @@
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
-InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR))
+InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR))
InstallProgram(dpm-listspaces,$(BIN),root,bin,755)
MakeDir($(BIN),root,bin,0755)
@@ -452,7 +452,7 @@
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755)
+MakeDir($(PYTHONDIR),root,root,0755)
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESSERVER) $(MANPAGESIFCE)
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
--- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-03-29 19:27:36.805795737 +0200
@@ -240,17 +240,17 @@
_lfc2thr.so\
lfc2thr.py
ILFC_IFCE = $(PERLDIR) \
- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \
+ $(PYTHONDIR) \
FileName($(PERLDIR),lfc.so) \
FileName($(PERLDIR),lfc.pm) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfcthr.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfcthr.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2thr.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2thr.py)
+ FileName($(PYTHONDIR),_lfc.so) \
+ FileName($(PYTHONDIR),lfc.py) \
+ FileName($(PYTHONDIR),_lfcthr.so) \
+ FileName($(PYTHONDIR),lfcthr.py) \
+ FileName($(PYTHONDIR),_lfc2.so) \
+ FileName($(PYTHONDIR),lfc2.py) \
+ FileName($(PYTHONDIR),_lfc2thr.so) \
+ FileName($(PYTHONDIR),lfc2thr.py)
#endif
NSDAEMON_OBJS = Cns_main.Osuf \
@@ -477,8 +477,8 @@
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
-InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR))
lfc2.py : _lfc2.so
_lfc2.so : lfc2.i ../h/lfc_api.h ../h/Cns_api.h
@@ -487,8 +487,8 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
-InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
lfcthr.py : _lfcthr.so
_lfcthr.so : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h
@@ -497,8 +497,8 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
-InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
lfc2thr.py : _lfc2thr.so
_lfc2thr.so : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h
@@ -507,12 +507,12 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
-InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755)
+MakeDir($(PYTHONDIR),root,root,0755)
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESLIBRARY) $(MANPAGESSERVER) $(MANPAGESIFCE)
lcgdm-porting.patch:
common/solveln.c | 3 +++
config/Imake.tmpl | 2 +-
config/linux.cf | 2 +-
dpm/dpm.i | 1 -
ns/Cns.i | 1 -
ns/Cns_readdir.c | 9 +++++++--
ns/lfc.i | 1 -
rfio/popen.c | 3 +++
rfio/readdir.c | 11 ++++++++++-
rfio/rename.c | 3 +++
rfio/rfio_call64.c | 3 +++
rfio/rfio_callhandlers.c | 3 +++
rfio/rfio_calls.c | 3 +++
rfio/rfio_fcalls.c | 3 +++
rfio/rfio_rdirfdt.c | 3 +++
rfio/rfio_rfilefdt.c | 3 +++
rfio/rfio_serv.c | 3 +++
rfio/xyopen.c | 3 +++
18 files changed, 52 insertions(+), 8 deletions(-)
--- NEW FILE lcgdm-porting.patch ---
diff -ur lcgdm-1.7.4.4.orig/common/solveln.c lcgdm-1.7.4.4/common/solveln.c
--- lcgdm-1.7.4.4.orig/common/solveln.c 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/common/solveln.c 2010-03-29 20:43:11.089582687 +0200
@@ -19,6 +19,9 @@
#include <sys/param.h>
#endif
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <string.h>
#if defined(_WIN32)
#include <direct.h>
diff -ur lcgdm-1.7.4.4.orig/config/Imake.tmpl lcgdm-1.7.4.4/config/Imake.tmpl
--- lcgdm-1.7.4.4.orig/config/Imake.tmpl 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/Imake.tmpl 2010-03-29 20:43:11.089582687 +0200
@@ -19,7 +19,7 @@
#if hpux
#include <hp.cf>
#endif
-#if linux
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
#include <linux.cf>
#endif
#if __Lynx__
diff -ur lcgdm-1.7.4.4.orig/config/linux.cf lcgdm-1.7.4.4/config/linux.cf
--- lcgdm-1.7.4.4.orig/config/linux.cf 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/linux.cf 2010-03-29 20:43:11.089582687 +0200
@@ -10,7 +10,7 @@
GSOAP_PLATFORM = linux
#define linux 1
#define HasRanlib YES
-CC += -fPIC -D_LARGEFILE64_SOURCE
+CC += -fPIC -D_LARGEFILE64_SOURCE -Dlinux
MTCCFLAGS = -pthread -DCTHREAD_LINUX -D_THREAD_SAFE -D_REENTRANT
MTLDLIBS =
MTLDFLAGS = -pthread
diff -ur lcgdm-1.7.4.4.orig/dpm/dpm.i lcgdm-1.7.4.4/dpm/dpm.i
--- lcgdm-1.7.4.4.orig/dpm/dpm.i 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/dpm/dpm.i 2010-03-29 20:43:11.090794502 +0200
@@ -1530,7 +1530,6 @@
%include "dpm_struct.h"
struct dirent {
long d_ino;
- long d_off;
unsigned short d_reclen;
char d_name[256];
};
diff -ur lcgdm-1.7.4.4.orig/ns/Cns.i lcgdm-1.7.4.4/ns/Cns.i
--- lcgdm-1.7.4.4.orig/ns/Cns.i 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns.i 2010-03-29 20:43:11.090794502 +0200
@@ -182,7 +182,6 @@
struct dirent {
long d_ino;
- long d_off;
unsigned short d_reclen;
char d_name[256];
};
diff -ur lcgdm-1.7.4.4.orig/ns/Cns_readdir.c lcgdm-1.7.4.4/ns/Cns_readdir.c
--- lcgdm-1.7.4.4.orig/ns/Cns_readdir.c 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Cns_readdir.c 2010-03-29 20:43:11.091794557 +0200
@@ -120,7 +120,7 @@
#endif
while (nbentries--) {
dp->d_ino = 0;
-#if defined(linux) || defined(sgi) || defined(SOLARIS)
+#if defined(__linux__) || defined(sgi) || defined(SOLARIS)
dp->d_off = 0;
#endif
#if defined(_AIX)
@@ -131,7 +131,7 @@
#endif
unmarshall_STRING (rbp, dp->d_name);
n = strlen (dp->d_name);
-#if defined(_AIX) || (defined(__alpha) && defined(__osf__)) || defined(hpux) || defined(__APPLE__)
+#if defined(_AIX) || (defined(__alpha) && defined(__osf__)) || defined(hpux) || defined(__APPLE__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
dp->d_namlen = n;
#endif
dp->d_reclen = ((direntsz + n + 8) / 8) * 8;
@@ -174,10 +174,15 @@
namlen = strlen (dp64->d_name);
dp32 = (struct dirent *) dp64;
dp32->d_ino = dp64->d_ino;
+#if defined(SOLARIS) || defined(__linux__)
dp32->d_off = dp64->d_off;
+#endif
#if defined(linux)
dp32->d_type = dp64->d_type;
#endif
+#if defined(__GNU__) || defined(__FreeBSD_kernel__)
+ dp32->d_namlen = dp64->d_namlen;
+#endif
strcpy (dp32->d_name, dp64->d_name);
dp32->d_reclen = ((&dp32->d_name[0] - (char *) dp32 + namlen + 8) / 8) * 8;
return (dp32);
diff -ur lcgdm-1.7.4.4.orig/ns/lfc.i lcgdm-1.7.4.4/ns/lfc.i
--- lcgdm-1.7.4.4.orig/ns/lfc.i 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/lfc.i 2010-03-29 20:43:11.091794557 +0200
@@ -1339,7 +1339,6 @@
%include "Cns_struct.h"
struct dirent {
long d_ino;
- long d_off;
unsigned short d_reclen;
char d_name[256];
};
diff -ur lcgdm-1.7.4.4.orig/rfio/popen.c lcgdm-1.7.4.4/rfio/popen.c
--- lcgdm-1.7.4.4.orig/rfio/popen.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/popen.c 2010-03-29 20:43:11.092794683 +0200
@@ -23,6 +23,9 @@
#else
#include <sys/param.h> /* For MAXHOSTNAMELEN definition */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <stdlib.h>
#include <errno.h>
#include <string.h>
diff -ur lcgdm-1.7.4.4.orig/rfio/readdir.c lcgdm-1.7.4.4/rfio/readdir.c
--- lcgdm-1.7.4.4.orig/rfio/readdir.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/readdir.c 2010-03-29 20:43:11.092794683 +0200
@@ -133,7 +133,7 @@
dirp->offset++;
dirp->dp.dd_loc = dirp->offset;
de->d_reclen = sizeof(struct dirent) + namlen;
-#if !defined(SOLARIS) && !defined(sgi) && !defined(linux)
+#if !defined(SOLARIS) && !defined(sgi) && !defined(__linux__)
de->d_namlen = namlen;
#endif
#ifdef SOLARIS
@@ -165,18 +165,27 @@
struct dirent *de32;
ino_t ino;
short namlen;
+#if defined(SOLARIS) || defined(__linux__)
off_t offset;
+#endif
if ((de32 = rfio_readdir(dirp)) == NULL)
return(NULL);
ino = de32->d_ino;
+#if defined(SOLARIS) || defined(__linux__)
offset = de32->d_off;
+#endif
namlen = strlen(de32->d_name);
de = (struct dirent64 *) de32;
memmove (de->d_name, de32->d_name, namlen + 1);
de->d_ino = ino;
+#if defined(SOLARIS) || defined(__linux__)
de->d_off = offset;
+#endif
+#if defined(__GNU__) || defined(__FreeBSD_kernel__)
+ de->d_namlen = namlen;
+#endif
de->d_reclen = ((&de->d_name[0] - (char *) de + namlen + 8) / 8) * 8;
return(de);
}
diff -ur lcgdm-1.7.4.4.orig/rfio/rename.c lcgdm-1.7.4.4/rfio/rename.c
--- lcgdm-1.7.4.4.orig/rfio/rename.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rename.c 2010-03-29 20:43:11.092794683 +0200
@@ -19,6 +19,9 @@
#else
#include <sys/param.h>
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include "rfio.h" /* Remote File I/O general definitions */
/*
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_call64.c lcgdm-1.7.4.4/rfio/rfio_call64.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_call64.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_call64.c 2010-03-29 20:43:11.093796974 +0200
@@ -24,6 +24,9 @@
#include <syslog.h> /* System logger */
#include <sys/time.h>
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#if defined(_AIX) || defined(hpux) || defined(SOLARIS) || defined(linux)
#include <signal.h>
#endif
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_callhandlers.c lcgdm-1.7.4.4/rfio/rfio_callhandlers.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_callhandlers.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_callhandlers.c 2010-03-29 20:43:11.094795284 +0200
@@ -23,6 +23,9 @@
#include <netdb.h>
#include <sys/param.h> /* For MAXHOSTNAMELEN definition */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <sys/stat.h>
#if defined(_WIN32)
#define R_OK 4
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_calls.c lcgdm-1.7.4.4/rfio/rfio_calls.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_calls.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_calls.c 2010-03-29 20:43:11.095794572 +0200
@@ -24,6 +24,9 @@
#include <syslog.h> /* System logger */
#include <sys/time.h>
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#if defined(_AIX) || defined(hpux) || defined(SOLARIS) || defined(linux)
#include <signal.h>
#endif
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_fcalls.c lcgdm-1.7.4.4/rfio/rfio_fcalls.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_fcalls.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_fcalls.c 2010-03-29 20:43:11.096794488 +0200
@@ -27,6 +27,9 @@
#else
#include <sys/param.h> /* System parameters */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <pwd.h>
/*
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_rdirfdt.c lcgdm-1.7.4.4/rfio/rfio_rdirfdt.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_rdirfdt.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_rdirfdt.c 2010-03-29 20:43:11.096794488 +0200
@@ -15,6 +15,9 @@
#else
#include <sys/param.h> /* For MAXHOSTNAMELEN definition */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <stdlib.h>
#include "rfio.h"
#include "rfio_rdirfdt.h"
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_rfilefdt.c lcgdm-1.7.4.4/rfio/rfio_rfilefdt.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_rfilefdt.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_rfilefdt.c 2010-03-29 20:43:11.097794614 +0200
@@ -15,6 +15,9 @@
#else
#include <sys/param.h> /* For MAXHOSTNAMELEN definition */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <stdlib.h>
#include "rfio.h"
#include "rfio_rfilefdt.h"
diff -ur lcgdm-1.7.4.4.orig/rfio/rfio_serv.c lcgdm-1.7.4.4/rfio/rfio_serv.c
--- lcgdm-1.7.4.4.orig/rfio/rfio_serv.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/rfio_serv.c 2010-03-29 20:43:11.097794614 +0200
@@ -37,6 +37,9 @@
#include <sys/time.h> /* time definitions */
#include <sys/param.h> /* System parameters */
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#ifndef _WIN32
#include <sys/wait.h> /* wait, wait3, wait4 (BSD) */
#endif
diff -ur lcgdm-1.7.4.4.orig/rfio/xyopen.c lcgdm-1.7.4.4/rfio/xyopen.c
--- lcgdm-1.7.4.4.orig/rfio/xyopen.c 2010-03-29 16:21:45.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/xyopen.c 2010-03-29 20:43:11.098795298 +0200
@@ -36,6 +36,9 @@
#else
#include <sys/param.h>
#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64
+#endif
#include <errno.h>
#include <string.h>
#include <stdlib.h>
lcgdm-shliblink.patch:
config/Imake.rules | 2 +-
dicomcopy/Imakefile | 8 ++++----
dli/Imakefile | 6 +++---
dpm/Imakefile | 19 ++++++++++---------
dpmcopy/Imakefile | 10 +++++-----
lib/Imakefile | 10 +++++-----
ns/Imakefile | 18 +++++++++---------
ns/Imakefile.dpns | 6 +++---
ns/Imakefile.lfc | 19 ++++++++++---------
rfio/Imakefile | 14 +++++++-------
security/Imakefile | 4 ++--
shlib/Imakefile | 5 ++---
srmv1/Imakefile | 8 ++++----
srmv2.2/Imakefile | 8 ++++----
srmv2/Imakefile | 8 ++++----
15 files changed, 73 insertions(+), 72 deletions(-)
--- NEW FILE lcgdm-shliblink.patch ---
diff -ur lcgdm-1.7.4.4.orig/config/Imake.rules lcgdm-1.7.4.4/config/Imake.rules
--- lcgdm-1.7.4.4.orig/config/Imake.rules 2010-04-03 11:36:00.643794299 +0200
+++ lcgdm-1.7.4.4/config/Imake.rules 2010-04-03 11:36:19.959544559 +0200
@@ -95,7 +95,7 @@
#ifndef NormalProgramTarget
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
- $(CC) -o $@ $(LDFLAGS) objects libs
+ LD_LIBRARY_PATH=../shlib $(CC) -o $@ $(LDFLAGS) objects libs
#endif
#ifndef MakeSubdirs
diff -ur lcgdm-1.7.4.4.orig/dicomcopy/Imakefile lcgdm-1.7.4.4/dicomcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dicomcopy/Imakefile 2010-04-03 11:35:57.283543277 +0200
+++ lcgdm-1.7.4.4/dicomcopy/Imakefile 2010-04-03 17:13:13.445544982 +0200
@@ -27,7 +27,7 @@
#if SOLARIS
LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl -ldl
#else
-LIBS = -L../shlib -ldpm -llcgdm $(LIBCSEC) -ldl
+LIBS = -L../shlib -ldpm -llcgdm -ldl
#endif
SPOOL = DicomcopySpool
LOGFILE = FileName($(SPOOL),log)
@@ -42,7 +42,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
DBCREAT = create_dicomcopy_tables_mysql.sql
#else
#if UsePostgres
@@ -64,7 +64,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
@@ -146,7 +146,7 @@
NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf)
SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf
- $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
+ $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf -L../shlib -ldpm -llcgdm
install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL)
diff -ur lcgdm-1.7.4.4.orig/dli/Imakefile lcgdm-1.7.4.4/dli/Imakefile
--- lcgdm-1.7.4.4.orig/dli/Imakefile 2010-03-30 07:04:18.000000000 +0200
+++ lcgdm-1.7.4.4/dli/Imakefile 2010-04-03 11:36:44.917544729 +0200
@@ -20,9 +20,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
-LIBS = -L../lib -llfc -ldl -lsocket -lnsl
+LIBS = -L../shlib -llfc -llcgdm -lsocket -lnsl
#else
-LIBS = -L../lib -llfc -ldl
+LIBS = -L../shlib -llfc -llcgdm
#endif
SPOOL = DliSpool
LOGFILE = FileName($(SPOOL),log)
@@ -62,7 +62,7 @@
$(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS))
-NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),$(LIBS))
+NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),)
rc.lfc-dli: lfc-dli.scripts
$(CP) $? $@
lfc-dli.conf.templ: lfc-dli.sysconfig
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-04-03 11:35:57.283543277 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-04-03 13:11:20.501544293 +0200
@@ -10,8 +10,9 @@
PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]")
PYTHON_PREFIX=$(shell python -c "import os; import sys; print os.path.normpath(sys.prefix)")
INCLUDE_PYTHON=-I$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
-PYTHON_LIB=$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
+PYTHON_LIB=-L$(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDEST')")/config -lpython$(PYTHON_VERSION) $(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS')")
INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
+PERL_LIB=-L$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') -lperl $(shell perl -MConfig -e 'print $$Config{perllibs};')
SWIG_LOCATION = SwigLocation
SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
#endif
@@ -28,7 +29,7 @@
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
-GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR)
+GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
LIBCSEC += $(GLOBUS_LIBS)
#endif
LIBCSEC += -ldl
@@ -41,12 +42,12 @@
#endif
INCLUDES = FileName(..,h)
#if SOLARIS
-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl
+LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl
#else
#if _WIN32
LIBS = ..\lib\dpm.lib wsock32.lib advapi32.lib
#else
-LIBS = -L../lib -ldpm $(LIBCSEC)
+LIBS = -L../shlib -ldpm -llcgdm
#endif
#endif
LIBUUID =
@@ -77,7 +78,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
DBCREAT = create_dpm_tables_mysql.sql
#else
#if UsePostgres
@@ -109,7 +110,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
@@ -418,21 +419,21 @@
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
- $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(PERL_LIB) $(LIBS)
dpm.py : _dpm.so
_dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm_wrap.o dpm_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_DPNS dpm.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(PYTHON_LIB) $(LIBS)
dpm2.py : _dpm2.so
_dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm2_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
+ $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
diff -ur lcgdm-1.7.4.4.orig/dpmcopy/Imakefile lcgdm-1.7.4.4/dpmcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dpmcopy/Imakefile 2010-03-30 07:04:16.000000000 +0200
+++ lcgdm-1.7.4.4/dpmcopy/Imakefile 2010-04-03 13:46:34.253544868 +0200
@@ -23,7 +23,7 @@
GLOBUS_FLAVOUR=GlobusFlavour
VOMS_FLAVOUR=GlobusFlavour
GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
-GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR)
+GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
@@ -37,9 +37,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl
+LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl
#else
-LIBS = -L../lib -ldpm $(LIBCSEC)
+LIBS = -L../shlib -ldpm -llcgdm
#endif
SPOOL = DpmcopySpool
LOGFILE = FileName($(SPOOL),log)
@@ -53,7 +53,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
#else
#if UsePostgres
DBOBJS = dpm_libpq_ifce.Osuf
@@ -73,7 +73,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
diff -ur lcgdm-1.7.4.4.orig/lib/Imakefile lcgdm-1.7.4.4/lib/Imakefile
--- lcgdm-1.7.4.4.orig/lib/Imakefile 2010-03-30 07:04:16.000000000 +0200
+++ lcgdm-1.7.4.4/lib/Imakefile 2010-04-03 11:36:19.961544880 +0200
@@ -34,7 +34,9 @@
install: $(LIB) FileName($(LIB),LibraryTargetName(dpm))
export: $(EXPORTLIB)/libdpm.a
-#else
+#endif
+#endif
+
COMM Libraries to include in LibraryTargetame(lcgdm)
all: LibraryTargetName(lcgdm)
@@ -42,16 +44,14 @@
install: $(LIB) FileName($(LIB),LibraryTargetName(lcgdm))
export: $(EXPORTLIB)/liblcgdm.a
-#endif
-#endif
exportman:
exportshr:
-liblfc.a: $(COMMONLIB) $(NSLIB) $(SECURITYLIB)
+liblfc.a: $(NSLIB)
-libdpm.a: $(COMMONLIB) $(RFIOLIB) $(NSLIB) $(DPMLIB) $(SECURITYLIB)
+libdpm.a: $(RFIOLIB) $(NSLIB) $(DPMLIB)
liblcgdm.a: $(COMMONLIB) $(SECURITYLIB)
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile lcgdm-1.7.4.4/ns/Imakefile
--- lcgdm-1.7.4.4.orig/ns/Imakefile 2010-03-30 07:04:17.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile 2010-04-03 12:00:26.054545073 +0200
@@ -36,27 +36,27 @@
INCLUDES = FileName(..,h)
TOPLIBRARYNAME = TopLibraryName
#if _AIX
-LIBS = -L../lib -l$(TOPLIBRARYNAME)
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm
#else
#if defined(__alpha) && defined(__osf__)
-LIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive
+LIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -so_archive
#else
#if hpux
-LIBS = -L../lib -l$(TOPLIBRARYNAME)
+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)
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm
#else
#if SOLARIS
-LIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lsocket -lnsl
#else
#if _WIN32
LIBS = ..\lib\$(TOPLIBRARYNAME).lib wsock32.lib advapi32.lib
#else
-LIBS = -L../lib -l$(TOPLIBRARYNAME)
+LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm
#endif
#endif
#endif
@@ -71,7 +71,7 @@
#if _WIN32
NSLIB = ns.lib
#else
-NSLIB = -L. -lns
+NSLIB =
#endif
SPOOL = NsSpool
LOGFILE = FileName($(SPOOL),log)
@@ -98,7 +98,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
#else
#if UsePostgres
DBOBJS = Cns_libpq_ifce.Osuf
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.dpns lcgdm-1.7.4.4/ns/Imakefile.dpns
--- lcgdm-1.7.4.4.orig/ns/Imakefile.dpns 2010-03-30 07:04:17.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.dpns 2010-04-03 11:36:19.962544517 +0200
@@ -22,7 +22,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
@@ -299,9 +299,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)"
#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))
#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.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
--- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-04-03 11:35:57.284544450 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-04-03 12:22:50.062545793 +0200
@@ -24,15 +24,16 @@
PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]")
PYTHON_PREFIX=$(shell python -c "import os; import sys; print os.path.normpath(sys.prefix)")
INCLUDE_PYTHON=-I$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
-PYTHON_LIB=$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
+PYTHON_LIB=-L$(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDEST')")/config -lpython$(PYTHON_VERSION) $(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS')")
INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
SWIG_LOCATION = SwigLocation
+PERL_LIB=-L$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') -lperl $(shell perl -MConfig -e 'print $$Config{perllibs};')
SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
#endif
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,lfc)
+DEPLIB = DepSharedLibraryTargetName(shlib,lfc)
COMM######################### RULES ##############################
@@ -366,9 +367,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)"
#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))
#endif
NormalProgramTarget(lfc-delcomment,nsdelcomment.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
NormalProgramTarget(lfc-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
@@ -466,14 +467,14 @@
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
- $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(PERL_LIB) $(LIBS)
lfc.py : _lfc.so
_lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h
RemoveFiles(lfc_wrap.o lfc_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
@@ -485,7 +486,7 @@
RemoveFiles(lfc2_wrap.o lfc2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
@@ -495,7 +496,7 @@
RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfcthr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
@@ -505,7 +506,7 @@
RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c)
$(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2thr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
- $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
+ $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
diff -ur lcgdm-1.7.4.4.orig/rfio/Imakefile lcgdm-1.7.4.4/rfio/Imakefile
--- lcgdm-1.7.4.4.orig/rfio/Imakefile 2010-03-30 07:04:16.000000000 +0200
+++ lcgdm-1.7.4.4/rfio/Imakefile 2010-04-03 13:05:06.320544757 +0200
@@ -94,24 +94,24 @@
#endif
FFLAGS = $(FFOPTFLAGS) $(FPPUFL)
#if defined(__alpha) && defined(__osf__)
-LDLIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive
+LDLIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -so_archive
#else
#if linux
-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl $(MTLDLIBS)
+LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS)
#else
#if SOLARIS
-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl
+LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lsocket -lnsl
#else
#if sgi
-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS)
+LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS)
#else
#if __Lynx__
-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lnsl -lbsd
+LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lnsl -lbsd
#else
#if _WIN32
LDLIBS = ..\lib\$(TOPLIBRARYNAME).lib ws2_32.lib advapi32.lib mpr.lib
#else
-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS)
+LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS)
#endif
#endif
#endif
@@ -121,7 +121,7 @@
#if _WIN32
RFIOLIB = rfio.lib
#else
-RFIOLIB = -L. -lrfio
+RFIOLIB =
#endif
LIBS = $(OPTLIBS)
diff -ur lcgdm-1.7.4.4.orig/security/Imakefile lcgdm-1.7.4.4/security/Imakefile
--- lcgdm-1.7.4.4.orig/security/Imakefile 2010-04-03 11:36:00.644794634 +0200
+++ lcgdm-1.7.4.4/security/Imakefile 2010-04-03 11:36:19.963544573 +0200
@@ -49,9 +49,9 @@
#define GSIMech GSI
#define SecAuthMechGSI -DGSI
#define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE)
-#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB)
+#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
#define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE)
-#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) $(VOMS_LIB)
+#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto
#else
#define GSIMech
#endif
diff -ur lcgdm-1.7.4.4.orig/shlib/Imakefile lcgdm-1.7.4.4/shlib/Imakefile
--- lcgdm-1.7.4.4.orig/shlib/Imakefile 2010-04-03 11:36:00.644794634 +0200
+++ lcgdm-1.7.4.4/shlib/Imakefile 2010-04-03 11:36:19.964543441 +0200
@@ -35,7 +35,6 @@
install: $(LIB) FileName($(LIB),SharedLibraryTargetName(dpm))
export: $(EXPORTLIB)/SharedLibraryTargetName(dpm)
-#else
#endif
#endif
@@ -60,7 +59,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o -L .. -llcgdm $(LIBCSEC))
@-rm $@.`echo $(VERSION)|cut -f1 -d.`
@-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
@@ -71,7 +70,7 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -ldl $(LIBCSEC))
@-rm $@.`echo $(VERSION)|cut -f1 -d.`
@-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
diff -ur lcgdm-1.7.4.4.orig/srmv1/Imakefile lcgdm-1.7.4.4/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/srmv1/Imakefile 2010-03-30 07:04:18.000000000 +0200
+++ lcgdm-1.7.4.4/srmv1/Imakefile 2010-04-03 13:06:57.023545111 +0200
@@ -41,9 +41,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl
+LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl
#else
-LIBS = -L../lib -ldpm $(LIBCSEC)
+LIBS = -L../shlib -ldpm -llcgdm
#endif
#ifndef darwin
LIBS += -luuid
@@ -60,7 +60,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
@@ -80,7 +80,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
diff -ur lcgdm-1.7.4.4.orig/srmv2/Imakefile lcgdm-1.7.4.4/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2/Imakefile 2010-03-30 07:04:18.000000000 +0200
+++ lcgdm-1.7.4.4/srmv2/Imakefile 2010-04-03 13:07:20.482545044 +0200
@@ -41,9 +41,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl
+LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl
#else
-LIBS = -L../lib -ldpm $(LIBCSEC)
+LIBS = -L../shlib -ldpm -llcgdm
#endif
#ifndef darwin
LIBS += -luuid
@@ -60,7 +60,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
@@ -80,7 +80,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
diff -ur lcgdm-1.7.4.4.orig/srmv2.2/Imakefile lcgdm-1.7.4.4/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2.2/Imakefile 2010-03-30 07:04:16.000000000 +0200
+++ lcgdm-1.7.4.4/srmv2.2/Imakefile 2010-04-03 13:07:34.992543914 +0200
@@ -42,9 +42,9 @@
INCLUDES = FileName(..,h)
BACKEND_LIBS = DepLibraryTargetName(dpmcopy,dpmcopy)
#if SOLARIS
-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl
+LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl
#else
-LIBS = -L../lib -ldpm $(LIBCSEC)
+LIBS = -L../shlib -ldpm -llcgdm
#endif
#ifndef darwin
LIBS += -luuid
@@ -61,7 +61,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm
+LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
@@ -81,7 +81,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
-DEPLIB = DepLibraryTargetName(lib,dpm)
+DEPLIB = DepSharedLibraryTargetName(shlib,dpm)
COMM######################### RULES ##############################
lcgdm-typo.patch:
Imakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE lcgdm-typo.patch ---
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 22:40:41.110544751 +0200
@@ -427,7 +427,7 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
-dpm2_py : _dpm2.so
+dpm2.py : _dpm2.so
_dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
$(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
lcgdm-usr.patch:
dicomcopy/Imakefile | 2 +-
dli/Imakefile | 4 ++--
dpm/Imakefile | 6 +++---
dpmcopy/Imakefile | 14 +++++++-------
ns/Imakefile | 2 +-
security/Imakefile | 12 ++++++------
socket/dpmcli/module.mk | 4 ++--
srmv1/Imakefile | 10 +++++-----
srmv2.2/Imakefile | 10 +++++-----
srmv2/Imakefile | 10 +++++-----
test/srmv1/Imakefile | 6 +++---
test/srmv2.2/Imakefile | 6 +++---
test/srmv2/Imakefile | 6 +++---
13 files changed, 46 insertions(+), 46 deletions(-)
--- NEW FILE lcgdm-usr.patch ---
diff -ur LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile LCG-DM-1.7.3.1/dicomcopy/Imakefile
--- LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile 2009-09-24 11:39:03.731117679 +0200
+++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-24 11:39:46.617121785 +0200
@@ -12,7 +12,7 @@
#if UseGSI
GLOBUS_LOCATION=GlobusLocation
GLOBUS_FLAVOUR=GlobusFlavour
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
LIBCSEC += $(GLOBUS_LIBS)
#endif
#if UseVirtualIds
diff -ur LCG-DM-1.7.3.1.orig/dli/Imakefile LCG-DM-1.7.3.1/dli/Imakefile
--- LCG-DM-1.7.3.1.orig/dli/Imakefile 2009-09-24 11:39:03.732119266 +0200
+++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-24 11:39:46.618118396 +0200
@@ -13,7 +13,7 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
@@ -31,7 +31,7 @@
DFLAGS = -DLOGFILE=\"$(LOGFILE)\" $(SOAPFLG)
-CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(VOMS_LOCATION)/include $(MTCCFLAGS) $(DFLAGS)
+CFLAGS = -g -I$(INCLUDES) -I$(VOMS_LOCATION)/include/voms $(MTCCFLAGS) $(DFLAGS)
COMM######################### RULES ##############################
diff -ur LCG-DM-1.7.3.1.orig/dpm/Imakefile LCG-DM-1.7.3.1/dpm/Imakefile
--- LCG-DM-1.7.3.1.orig/dpm/Imakefile 2009-09-24 11:39:03.733118892 +0200
+++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-24 11:39:46.619119351 +0200
@@ -27,8 +27,8 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
-GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common
LIBCSEC += $(GLOBUS_LIBS)
#endif
LIBCSEC += -ldl
@@ -301,7 +301,7 @@
all: $(CLIENT) $(SERVER) $(DPM_IFCE)
dpm_copyfile.o: dpm_copyfile.c
- $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c
+ $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c
dicomcopy_libpq_ifce.c: DepSourceName(dicomcopy,dicomcopy_libpq_ifce.c)
RemoveFile(dicomcopy_libpq_ifce.c)
diff -ur LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile LCG-DM-1.7.3.1/dpmcopy/Imakefile
--- LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile 2009-09-24 11:39:26.762119985 +0200
+++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-24 11:40:25.107118597 +0200
@@ -22,17 +22,17 @@
GLOBUS_LOCATION=GlobusLocation
GLOBUS_FLAVOUR=GlobusFlavour
VOMS_FLAVOUR=GlobusFlavour
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
-GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
#if UseVOMS
-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -69,7 +69,7 @@
-DLOGFILE=\"$(LOGFILE)\" \
$(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
+CFLAGS = -g -I$(INCLUDES) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -124,7 +124,7 @@
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
dpm_copyfile.Osuf: dpm_copyfile.c
- $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c
+ $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c
dpmcopy_inc_reqctr.Osuf: dpmcopy_inc_reqctr.c
$(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c
send2dpmcopyd.Osuf: send2dpmcopyd.c
diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile LCG-DM-1.7.3.1/ns/Imakefile
--- LCG-DM-1.7.3.1.orig/ns/Imakefile 2009-09-24 11:38:54.638117192 +0200
+++ LCG-DM-1.7.3.1/ns/Imakefile 2009-09-24 11:39:46.622118368 +0200
@@ -22,7 +22,7 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
LIBCSEC += $(GLOBUS_LIBS)
#endif
LIBCSEC += -ldl
diff -ur LCG-DM-1.7.3.1.orig/security/Imakefile LCG-DM-1.7.3.1/security/Imakefile
--- LCG-DM-1.7.3.1.orig/security/Imakefile 2009-09-24 11:38:50.587119335 +0200
+++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-24 11:39:46.637118113 +0200
@@ -43,15 +43,15 @@
VOMS_FLAVOUR=GlobusFlavour/**/pthr
#endif
#if UseVOMS
-VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/glite/security/voms -DUSE_VOMS
-VOMS_LIB=-L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
+VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/voms -DUSE_VOMS
+VOMS_LIB=-lvomsapi
#endif
#define GSIMech GSI
#define SecAuthMechGSI -DGSI
-#define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE)
-#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
-#define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE)
-#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto
+#define SecIncludeDirGSI -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE)
+#define SecLibsGSI -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto
+#define SecIncludeDirGSIpthr -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE)
+#define SecLibsGSIpthr -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto
#else
#define GSIMech
#endif
diff -ur LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk LCG-DM-1.7.3.1/socket/dpmcli/module.mk
--- LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk 2009-09-24 11:38:54.640119152 +0200
+++ LCG-DM-1.7.3.1/socket/dpmcli/module.mk 2009-09-24 11:39:46.637118113 +0200
@@ -80,8 +80,8 @@
GLOBUS_FLAVOUR=gcc32dbgpthr
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-GGC_LIB=-L$(GLOBUS_LOCATION)/lib -lglobus_gass_copy_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
+GGC_LIB=-lglobus_gass_copy
CSECFLAG = -DCSEC
LIBCSEC += $(GLOBUS_LIBS)
diff -ur LCG-DM-1.7.3.1.orig/srmv1/Imakefile LCG-DM-1.7.3.1/srmv1/Imakefile
--- LCG-DM-1.7.3.1.orig/srmv1/Imakefile 2009-09-24 11:39:03.741119734 +0200
+++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-24 11:40:48.437118837 +0200
@@ -27,16 +27,16 @@
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
VOMS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
#if UseVOMS
-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -76,7 +76,7 @@
-DLOGFILE=\"$(LOGFILE)\" \
$(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
COMM######################### DEPENDENCY LIBRARIES ###############
diff -ur LCG-DM-1.7.3.1.orig/srmv2/Imakefile LCG-DM-1.7.3.1/srmv2/Imakefile
--- LCG-DM-1.7.3.1.orig/srmv2/Imakefile 2009-09-24 11:39:03.742120361 +0200
+++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-24 11:41:08.123118066 +0200
@@ -27,16 +27,16 @@
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
VOMS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
#if UseVOMS
-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -76,7 +76,7 @@
-DLOGFILE=\"$(LOGFILE)\" \
$(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
COMM######################### DEPENDENCY LIBRARIES ###############
diff -ur LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile LCG-DM-1.7.3.1/srmv2.2/Imakefile
--- LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile 2009-09-24 11:39:03.742120361 +0200
+++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-24 11:41:46.008118414 +0200
@@ -27,16 +27,16 @@
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
VOMS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
#if UseVOMS
-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
@@ -77,7 +77,7 @@
-DLOGFILE=\"$(LOGFILE)\" \
$(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
COMM######################### DEPENDENCY LIBRARIES ###############
diff -ur LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile LCG-DM-1.7.3.1/test/srmv1/Imakefile
--- LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile 2009-09-24 11:38:58.823117551 +0200
+++ LCG-DM-1.7.3.1/test/srmv1/Imakefile 2009-09-24 11:39:46.645117549 +0200
@@ -13,13 +13,13 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
SECFLG = -DGFAL_SECURE
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
SOAPFLG = -DWITH_IPV6
RFIOFLG = -DGFAL_ENABLE_RFIO
@@ -29,7 +29,7 @@
COMM######################### FLAGS ##############################
-CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES)
COMM######################### RULES ##############################
diff -ur LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile LCG-DM-1.7.3.1/test/srmv2/Imakefile
--- LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile 2009-09-24 11:38:58.823117551 +0200
+++ LCG-DM-1.7.3.1/test/srmv2/Imakefile 2009-09-24 11:39:46.646117565 +0200
@@ -13,13 +13,13 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
SECFLG = -DGFAL_SECURE
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
SOAPFLG = -DWITH_IPV6
RFIOFLG = -DGFAL_ENABLE_RFIO
@@ -29,7 +29,7 @@
COMM######################### FLAGS ##############################
-CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES)
COMM######################### RULES ##############################
diff -ur LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile LCG-DM-1.7.3.1/test/srmv2.2/Imakefile
--- LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile 2009-09-24 11:38:58.824119466 +0200
+++ LCG-DM-1.7.3.1/test/srmv2.2/Imakefile 2009-09-24 11:39:46.647117997 +0200
@@ -13,13 +13,13 @@
#else
GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
#endif
-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
GSOAP_LOCATION=GsoapLocation
GSOAP_VERSION=GsoapVersion
WSDL2H_FLAGS=GsoapWsdl2hFlags
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
SECFLG = -DGFAL_SECURE
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
SOAPFLG = -DWITH_IPV6
RFIOFLG = -DGFAL_ENABLE_RFIO
@@ -29,7 +29,7 @@
COMM######################### FLAGS ##############################
-CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES)
COMM######################### RULES ##############################
lcgdm-withsoname.patch:
config/Imake.rules | 11 ++++++++++-
security/Imakefile | 10 +++++-----
shlib/Imakefile | 9 +++++++--
3 files changed, 22 insertions(+), 8 deletions(-)
--- NEW FILE lcgdm-withsoname.patch ---
diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules
--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-09-26 11:26:50.095112437 +0200
+++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-26 11:27:12.522113078 +0200
@@ -156,7 +156,16 @@
dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
cp $? $@.rev @@\
-rm $@ @@\
- ln -s $?.rev $@
+ ln -s $?.rev $@ @@\
+ -rm $@.`echo rev|cut -f1 -d.` @@\
+ ln -s $?.rev $@.`echo rev|cut -f1 -d.`
+#endif
+
+#ifndef InstallPlugin
+#define InstallPlugin(libname,rev,dest) @@\
+dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+ -mv $@ dest/OLD$? @@\
+ cp $? $@
#endif
#ifndef MakeDir
diff -ur LCG-DM-1.7.3.1.orig/security/Imakefile LCG-DM-1.7.3.1/security/Imakefile
--- LCG-DM-1.7.3.1.orig/security/Imakefile 2009-09-26 11:26:50.105114271 +0200
+++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-26 11:27:12.523114634 +0200
@@ -214,11 +214,11 @@
MakeDir($(LIB),root,bin,0755)
-InstallSharedLibrary(Csec_plugin_ID,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_GSI,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_GSI_thread,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_KRB5,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_KRB4,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_ID,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_GSI,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_GSI_thread,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_KRB5,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_KRB4,$(VERSION),$(LIB))
MakeDir($(LIBMANDIR),root,bin,0755)
diff -ur LCG-DM-1.7.3.1.orig/shlib/Imakefile LCG-DM-1.7.3.1/shlib/Imakefile
--- LCG-DM-1.7.3.1.orig/shlib/Imakefile 2009-09-26 11:26:50.106115448 +0200
+++ LCG-DM-1.7.3.1/shlib/Imakefile 2009-09-26 11:27:38.631113134 +0200
@@ -60,7 +60,9 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ @-rm $@.`echo $(VERSION)|cut -f1 -d.`
+ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB)
@@ -69,7 +71,9 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ @-rm $@.`echo $(VERSION)|cut -f1 -d.`
+ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB)
@@ -101,6 +105,7 @@
@echo cleaning in CurDir
- at RemoveFiles(FilesToClean)
- at rm -rf tmp > /dev/null 2>&1
+ - at rm -f *.so.*
#endif
clobber: clean
--- NEW FILE lcgdm.spec ---
%{!?perl_vendorarch: %global perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: lcgdm
Version: 1.7.4.4
Release: 2%{?dist}
Summary: LHC Computing Grid Data Management
Group: System Environment/Libraries
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_7_4_4 lcgdm-1.7.4.4
# tar --exclude .svn -z -c -f lcgdm-1.7.4.4.tar.gz lcgdm-1.7.4.4
Source0: %{name}-%{version}.tar.gz
Source1: README.Fedora.lfc-mysql
Source2: README.Fedora.lfc-postgres
Source3: README.Fedora.dpm-mysql
Source4: README.Fedora.dpns-mysql
Source5: README.Fedora.dpm-postgres
Source6: README.Fedora.dpns-postgres
# Fix non-standard installation path
# https://savannah.cern.ch/bugs/?57526
Patch0: %{name}-paths.patch
# Fix makefile typo
# https://savannah.cern.ch/bugs/?65297
Patch1: %{name}-typo.patch
# Link using $(CC)
# https://savannah.cern.ch/bugs/?57527
Patch2: %{name}-ld.patch
# Fix soname issues
# https://savannah.cern.ch/bugs/?57528
Patch3: %{name}-withsoname.patch
# Link binaries using shared libraries
# https://savannah.cern.ch/bugs/?57529
Patch4: %{name}-shliblink.patch
# Link to gsoap library, fix parallel build
# https://savannah.cern.ch/bugs/?57530
Patch5: %{name}-gsoap.patch
# Fix man pages
# https://savannah.cern.ch/bugs/?65298
Patch6: %{name}-man.patch
# Fix build on GNU/Hurd and GNU/kFreeBSD
# https://savannah.cern.ch/bugs/?61071
Patch7: %{name}-porting.patch
# Adapt upstream's hardcoded include and library paths for Fedora
Patch8: %{name}-usr.patch
# Allow moving plugins out of default library search path
Patch9: %{name}-dlopen.patch
# Use Fedora's imake instead of bundled version
Patch10: %{name}-imake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: imake
%else
%if %{?fedora}%{!?fedora:0} >= 2 || %{?rhel}%{!?rhel:0} >= 4
BuildRequires: xorg-x11-devel
%else
BuildRequires: XFree86-devel
%endif
%endif
BuildRequires: globus-gssapi-gsi-devel%{?_isa}
BuildRequires: globus-gss-assist-devel%{?_isa}
BuildRequires: globus-gsi-credential-devel%{?_isa}
BuildRequires: globus-gsi-callback-devel%{?_isa}
BuildRequires: globus-gass-copy-devel%{?_isa}
BuildRequires: globus-ftp-client-devel%{?_isa}
BuildRequires: globus-common-devel%{?_isa}
BuildRequires: voms-devel%{?_isa}
BuildRequires: gsoap-devel%{?_isa}
BuildRequires: CGSI-gSOAP-devel%{?_isa}
BuildRequires: mysql-devel%{?_isa}
BuildRequires: postgresql-devel%{?_isa}
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: libuuid-devel%{?_isa}
%else
BuildRequires: e2fsprogs-devel%{?_isa}
%endif
BuildRequires: swig
%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: perl-devel%{?_isa}
%else
BuildRequires: perl
%endif
BuildRequires: python-devel%{?_isa}
%description
The lcgdm package contains common libraries for the LCG Data Management
components: the LFC (LCG File Catalog) and the DPM (Disk Pool Manager).
%package devel
Summary: LCG Data Management common development files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package contains common development libraries and header files
for LCG Data Management
%package -n lfc
Summary: LCG File Catalog (LFC)
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n lfc
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package contains the runtime LFC client library.
%package -n lfc-devel
Summary: LFC development libraries and header files
Group: Development/Libraries
Requires: lfc%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description -n lfc-devel
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package contains the development libraries and header files for LFC.
%package -n lfc-client
Summary: LCG File Catalog (LFC) client
Group: Applications/Internet
Requires: lfc%{?_isa} = %{version}-%{release}
%description -n lfc-client
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package contains the command line interfaces for the LFC.
%package -n lfc-perl
Summary: LCG File Catalog (LFC) perl bindings
Group: Applications/Internet
Requires: lfc%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description -n lfc-perl
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides Perl bindings for the LFC client library.
%package -n lfc-python
Summary: LCG File Catalog (LFC) python bindings
Group: Applications/Internet
Requires: lfc%{?_isa} = %{version}-%{release}
%description -n lfc-python
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides Python bindings for the LFC client library.
%package -n lfc-mysql
Summary: LCG File Catalog (LFC) server with MySQL database backend
Group: Applications/Internet
Provides: lfcdaemon = %{version}-%{release}
Requires: lfc%{?_isa} = %{version}-%{release}
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%description -n lfc-mysql
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides an LFC server that uses MySQL as its database
backend.
%package -n lfc-dli
Summary: LCG File Catalog (LFC) data location interface (dli) server
Group: Applications/Internet
Requires: lfcdaemon = %{version}-%{release}
Requires(pre): lfcdaemon
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%description -n lfc-dli
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides the data location interface (dli) server for the LFC.
%package -n lfc-postgres
Summary: LCG File Catalog (LFC) server with postgres database backend
Group: Applications/Internet
Provides: lfcdaemon = %{version}-%{release}
Requires: lfc%{?_isa} = %{version}-%{release}
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
%description -n lfc-postgres
The LCG File Catalog (LFC) keeps track of the locations of the physical
[...1941 lines suppressed...]
%ghost %{_sysconfdir}/sysconfig/dpm-srmv2
%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
%files -n dpm-mysql-srmv22
%defattr(-,root,root,-)
%{_libdir}/dpm-mysql/dpm-srmv2.2
%ghost %{_sbindir}/dpm-srmv2.2
%doc %{_libdir}/dpm-mysql/dpm-srmv2.2.8*
%ghost %{_mandir}/man8/dpm-srmv2.2.8*
%{_initrddir}/dpm-mysql-srmv22
%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.conf
%ghost %{_sysconfdir}/sysconfig/dpm-srmv2.2
%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2.2
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
%files -n dpm-rfiod
%defattr(-,root,root,-)
%{_sbindir}/dpm-rfiod
%{_initrddir}/dpm-rfiod
%config(noreplace) %{_sysconfdir}/sysconfig/dpm-rfiod
%config(noreplace) %{_sysconfdir}/logrotate.d/dpm-rfiod
%{_localstatedir}/log/dpm-rfio
%doc %{_mandir}/man8/dpm-rfiod.8*
%files -n dpm-postgres
%defattr(-,root,root,-)
%dir %{_libdir}/dpm-postgres
%{_libdir}/dpm-postgres/dpm
%ghost %{_sbindir}/dpm
%{_libdir}/dpm-postgres/dpm-shutdown
%ghost %{_sbindir}/dpm-shutdown
%doc %{_libdir}/dpm-postgres/dpm.8*
%ghost %{_mandir}/man8/dpm.8*
%doc %{_libdir}/dpm-postgres/dpm-shutdown.8*
%ghost %{_mandir}/man8/dpm-shutdown.8*
%{_libdir}/dpm-postgres/DPMCONFIG.templ
%ghost %{_datadir}/dpm/DPMCONFIG.templ
%dir %{_sysconfdir}/dpm-postgres
%{_initrddir}/dpm-postgres
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm.conf
%ghost %{_sysconfdir}/sysconfig/dpm
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm
%dir %{_datadir}/dpm
%{_datadir}/dpm/create_dpm_tables_postgres.sql
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/dpmmgr
%doc dpm-postgres/%{name}-%{version}/dpm/README.Fedora
%files -n dpm-postgres-nameserver
%defattr(-,root,root,-)
%{_libdir}/dpm-postgres/dpnsdaemon
%ghost %{_sbindir}/dpnsdaemon
%{_libdir}/dpm-postgres/dpns-shutdown
%ghost %{_sbindir}/dpns-shutdown
%doc %{_libdir}/dpm-postgres/dpnsdaemon.8*
%ghost %{_mandir}/man8/dpnsdaemon.8*
%doc %{_libdir}/dpm-postgres/dpns-shutdown.8*
%ghost %{_mandir}/man8/dpns-shutdown.8*
%{_libdir}/dpm-postgres/DPNSCONFIG.templ
%ghost %{_datadir}/dpm/DPNSCONFIG.templ
%{_initrddir}/dpm-postgres-nameserver
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpnsdaemon.conf
%ghost %{_sysconfdir}/sysconfig/dpnsdaemon
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpnsdaemon.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpnsdaemon
%{_datadir}/dpm/create_dpns_tables_postgres.sql
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpns
%doc dpm-postgres/%{name}-%{version}/ns/README.Fedora
%files -n dpm-postgres-copyd
%defattr(-,root,root,-)
%{_libdir}/dpm-postgres/dpmcopyd
%ghost %{_sbindir}/dpmcopyd
%doc %{_libdir}/dpm-postgres/dpmcopyd.8*
%ghost %{_mandir}/man8/dpmcopyd.8*
%{_initrddir}/dpm-postgres-copyd
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpmcopyd.conf
%ghost %{_sysconfdir}/sysconfig/dpmcopyd
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpmcopyd.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpmcopyd
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpmcopy
%files -n dpm-postgres-srmv1
%defattr(-,root,root,-)
%{_libdir}/dpm-postgres/dpm-srmv1
%ghost %{_sbindir}/dpm-srmv1
%doc %{_libdir}/dpm-postgres/dpm-srmv1.8*
%ghost %{_mandir}/man8/dpm-srmv1.8*
%{_initrddir}/dpm-postgres-srmv1
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv1.conf
%ghost %{_sysconfdir}/sysconfig/dpm-srmv1
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv1.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm-srmv1
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv1
%files -n dpm-postgres-srmv2
%defattr(-,root,root,-)
%{_libdir}/dpm-postgres/dpm-srmv2
%ghost %{_sbindir}/dpm-srmv2
%doc %{_libdir}/dpm-postgres/dpm-srmv2.8*
%ghost %{_mandir}/man8/dpm-srmv2.8*
%{_initrddir}/dpm-postgres-srmv2
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.conf
%ghost %{_sysconfdir}/sysconfig/dpm-srmv2
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
%files -n dpm-postgres-srmv22
%defattr(-,root,root,-)
%{_libdir}/dpm-postgres/dpm-srmv2.2
%ghost %{_sbindir}/dpm-srmv2.2
%doc %{_libdir}/dpm-postgres/dpm-srmv2.2.8*
%ghost %{_mandir}/man8/dpm-srmv2.2.8*
%{_initrddir}/dpm-postgres-srmv22
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.conf
%ghost %{_sysconfdir}/sysconfig/dpm-srmv2.2
%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.logrotate
%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2.2
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
%changelog
* Thu Apr 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.4-2
- Fix priorities for alternatives
- Add -p flag to install commands
* Mon Mar 29 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.4-1
- Update to version 1.7.4.4
- Dropped patches lcgdm-installpermissions.patch, lcgdm-rules.patch,
lcgdm-initscripts.patch and lcgdm-posinc.patch (fixed upstream)
* Mon Jan 04 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.1-1
- Update to version 1.7.4.1
- Dropped patch lcgdm-missing-swig-includes.patch (fixed upstream)
* Thu Dec 10 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.3.1-5
- Merge LFC and DPM to one specfile
* Mon Dec 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.3.1-4
- Add missing swig includes
* Tue Nov 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.3.1-3
- Don't use /sbin/nologin as shell - doesn't work with su
* Mon Nov 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.3.1-2
- Make dlopening work for standalone
* Tue Sep 22 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.3.1-1
- Update to version 1.7.3.1
* Wed Aug 19 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.2.5-2
- Patch refactoring
- Add alternatives support
* Fri Aug 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.2.5-1
- Update to version 1.7.2.5
- Dropped patch LFC-nofunctions.patch (fixed upstream)
* Wed Jan 14 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.0.6-1
- Update to version 1.7.0.6
- Dropped patch LFC-glibc28.patch (fixed upstream)
- Dropped patch LFC-perlbug.patch (no longer needed)
* Sun Oct 26 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.0.2-1ng
- Update to version 1.7.0.2
- Dropped patch LFC-spelling.patch (fixed upstream)
* Fri May 16 2008 Anders Wäänänen <waananen at nbi.dk> - 1.6.9.1-5ng
- Support Alpha architecture
- Added patch LFC-glibc28.patch for glibc-2.8 support
- Added patch LFC-perlbug.patch for work-around on Fedora 9 x86_64
* Tue Apr 02 2008 Anders Wäänänen <waananen at nbi.dk> - 1.6.9.1-4ng
- Added patch from Mattias Ellert <mattias.ellert at fysast.uu.se>:
LFC-shliblink.patch - Make clients link dynamically against library
* Tue Mar 18 2008 Anders Wäänänen <waananen at nbi.dk> - 1.6.9.1-3ng
- Added ng to release tag
- Added patches:
LFC-withsoname.patch - Add sonames libraries (helps package dependencies)
LFC-nofunctions.patch - Support systems without /etc/init.d/functions
LFC-spelling.patch - Spelling corrections
* Sat Jan 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.6.9.1-2
- Fixing some file permissions in the server package
* Sat Jan 12 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.6.9.1-1
- Update.
* Wed Jul 25 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.6.6.1-1
- Update.
* Thu May 10 2007 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.6.4.3-1
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 8 Apr 2010 02:49:06 -0000 1.1
+++ .cvsignore 8 Apr 2010 09:28:33 -0000 1.2
@@ -0,0 +1 @@
+lcgdm-1.7.4.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 8 Apr 2010 02:49:06 -0000 1.1
+++ sources 8 Apr 2010 09:28:34 -0000 1.2
@@ -0,0 +1 @@
+4438553d8dc692d0208512357a5df668 lcgdm-1.7.4.4.tar.gz
- Previous message: rpms/lcgdm/F-11 README.Fedora.dpm-mysql, NONE, 1.1 README.Fedora.dpm-postgres, NONE, 1.1 README.Fedora.dpns-mysql, NONE, 1.1 README.Fedora.dpns-postgres, NONE, 1.1 README.Fedora.lfc-mysql, NONE, 1.1 README.Fedora.lfc-postgres, NONE, 1.1 import.log, NONE, 1.1 lcgdm-dlopen.patch, NONE, 1.1 lcgdm-gsoap.patch, NONE, 1.1 lcgdm-imake.patch, NONE, 1.1 lcgdm-ld.patch, NONE, 1.1 lcgdm-man.patch, NONE, 1.1 lcgdm-paths.patch, NONE, 1.1 lcgdm-porting.patch, NONE, 1.1 lcgdm-shliblink.patch, NONE, 1.1 lcgdm-typo.patch, NONE, 1.1 lcgdm-usr.patch, NONE, 1.1 lcgdm-withsoname.patch, NONE, 1.1 lcgdm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/abiword/F-11 abiword-2.8.3-desktop.patch, NONE, 1.1 abiword.spec, 1.81, 1.82 abiword-2.7.6-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list