tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / servers / openafs / 1.8 / tsmbac.patch
at python-updates 75 lines 3.3 kB view raw
1diff -ru openafs-1.8.13.2/src/butc/afsxbsa.c openafs-1.8.13.2.new/src/butc/afsxbsa.c 2--- openafs-1.8.13.2/src/butc/afsxbsa.c 2025-01-23 12:12:55.000000000 -0500 3+++ openafs-1.8.13.2.new/src/butc/afsxbsa.c 2025-07-13 19:30:19.513895421 -0400 4@@ -631,7 +631,7 @@ 5 #if defined(AFS_AIX_ENV) 6 dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER); 7 #elif defined (AFS_AMD64_LINUX_ENV) 8- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL); 9+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL); 10 #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX_ENV) 11 dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL); 12 #else 13diff -ru openafs-1.8.13.2/src/butc/lwps.c openafs-1.8.13.2.new/src/butc/lwps.c 14--- openafs-1.8.13.2/src/butc/lwps.c 2025-01-23 12:12:55.000000000 -0500 15+++ openafs-1.8.13.2.new/src/butc/lwps.c 2025-07-14 01:02:51.409677422 -0400 16@@ -53,7 +53,7 @@ 17 /* XBSA Global Parameters */ 18 extern afs_int32 xbsaType; 19 #ifdef xbsa 20-struct butx_transactionInfo butxInfo; 21+extern struct butx_transactionInfo butxInfo; 22 #endif 23 24 static struct TapeBlock { /* A 16KB tapeblock */ 25Only in openafs-1.8.13.2.new/src/butc: lwps.c~ 26diff -ru openafs-1.8.13.2/src/cf/tivoli.m4 openafs-1.8.13.2.new/src/cf/tivoli.m4 27--- openafs-1.8.13.2/src/cf/tivoli.m4 2025-01-23 12:12:55.000000000 -0500 28+++ openafs-1.8.13.2.new/src/cf/tivoli.m4 2025-07-13 19:30:39.350794275 -0400 29@@ -1,45 +1,7 @@ 30 AC_DEFUN([OPENAFS_TIVOLI_TESTS],[ 31 dnl check for tivoli 32 AC_MSG_CHECKING(for tivoli tsm butc support) 33-XBSA_CFLAGS="" 34-if test "$enable_tivoli_tsm" = "yes"; then 35- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen 36- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen 37- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample 38- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample 39- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample 40- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample 41- 42- if test -r "$XBSADIR3/dsmapifp.h"; then 43- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3" 44- XBSA_XLIBS="-ldl" 45- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 46- elif test -r "$XBSADIR4/dsmapifp.h"; then 47- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4" 48- XBSA_XLIBS="-ldl" 49- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 50- elif test -r "$XBSADIR5/dsmapifp.h"; then 51- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5" 52- XBSA_XLIBS="-ldl" 53- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 54- elif test -r "$XBSADIR6/dsmapifp.h"; then 55- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6" 56- XBSA_XLIBS="-ldl" 57- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 58- elif test -r "$XBSADIR1/xbsa.h"; then 59- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1" 60- XBSA_XLIBS="" 61- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 62- elif test -r "$XBSADIR2/xbsa.h"; then 63- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2" 64- XBSA_XLIBS="" 65- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) 66- else 67- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files]) 68- fi 69-else 70- AC_MSG_RESULT([no]) 71-fi 72+AC_MSG_RESULT([yes]) 73 AC_SUBST(XBSA_CFLAGS) 74 AC_SUBST(XBSA_XLIBS) 75 XLIBS="$XBSA_XLIBS $XLIBS"