forked from pool/openafs
Accepting request 818075 from home:hauky:branches:filesystems_GA
- update to official 1.8.6 * remove patch 4c4bdde.diff * remove patch d3c7f75.diff * use source URLs again OBS-URL: https://build.opensuse.org/request/show/818075 OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=59
This commit is contained in:
Christof Hanke
Git OBS Bridge
parent
5be17a65b4
commit
b0f4faac89
66
4c4bdde.diff
66
4c4bdde.diff
@ -1,66 +0,0 @@
|
||||
From 4c4bdde59d69d0782612365d1337288ccc6f9a9f Mon Sep 17 00:00:00 2001
|
||||
From: Michael Meffie <mmeffie@sinenomine.net>
|
||||
Date: Mon, 09 Oct 2017 22:16:09 -0400
|
||||
Subject: [PATCH] afsmonitor: remove unused LWP_WaitProcess
|
||||
|
||||
Remove the unimplemented once-only flag and the unused LWP_WaitProcess
|
||||
call.
|
||||
|
||||
Reviewed-on: https://gerrit.openafs.org/12745
|
||||
Tested-by: BuildBot <buildbot@rampaginggeek.com>
|
||||
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
(cherry picked from commit 7c27365ea24aed5787f6fc03f30f6085c78ece51)
|
||||
|
||||
Change-Id: I3b61f9fb4f45564304b0e35878d3535a10e31d02
|
||||
---
|
||||
|
||||
diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
|
||||
index e7b3030..a6a9e97 100644
|
||||
--- a/src/afsmonitor/afsmonitor.c
|
||||
+++ b/src/afsmonitor/afsmonitor.c
|
||||
@@ -56,7 +56,6 @@
|
||||
FILE *debugFD; /* debugging file descriptor */
|
||||
static int afsmon_output = 0; /* output to file ? */
|
||||
static int afsmon_detOutput = 0; /* detailed output ? */
|
||||
-static int afsmon_onceOnly = 0; /* probe once only ? (not implemented) */
|
||||
int afsmon_probefreq; /* probe frequency */
|
||||
static int wpkg_to_use; /* graphics package to use */
|
||||
static char output_filename[80]; /* output filename */
|
||||
@@ -3794,8 +3793,6 @@
|
||||
}
|
||||
|
||||
FSinitFlags = 0;
|
||||
- if (afsmon_onceOnly) /* option not provided at this time */
|
||||
- FSinitFlags |= XSTAT_FS_INITFLAG_ONE_SHOT;
|
||||
|
||||
if (afsmon_debug) {
|
||||
fprintf(debugFD, "[ %s ] Calling xstat_fs_Init \n", rn);
|
||||
@@ -3867,8 +3864,6 @@
|
||||
collIDs[num_cm_collections++] = AFSCB_XSTATSCOLL_FULL_PERF_INFO;
|
||||
|
||||
CMinitFlags = 0;
|
||||
- if (afsmon_onceOnly) /* once only ? */
|
||||
- CMinitFlags |= XSTAT_CM_INITFLAG_ONE_SHOT;
|
||||
|
||||
if (afsmon_debug) {
|
||||
fprintf(debugFD, "[ %s ] Calling xstat_cm_Init \n", rn);
|
||||
@@ -3892,19 +3887,6 @@
|
||||
|
||||
|
||||
/* end of process cache manager entries */
|
||||
- /* if only one probe was required setup a waiting process for the
|
||||
- * termination signal */
|
||||
- if (afsmon_onceOnly) {
|
||||
- code = LWP_WaitProcess(&terminationEvent);
|
||||
- if (code) {
|
||||
- if (afsmon_debug) {
|
||||
- fprintf(debugFD, "LWP_WaitProcess() returned error %d\n",
|
||||
- code);
|
||||
- fflush(debugFD);
|
||||
- }
|
||||
- afsmon_Exit(135);
|
||||
- }
|
||||
- }
|
||||
|
||||
/* start the gtx input server */
|
||||
code = (intptr_t)gtx_InputServer(afsmon_win);
|
||||
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
||||
commit 46a364bef04e8f5455f47fe7e330cf9077faf87a
|
||||
Author: Stephan Wiesand <stephan.wiesand@desy.de>
|
||||
Date: Sat Jun 20 07:24:01 2020 +0200
|
||||
|
||||
Make OpenAFS 1.8.6
|
||||
|
||||
Update version strings and NEWS for the 1.8.6 release.
|
||||
|
||||
Change-Id: I0d4a17ce6b575c845bd13d9509788eb5cd8631e1
|
||||
Reviewed-on: https://gerrit.openafs.org/14253
|
||||
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
Tested-by: BuildBot <buildbot@rampaginggeek.com>
|
||||
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
|
||||
|
||||
commit 7cd24908de4b65d9972bd3dca85b049f495bb1bd
|
||||
Author: Stephan Wiesand <stephan.wiesand@desy.de>
|
||||
Date: Fri May 22 17:25:14 2020 +0200
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
User-Visible OpenAFS Changes
|
||||
|
||||
OpenAFS 1.8.6 (in progress)
|
||||
OpenAFS 1.8.6
|
||||
|
||||
All platforms
|
||||
|
||||
@ -75,13 +75,18 @@ OpenAFS 1.8.6 (in progress)
|
||||
|
||||
Linux clients
|
||||
|
||||
* Support mainline kernels up to and including 5.6 (14069 14094 14095)
|
||||
* Support mainline kernels up to and including 5.7 (14069 14094 14095
|
||||
14209 14210)
|
||||
|
||||
* Make builds succeed with --enable-checking for mainline kernels
|
||||
5.3-rc2 and later (13910)
|
||||
|
||||
* Avoid possible deadlocks (13748 13765)
|
||||
|
||||
* Fix build of libuafs on ppc64le (14104)
|
||||
|
||||
* Fix build on certain recent 32-bit distributions (14234) (RT #135084)
|
||||
|
||||
macOS
|
||||
|
||||
* Support building, packaging and notarization on macOS 10.15 "Catalina"
|
||||
@ -91,4 +96,3 @@ OpenAFS 1.8.6 (in progress)
|
||||
|
||||
* Build fixes (13848..52)
|
||||
|
||||
|
||||
345
d3c7f75.diff
345
d3c7f75.diff
@ -1,345 +0,0 @@
|
||||
From d3c7f75fd6f46c9df5a467d592ebc726d24d8775 Mon Sep 17 00:00:00 2001
|
||||
From: Cheyenne Wills <cwills@sinenomine.net>
|
||||
Date: Fri, 22 May 2020 12:16:48 -0600
|
||||
Subject: [PATCH] Avoid duplicate definitions of globals
|
||||
|
||||
GCC 10 changed a default flag from -fcommon to -fno-common. See
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678 for some background.
|
||||
|
||||
The change in gcc 10 results in build link-time errors. For example:
|
||||
../../src/xstat/.libs/liboafs_xstat_cm.a(xstat_cm.o):(.bss+0x2050):
|
||||
multiple definition of `numCollections';
|
||||
|
||||
Ensure that only one definition for global data objects exist and change
|
||||
references to use "extern" as needed.
|
||||
|
||||
To ensure that future changes do not introduce duplicated global
|
||||
definitions, add the -fno-common flag to XCFLAGS when using the
|
||||
configure --enable-checking setting.
|
||||
|
||||
[cwills@sinenomine.net: Note for 1.8.x: renamed terminationEvent
|
||||
to cm_terminationEvent/fs_terminationEvent instead of deleting it.]
|
||||
|
||||
Reviewed-on: https://gerrit.openafs.org/14106
|
||||
Tested-by: BuildBot <buildbot@rampaginggeek.com>
|
||||
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
|
||||
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
|
||||
(cherry picked from commit 0e2072ae386d4111bef161eb955964b649c31386)
|
||||
|
||||
Change-Id: I54ca61d372cf763e4a28c0b0829ea361219f6203
|
||||
---
|
||||
src/bucoord/main.c | 6 ++----
|
||||
src/butc/dbentries.c | 2 +-
|
||||
src/butc/dump.c | 7 +++----
|
||||
src/butc/lwps.c | 2 +-
|
||||
src/butc/tcmain.c | 2 +-
|
||||
src/cf/osconf.m4 | 2 +-
|
||||
src/fsprobe/fsprobe.h | 1 -
|
||||
src/uss/uss_vol.c | 2 +-
|
||||
src/viced/host.c | 2 ++
|
||||
src/viced/host.h | 2 +-
|
||||
src/vol/fssync-server.c | 3 ---
|
||||
src/vol/volume.c | 3 ---
|
||||
src/xstat/xstat_cm.c | 7 +++----
|
||||
src/xstat/xstat_cm.h | 3 +--
|
||||
src/xstat/xstat_cm_test.c | 4 ++--
|
||||
src/xstat/xstat_fs.c | 7 +++----
|
||||
src/xstat/xstat_fs.h | 3 +--
|
||||
src/xstat/xstat_fs_test.c | 4 ++--
|
||||
18 files changed, 25 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/bucoord/main.c b/src/bucoord/main.c
|
||||
index d2a5f368b..a453cc9dd 100644
|
||||
--- a/src/bucoord/main.c
|
||||
+++ b/src/bucoord/main.c
|
||||
@@ -47,9 +47,9 @@ char tcell[64];
|
||||
/*
|
||||
* Global configuration information for the Backup Coordinator.
|
||||
*/
|
||||
-struct bc_config *bc_globalConfig; /*Ptr to global BC configuration info */
|
||||
+extern struct bc_config *bc_globalConfig; /*Ptr to global BC configuration info */
|
||||
|
||||
-struct ubik_client *cstruct; /* Ptr to Ubik client structure */
|
||||
+extern struct ubik_client *cstruct; /* Ptr to Ubik client structure */
|
||||
time_t tokenExpires; /* The token's expiration time */
|
||||
|
||||
static const char *DefaultConfDir; /*Default backup config directory */
|
||||
@@ -162,8 +162,6 @@ bc_InitTextConfig(void)
|
||||
udbClientTextP ctPtr;
|
||||
int i;
|
||||
|
||||
- extern struct bc_config *bc_globalConfig;
|
||||
-
|
||||
mkdir(DefaultConfDir, 777); /* temporary */
|
||||
|
||||
/* initialize the client text structures */
|
||||
diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c
|
||||
index 37b35d307..29ddcbd01 100644
|
||||
--- a/src/butc/dbentries.c
|
||||
+++ b/src/butc/dbentries.c
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "error_macros.h"
|
||||
|
||||
dlqlinkT savedEntries;
|
||||
-dlqlinkT entries_to_flush;
|
||||
+static dlqlinkT entries_to_flush;
|
||||
|
||||
int dbWatcherinprogress;
|
||||
|
||||
diff --git a/src/butc/dump.c b/src/butc/dump.c
|
||||
index 1f4eb9b8f..f8fc943a6 100644
|
||||
--- a/src/butc/dump.c
|
||||
+++ b/src/butc/dump.c
|
||||
@@ -42,8 +42,7 @@ extern int isafile;
|
||||
extern int forcemultiple;
|
||||
|
||||
extern struct ubik_client *cstruct;
|
||||
-dlqlinkT savedEntries;
|
||||
-dlqlinkT entries_to_flush;
|
||||
+extern dlqlinkT savedEntries;
|
||||
|
||||
extern afs_int32 groupId;
|
||||
extern afs_int32 BufferSize;
|
||||
@@ -61,8 +60,8 @@ extern char *xbsalGName;
|
||||
extern char *globalButcLog;
|
||||
#endif /*xbsa */
|
||||
|
||||
-afs_int32 dataSize; /* Size of data to read on each rx_Read() call */
|
||||
-afs_int32 tapeblocks; /* Number of 16K tape datablocks in buffer (!CONF_XBSA) */
|
||||
+extern afs_int32 dataSize; /* Size of data to read on each rx_Read() call */
|
||||
+extern afs_int32 tapeblocks; /* Number of 16K tape datablocks in buffer (!CONF_XBSA) */
|
||||
|
||||
/* TBD
|
||||
*
|
||||
diff --git a/src/butc/lwps.c b/src/butc/lwps.c
|
||||
index d262991d8..aff5e9e07 100644
|
||||
--- a/src/butc/lwps.c
|
||||
+++ b/src/butc/lwps.c
|
||||
@@ -51,7 +51,7 @@ extern int forcemultiple;
|
||||
#endif
|
||||
|
||||
/* XBSA Global Parameters */
|
||||
-afs_int32 xbsaType;
|
||||
+extern afs_int32 xbsaType;
|
||||
#ifdef xbsa
|
||||
struct butx_transactionInfo butxInfo;
|
||||
#endif
|
||||
diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
|
||||
index e8a20938e..a0298addb 100644
|
||||
--- a/src/butc/tcmain.c
|
||||
+++ b/src/butc/tcmain.c
|
||||
@@ -66,7 +66,7 @@
|
||||
#define TL_PREFIX "TL"
|
||||
#define CFG_PREFIX "CFG"
|
||||
|
||||
-struct ubik_client *cstruct;
|
||||
+extern struct ubik_client *cstruct;
|
||||
FILE *logIO, *ErrorlogIO, *centralLogIO, *lastLogIO;
|
||||
char lFile[AFSDIR_PATH_MAX];
|
||||
char logFile[AFSDIR_PATH_MAX + 256];
|
||||
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
|
||||
index 29a79d7ce..923c3fb6f 100644
|
||||
--- a/src/cf/osconf.m4
|
||||
+++ b/src/cf/osconf.m4
|
||||
@@ -672,7 +672,7 @@ if test "x$GCC" = "xyes"; then
|
||||
XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Wpointer-arith"
|
||||
fi
|
||||
if test "x$enable_checking" != "xno"; then
|
||||
- XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Werror -fdiagnostics-show-option -Wpointer-arith"
|
||||
+ XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Werror -fdiagnostics-show-option -Wpointer-arith -fno-common"
|
||||
if test "x$enable_checking" != "xall"; then
|
||||
CFLAGS_NOERROR="-Wno-error"
|
||||
CFLAGS_NOUNUSED="-Wno-unused"
|
||||
diff --git a/src/fsprobe/fsprobe.h b/src/fsprobe/fsprobe.h
|
||||
index 94083bfe9..3060371ae 100644
|
||||
--- a/src/fsprobe/fsprobe.h
|
||||
+++ b/src/fsprobe/fsprobe.h
|
||||
@@ -103,7 +103,6 @@ struct fsprobe_ProbeResults {
|
||||
|
||||
extern int fsprobe_numServers; /*# servers connected */
|
||||
extern struct fsprobe_ConnectionInfo *fsprobe_ConnInfo; /*Ptr to connections */
|
||||
-extern int numCollections; /*Num data collections */
|
||||
extern struct fsprobe_ProbeResults fsprobe_Results; /*Latest probe results */
|
||||
|
||||
extern int fsprobe_Init(int, struct sockaddr_in *, int, int (*)(void), int );
|
||||
diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
|
||||
index c9c13941d..b31a42a06 100644
|
||||
--- a/src/uss/uss_vol.c
|
||||
+++ b/src/uss/uss_vol.c
|
||||
@@ -61,7 +61,7 @@ extern int line;
|
||||
* will work and we can avoid nasty little core dumps.
|
||||
*/
|
||||
struct ubik_client *uconn_vldbP; /*Ubik connection struct */
|
||||
-struct ubik_client *cstruct; /*Required name for above */
|
||||
+extern struct ubik_client *cstruct; /*Required name for above */
|
||||
|
||||
/*
|
||||
* ------------------------ Private globals -----------------------
|
||||
diff --git a/src/viced/host.c b/src/viced/host.c
|
||||
index 36f9e88c0..e7657caac 100644
|
||||
--- a/src/viced/host.c
|
||||
+++ b/src/viced/host.c
|
||||
@@ -67,6 +67,8 @@ int hostCount = 0; /* number of hosts in hostList */
|
||||
int rxcon_ident_key;
|
||||
int rxcon_client_key;
|
||||
|
||||
+struct host *(hosttableptrs[h_MAXHOSTTABLES]);
|
||||
+
|
||||
static struct rx_securityClass *sc = NULL;
|
||||
static int h_quota_limit;
|
||||
|
||||
diff --git a/src/viced/host.h b/src/viced/host.h
|
||||
index fead948f6..272dcdbe7 100644
|
||||
--- a/src/viced/host.h
|
||||
+++ b/src/viced/host.h
|
||||
@@ -254,7 +254,7 @@ extern int h_RestoreState(void);
|
||||
#define H_ENUMERATE_BAIL(flags) ((flags)|0x80000000)
|
||||
#define H_ENUMERATE_ISSET_BAIL(flags) ((flags)&0x80000000)
|
||||
|
||||
-struct host *(hosttableptrs[h_MAXHOSTTABLES]); /* Used by h_itoh */
|
||||
+extern struct host *(hosttableptrs[h_MAXHOSTTABLES]); /* Used by h_itoh */
|
||||
#define h_htoi(host) ((host)->index) /* index isn't zeroed, no need to lock */
|
||||
#define h_itoh(hostindex) (hosttableptrs[(hostindex)>>h_HTSHIFT]+((hostindex)&(h_HTSPERBLOCK-1)))
|
||||
|
||||
diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
|
||||
index 2d7cd6011..69d902f1b 100644
|
||||
--- a/src/vol/fssync-server.c
|
||||
+++ b/src/vol/fssync-server.c
|
||||
@@ -79,9 +79,6 @@
|
||||
#endif /* USE_UNIX_SOCKETS */
|
||||
|
||||
#ifdef FSSYNC_BUILD_SERVER
|
||||
-
|
||||
-int (*V_BreakVolumeCallbacks) (VolumeId volume);
|
||||
-
|
||||
#define MAXHANDLERS 4 /* Up to 4 clients; must be at least 2, so that
|
||||
* move = dump+restore can run on single server */
|
||||
#define MAXOFFLINEVOLUMES 128 /* This needs to be as big as the maximum
|
||||
diff --git a/src/vol/volume.c b/src/vol/volume.c
|
||||
index f1ff10a7b..3d9e47ef3 100644
|
||||
--- a/src/vol/volume.c
|
||||
+++ b/src/vol/volume.c
|
||||
@@ -124,9 +124,6 @@ pthread_cond_t vol_vinit_cond;
|
||||
int vol_attach_threads = 1;
|
||||
#endif /* AFS_PTHREAD_ENV */
|
||||
|
||||
-/* start-time configurable I/O parameters */
|
||||
-ih_init_params vol_io_params;
|
||||
-
|
||||
#ifdef AFS_DEMAND_ATTACH_FS
|
||||
pthread_mutex_t vol_salvsync_mutex;
|
||||
|
||||
diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c
|
||||
index d8600c124..3f5bfc843 100644
|
||||
--- a/src/xstat/xstat_cm.c
|
||||
+++ b/src/xstat/xstat_cm.c
|
||||
@@ -32,9 +32,8 @@
|
||||
int xstat_cm_numServers; /*Num connected servers */
|
||||
struct xstat_cm_ConnectionInfo
|
||||
*xstat_cm_ConnInfo; /*Ptr to connection array */
|
||||
-int numCollections; /*Number of data collections */
|
||||
struct xstat_cm_ProbeResults xstat_cm_Results; /*Latest probe results */
|
||||
-char terminationEvent; /*One-shot termination event */
|
||||
+char cm_terminationEvent; /*One-shot termination event */
|
||||
|
||||
afs_int32 xstat_cmData[AFSCB_MAX_XSTAT_LONGS]; /*Buffer for collected data */
|
||||
|
||||
@@ -315,8 +314,8 @@ xstat_cm_LWP(void *unused)
|
||||
*/
|
||||
if (xstat_cm_debug)
|
||||
printf("[%s] Signalling main process at %" AFS_PTR_FMT "\n", rn,
|
||||
- &terminationEvent);
|
||||
- oneShotCode = LWP_SignalProcess(&terminationEvent);
|
||||
+ &cm_terminationEvent);
|
||||
+ oneShotCode = LWP_SignalProcess(&cm_terminationEvent);
|
||||
if (oneShotCode)
|
||||
fprintf(stderr, "[%s] Error %d from LWP_SignalProcess()", rn,
|
||||
oneShotCode);
|
||||
diff --git a/src/xstat/xstat_cm.h b/src/xstat/xstat_cm.h
|
||||
index efbba531c..569011cc2 100644
|
||||
--- a/src/xstat/xstat_cm.h
|
||||
+++ b/src/xstat/xstat_cm.h
|
||||
@@ -86,10 +86,9 @@ struct xstat_cm_ProbeResults {
|
||||
extern int xstat_cm_numServers; /*# connected servers */
|
||||
extern struct xstat_cm_ConnectionInfo
|
||||
*xstat_cm_ConnInfo; /*Ptr to connections */
|
||||
-extern int numCollections; /*Num data collections */
|
||||
extern struct xstat_cm_ProbeResults
|
||||
xstat_cm_Results; /*Latest probe results */
|
||||
-extern char terminationEvent; /*One-shot termination event */
|
||||
+extern char cm_terminationEvent; /*One-shot termination event */
|
||||
|
||||
/*
|
||||
* ------------------------ Exported functions ------------------------
|
||||
diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
|
||||
index b284237aa..7c5e56864 100644
|
||||
--- a/src/xstat/xstat_cm_test.c
|
||||
+++ b/src/xstat/xstat_cm_test.c
|
||||
@@ -881,8 +881,8 @@ RunTheTest(struct cmd_syndesc *a_s, void *arock)
|
||||
*/
|
||||
if (debugging_on)
|
||||
printf("[%s] Calling LWP_WaitProcess() on event %" AFS_PTR_FMT
|
||||
- "\n", rn, &terminationEvent);
|
||||
- waitCode = LWP_WaitProcess(&terminationEvent);
|
||||
+ "\n", rn, &cm_terminationEvent);
|
||||
+ waitCode = LWP_WaitProcess(&cm_terminationEvent);
|
||||
if (debugging_on)
|
||||
printf("[%s] Returned from LWP_WaitProcess()\n", rn);
|
||||
if (waitCode) {
|
||||
diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c
|
||||
index 51dbe3847..dff930472 100644
|
||||
--- a/src/xstat/xstat_fs.c
|
||||
+++ b/src/xstat/xstat_fs.c
|
||||
@@ -33,9 +33,8 @@
|
||||
int xstat_fs_numServers; /*Num connected servers */
|
||||
struct xstat_fs_ConnectionInfo
|
||||
*xstat_fs_ConnInfo; /*Ptr to connection array */
|
||||
-int numCollections; /*Number of data collections */
|
||||
struct xstat_fs_ProbeResults xstat_fs_Results; /*Latest probe results */
|
||||
-char terminationEvent; /*One-shot termination event */
|
||||
+char fs_terminationEvent; /*One-shot termination event */
|
||||
|
||||
afs_int32 xstat_fsData[AFS_MAX_XSTAT_LONGS]; /*Buffer for collected data */
|
||||
|
||||
@@ -334,8 +333,8 @@ xstat_fs_LWP(void *unused)
|
||||
*/
|
||||
if (xstat_fs_debug)
|
||||
printf("[%s] Signalling main process at %" AFS_PTR_FMT "\n", rn,
|
||||
- &terminationEvent);
|
||||
- oneShotCode = LWP_SignalProcess(&terminationEvent);
|
||||
+ &fs_terminationEvent);
|
||||
+ oneShotCode = LWP_SignalProcess(&fs_terminationEvent);
|
||||
if (oneShotCode)
|
||||
fprintf(stderr, "[%s] Error %d from LWP_SignalProcess()", rn,
|
||||
oneShotCode);
|
||||
diff --git a/src/xstat/xstat_fs.h b/src/xstat/xstat_fs.h
|
||||
index 6e2b77b85..a800ba679 100644
|
||||
--- a/src/xstat/xstat_fs.h
|
||||
+++ b/src/xstat/xstat_fs.h
|
||||
@@ -87,10 +87,9 @@ struct xstat_fs_ProbeResults {
|
||||
extern int xstat_fs_numServers; /*# connected servers */
|
||||
extern struct xstat_fs_ConnectionInfo
|
||||
*xstat_fs_ConnInfo; /*Ptr to connections */
|
||||
-extern int numCollections; /*Num data collections */
|
||||
extern struct xstat_fs_ProbeResults
|
||||
xstat_fs_Results; /*Latest probe results */
|
||||
-extern char terminationEvent; /*One-shot termination event */
|
||||
+extern char fs_terminationEvent; /*One-shot termination event */
|
||||
|
||||
/*
|
||||
* ------------------------ Exported functions ------------------------
|
||||
diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
|
||||
index 853c2121e..d58ecf014 100644
|
||||
--- a/src/xstat/xstat_fs_test.c
|
||||
+++ b/src/xstat/xstat_fs_test.c
|
||||
@@ -778,8 +778,8 @@ RunTheTest(struct cmd_syndesc *a_s, void *dummy)
|
||||
*/
|
||||
if (debugging_on)
|
||||
printf("[%s] Calling LWP_WaitProcess() on event %" AFS_PTR_FMT "\n", rn,
|
||||
- &terminationEvent);
|
||||
- waitCode = LWP_WaitProcess(&terminationEvent);
|
||||
+ &fs_terminationEvent);
|
||||
+ waitCode = LWP_WaitProcess(&fs_terminationEvent);
|
||||
if (debugging_on)
|
||||
printf("[%s] Returned from LWP_WaitProcess()\n", rn);
|
||||
if (waitCode) {
|
||||
3
openafs-1.8.6-doc.tar.bz2
Normal file
3
openafs-1.8.6-doc.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e34fa28d9ee06b47d080e4ed0c1f55fe2629ce974f1a7a7ec60dd6e87a9d21e9
|
||||
size 3769160
|
||||
1
openafs-1.8.6-doc.tar.bz2.md5
Normal file
1
openafs-1.8.6-doc.tar.bz2.md5
Normal file
@ -0,0 +1 @@
|
||||
4cd70ea5f7ff9eae73c1a6f743414013 openafs-1.8.6-doc.tar.bz2
|
||||
1
openafs-1.8.6-doc.tar.bz2.sha256
Normal file
1
openafs-1.8.6-doc.tar.bz2.sha256
Normal file
@ -0,0 +1 @@
|
||||
e34fa28d9ee06b47d080e4ed0c1f55fe2629ce974f1a7a7ec60dd6e87a9d21e9 openafs-1.8.6-doc.tar.bz2
|
||||
3
openafs-1.8.6-src.tar.bz2
Normal file
3
openafs-1.8.6-src.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b4e9d3180f1ecd752753da17ac630df04eb7007c90a921a5f6403c0339d2945
|
||||
size 14874336
|
||||
1
openafs-1.8.6-src.tar.bz2.md5
Normal file
1
openafs-1.8.6-src.tar.bz2.md5
Normal file
@ -0,0 +1 @@
|
||||
4685be799118697ffc724834db232c75 openafs-1.8.6-src.tar.bz2
|
||||
1
openafs-1.8.6-src.tar.bz2.sha256
Normal file
1
openafs-1.8.6-src.tar.bz2.sha256
Normal file
@ -0,0 +1 @@
|
||||
8b4e9d3180f1ecd752753da17ac630df04eb7007c90a921a5f6403c0339d2945 openafs-1.8.6-src.tar.bz2
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:273305b156c91f174af5c6d573a65cc2bab9d4fa6ae3d51ef17271d80c724024
|
||||
size 3530789
|
||||
@ -1 +0,0 @@
|
||||
c44b21ae7a9d615295867ca26b079393 openafs-1.8.6~pre2a-doc.tar.bz2
|
||||
@ -1 +0,0 @@
|
||||
273305b156c91f174af5c6d573a65cc2bab9d4fa6ae3d51ef17271d80c724024 openafs-1.8.6~pre2a-doc.tar.bz2
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:628c4caf24843a916966cdc56b9def3e044bb0ff1687225f9dc1b93e0a95a3d7
|
||||
size 4546673
|
||||
@ -1 +0,0 @@
|
||||
e9f30afd0aecac2f8710c657989f5204 openafs-1.8.6~pre2a-src.tar.bz2
|
||||
@ -1 +0,0 @@
|
||||
628c4caf24843a916966cdc56b9def3e044bb0ff1687225f9dc1b93e0a95a3d7 openafs-1.8.6~pre2a-src.tar.bz2
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 1 08:53:44 UTC 2020 - Christof Hanke <christof.hanke@mpcdf.mpg.de>
|
||||
|
||||
- update to official 1.8.6
|
||||
* remove patch 4c4bdde.diff
|
||||
* remove patch d3c7f75.diff
|
||||
* use source URLs again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 12:56:21 UTC 2020 - Christof Hanke <christof.hanke@mpcdf.mpg.de>
|
||||
|
||||
|
||||
26
openafs.spec
26
openafs.spec
@ -57,23 +57,23 @@
|
||||
|
||||
# used for %setup only
|
||||
# leave upstream tar-balls untouched for integrity checks.
|
||||
%define upstream_version git-7cd24908de4b65d9972bd3dca85b049f495bb1bd
|
||||
%define upstream_version 1.8.6
|
||||
|
||||
Name: openafs
|
||||
|
||||
Version: 1.8.6~pre2a
|
||||
Version: 1.8.6
|
||||
Release: 0
|
||||
Summary: OpenAFS Distributed File System
|
||||
License: IPL-1.0
|
||||
Group: System/Filesystems
|
||||
URL: http://www.openafs.org/
|
||||
|
||||
Source0: openafs-%{version}-src.tar.bz2
|
||||
Source1: openafs-%{version}-doc.tar.bz2
|
||||
Source2: openafs-%{version}-src.tar.bz2.md5
|
||||
Source3: openafs-%{version}-doc.tar.bz2.md5
|
||||
Source4: openafs-%{version}-src.tar.bz2.sha256
|
||||
Source5: openafs-%{version}-doc.tar.bz2.sha256
|
||||
Source0: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2
|
||||
Source1: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2
|
||||
Source2: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.md5
|
||||
Source3: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.md5
|
||||
Source4: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-src.tar.bz2.sha256
|
||||
Source5: http://www.openafs.org/dl/openafs/%{upstream_version}/openafs-%{upstream_version}-doc.tar.bz2.sha256
|
||||
Source10: README.SUSE.openafs
|
||||
Source15: logrotate.openafs-server
|
||||
Source18: RELNOTES-%{upstream_version}
|
||||
@ -97,10 +97,6 @@ Patch3: dir_layout.patch
|
||||
Patch4: openafs-1.8.x.ncurses6.patch
|
||||
# PATCH-SUSE-SPECIFIC make KMP work again
|
||||
Patch5: add_arch_to_linux_kernel_make.patch
|
||||
# PATCH-FIX-afsmonitor
|
||||
Patch99: 4c4bdde.diff
|
||||
# PATCH-FIX-GCC-10-BUILD
|
||||
Patch100: d3c7f75.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
#
|
||||
@ -312,8 +308,6 @@ done
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch99 -p1
|
||||
%patch100 -p1
|
||||
|
||||
./regen.sh
|
||||
|
||||
@ -347,7 +341,11 @@ perl -pi -e 's,^(XLIBS.*),\1 -lresolv,' src/config/Makefile.amd64_linux24.in
|
||||
afs_sysname=${sysbase}_linux26
|
||||
|
||||
RPM_OPT_FLAGS=`echo ${RPM_OPT_FLAGS} | sed s/-D_FORTIFY_SOURCE=2//`
|
||||
%if 0%{?suse_version} > 1500
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -fcommon"
|
||||
%else
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
|
||||
%endif
|
||||
|
||||
export KRB5LIBS='-lcom_err -lkrb5'
|
||||
export PATH_KRB5_CONFIG=%{krb5_config}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user