bump rpm release

drop RHEL7 architecture
drop VxWorks 5 and 7 compatibility
2025-01-16 08:17:19 +01:00 · 2025-01-16 08:17:19 +01:00 · 2025-01-16 08:17:19 +01:00 · 2025-01-16 08:17:03 +01:00 · 2025-01-15 11:25:51 +01:00 · 2024-12-05 16:59:58 +01:00
135 changed files with 2159 additions and 691 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ O.*/
 .*.swp
 .DS_Store
 .iocsh_history
+RPMS
+SRPMS
+BUILDROOT
+*.rpm
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "modules/pvData"]
    path = modules/pvData
-    url = https://github.com/epics-base/pvDataCPP
+#    url = https://github.com/epics-base/pvDataCPP
+    url = git@git.psi.ch:epics_base/pvData.git
    branch = master
 [submodule "modules/pvAccess"]
    path = modules/pvAccess
@@ -26,3 +27,6 @@
    path = .ci
    url = https://github.com/epics-base/ci-scripts
    branch = master
+[submodule "modules/pcas"]
+    path = modules/pcas
+    url = https://github.com/epics-modules/pcas
--- a/10
+++ b/10
@@ -23,3 +23,13 @@ DIRS += modules
 modules_DEPEND_DIRS = src

 include $(TOP)/configure/RULES_TOP
+
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
+
+rpm:
+	rpmbuild -bb epics-base.spec
--- a/configure/CONFIG_CA_VERSION
+++ b/configure/CONFIG_CA_VERSION
@@ -2,7 +2,7 @@

 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 5
+EPICS_CA_MAINTENANCE_VERSION = 4

 # Development flag, set to zero for release versions

--- a/configure/CONFIG_DATABASE_VERSION
+++ b/configure/CONFIG_DATABASE_VERSION
@@ -2,7 +2,7 @@

 EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 23
-EPICS_DATABASE_MAINTENANCE_VERSION = 2
+EPICS_DATABASE_MAINTENANCE_VERSION = 1

 # Development flag, set to zero for release versions

--- a/configure/CONFIG_LIBCOM_VERSION
+++ b/configure/CONFIG_LIBCOM_VERSION
@@ -2,7 +2,7 @@

 EPICS_LIBCOM_MAJOR_VERSION = 3
 EPICS_LIBCOM_MINOR_VERSION = 23
-EPICS_LIBCOM_MAINTENANCE_VERSION = 2
+EPICS_LIBCOM_MAINTENANCE_VERSION = 1

 # Development flag, set to zero for release versions

--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -157,7 +157,9 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES

 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-EPICS_SITE_VERSION =
+ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
+endif

 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -101,6 +101,23 @@ include $(CONFIG)/RULES_FILE_TYPE

 include $(CONFIG)/RULES.Db

+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets

@@ -227,7 +244,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)

 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)

-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -330,10 +347,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)

-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks

@@ -502,6 +515,13 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else  # SHRLIB_SUFFIX
+ifeq ($(BUILD_CLASS),HOST)
+ifneq (,$(strip $(SHRLIB_VERSION)))
+	@$(RM) $@.$(SHRLIB_VERSION)
+	ln -s $< $@.$(SHRLIB_VERSION)
+endif # HOST
+endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX

 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
--- a/configure/os/CONFIG.Common.RHEL7-x86_64
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64
@@ -0,0 +1,8 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = devtoolset-12
+STD_CXXFLAGS = -std=c++20
--- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST
--- a/configure/os/CONFIG.Common.RHEL8-x86_64
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64
@@ -0,0 +1,20 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
+
+# Fix bug in gcc-toolset-11 calling the old assembler
+ifneq ($(filter %-11,$(TOOLSET)),)
+TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+endif
+
+ifneq (($(TOOLSET)),)
+# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
+# Disable Perl specific CFLAGS
+override Cap5_CFLAGS=
+endif
--- a/configure/os/CONFIG.Common.RHEL8-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64-clang
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++2a
--- a/configure/os/CONFIG.Common.RHEL9-x86_64
+++ b/configure/os/CONFIG.Common.RHEL9-x86_64
@@ -0,0 +1,20 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
+
+# Fix bug in gcc-toolset-11 calling the old assembler
+ifneq ($(filter %-11,$(TOOLSET)),)
+TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+endif
+
+ifneq (($(TOOLSET)),)
+# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
+# Disable Perl specific CFLAGS
+override Cap5_CFLAGS=
+endif
--- a/configure/os/CONFIG.Common.RHEL9-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL9-x86_64-clang
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++2a
--- a/configure/os/CONFIG.Common.RTEMS49-pc386
+++ b/configure/os/CONFIG.Common.RTEMS49-pc386
@@ -0,0 +1,2 @@
+RTEMS_VERSION = 4.9
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
--- a/configure/os/CONFIG.Common.RTEMS51-pc686
+++ b/configure/os/CONFIG.Common.RTEMS51-pc686
@@ -0,0 +1,2 @@
+RTEMS_VERSION = 5
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/configure/os/CONFIG.Common.T2-ppc604
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5.1
+WIND_BASE = /opt/VxWorks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -8,7 +8,7 @@
 #-------------------------------------------------------

 # Unix valid build types
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = $(if $(filter HOST,$(BUILD_CLASS)),Host) Ioc Command

 #-------------------------------------------------------
 # Unix prefix and suffix definitions
--- a/configure/os/CONFIG.Common.V62-ppc604
+++ b/configure/os/CONFIG.Common.V62-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2
--- a/configure/os/CONFIG.Common.V63-ppc603
+++ b/configure/os/CONFIG.Common.V63-ppc603
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V63-ppc604
+++ b/configure/os/CONFIG.Common.V63-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V64-ppc604
+++ b/configure/os/CONFIG.Common.V64-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.4
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V66-ppc603
+++ b/configure/os/CONFIG.Common.V66-ppc603
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V66-ppc604
+++ b/configure/os/CONFIG.Common.V66-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V67-ppc604
+++ b/configure/os/CONFIG.Common.V67-ppc604
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
+
+# compiler tries to access license server (even though no license isneeded)
+export LM_LICENSE_FILE=37000@lic-windriver.psi.ch
--- a/configure/os/CONFIG.Common.V69-ppc32
+++ b/configure/os/CONFIG.Common.V69-ppc32
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.V69-ppc604
+++ b/configure/os/CONFIG.Common.V69-ppc604
@@ -0,0 +1,6 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+
+# -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align
--- a/configure/os/CONFIG.Common.deb10-x86_64
+++ b/configure/os/CONFIG.Common.deb10-x86_64
@@ -0,0 +1,16 @@
+# Debian 10
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-8.3.0-deb10
+GNU_TARGET = x86_64-deb10-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+endif
--- a/configure/os/CONFIG.Common.deb12-x86_64
+++ b/configure/os/CONFIG.Common.deb12-x86_64
@@ -0,0 +1,17 @@
+# Debian 12
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-12.2.0-deb12
+GNU_TARGET = x86_64-deb12-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SYSROOT)/lib/x86_64-linux-gnu
+endif
--- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP
@@ -0,0 +1,28 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
+
+# have no C++11
+STD_CXXFLAGS =
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
--- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF
+++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF
@@ -0,0 +1,17 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
--- a/configure/os/CONFIG.Common.eldk52-e500v2
+++ b/configure/os/CONFIG.Common.eldk52-e500v2
@@ -0,0 +1,18 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
--- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP
@@ -0,0 +1,20 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH)
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+AS=$(GNU_BIN)/$(GNU_TARGET)-as
--- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64
+++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64
@@ -0,0 +1,17 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
--- a/configure/os/CONFIG.Common.gcc8-ppc4xxFP
+++ b/configure/os/CONFIG.Common.gcc8-ppc4xxFP
@@ -0,0 +1,14 @@
+# DeltaTau PowerPMAC with gcc 8.5
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+GNU_DIR    = /opt/xgcc/gcc-8.5.0
+GNU_TARGET = powerpc-ppmac-linux-gnu
+
+ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu
+
+STD_CXXFLAGS = -std=c++17
--- a/configure/os/CONFIG.Common.linux-clang
+++ b/configure/os/CONFIG.Common.linux-clang
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
--- a/configure/os/CONFIG.Common.linuxCommon
+++ b/configure/os/CONFIG.Common.linuxCommon
@@ -24,13 +24,13 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic

 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))

 # Set runtime path for products if LINKER_USE_RPATH=YES
-PRODDIR_RPATH_LDFLAGS_YES = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
--- a/configure/os/CONFIG.Common.moxa42-armv6l
+++ b/configure/os/CONFIG.Common.moxa42-armv6l
@@ -0,0 +1,25 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
+
+# accept4() exists but does not work
+# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
+osdSock_CFLAGS += -D__rtems__
--- a/configure/os/CONFIG.Common.mvl40-xscale_be
+++ b/configure/os/CONFIG.Common.mvl40-xscale_be
@@ -0,0 +1,18 @@
+# Moxa DA-66x with Montavista Linux 4.0
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_CURSES
+
+ARCH_CLASS = xscale
+
+GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no C++11
+STD_CXXFLAGS =
+
+# Cannot build PVA because of missing boost support
+SKIP_BUILDS = pv% normativeTypes
--- a/configure/os/CONFIG.Common.nilrt7-armv7a
+++ b/configure/os/CONFIG.Common.nilrt7-armv7a
@@ -0,0 +1,21 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+# requires RPM gcc-c++-arm-linux-gnu
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+GNU_BIN = /opt/RHEL7/bin
+
+# Needed on RHEL9:
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
--- a/configure/os/CONFIG.Common.raspbian-arm
+++ b/configure/os/CONFIG.Common.raspbian-arm
@@ -0,0 +1,44 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+# gcc 4.9.3 for 64 bit hosts
+# arm-rpi-4.9.3-linux-gnueabihf
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)
--- a/configure/os/CONFIG.Common.yocto21-aarch64
+++ b/configure/os/CONFIG.Common.yocto21-aarch64
@@ -0,0 +1,15 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2018.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
--- a/configure/os/CONFIG.Common.yocto40-aarch64
+++ b/configure/os/CONFIG.Common.yocto40-aarch64
@@ -0,0 +1,19 @@
+# XILINX Zynq with Yocto 4.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = pokysdk
+SDK_DIR = /opt/yocto40-aarch64
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = cortexa53-poky-linux
+GNU_TARGET = aarch64-poky-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = -mcpu=cortex-a53 -march=armv8-a+crc
+
+STD_CXXFLAGS = -std=c++23
--- a/configure/os/CONFIG.Linux.windows-x64
+++ b/configure/os/CONFIG.Linux.windows-x64
@@ -0,0 +1,10 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+VALID_BUILDS = Ioc Command
+
+MSVC_VERSION ?= 2019
+PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
+export WINEDEBUG=fixme-all
+export WINEDLLOVERRIDES="mscoree,mshtml="
+export WINE = wine64
--- a/configure/os/CONFIG.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG.RHEL7-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
@@ -0,0 +1,3 @@
+# MSVC_VERSION 2019 in wine 4 for on RHEL7 would require winetricks
+MSVC_VERSION = 2017
+include $(CONFIG)/os/CONFIG.Linux.windows-x64
--- a/configure/os/CONFIG.RHEL8-x86_64.Common
+++ b/configure/os/CONFIG.RHEL8-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64
@@ -0,0 +1,25 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL7-x86_64
+# Expects RHEL7 RPMs c++ and readline-devel installed
+# in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
+
+SYSROOT = /opt/RHEL7
+
+# "Cross" TOOLSET progs need to find their libraries
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+
+# The linker has problems to find indirectly referenced libraries
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+# These programs have library problems when using them
+# from SYSROOT but without TOOLSET.
+# But provinding LD_LIBRARY PATH crashes other progams.
+# Our host versions work just fine.
+AR = ar -rc
+RANLIB = ranlib
--- a/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64
+++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.RHEL8-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64
--- a/configure/os/CONFIG.RHEL9-x86_64.Common
+++ b/configure/os/CONFIG.RHEL9-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64
@@ -0,0 +1,18 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL7-x86_64
+# Expects RHEL7 RPMs c++ and readline-devel installed
+# in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
+
+SYSROOT = /opt/RHEL7
+
+# "Cross" TOOLSET progs need to find their libraries
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
+
+# The linker has problems to find indirectly referenced libraries
+PROD_LDLIBS += $(LDLIBS)
--- a/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64
+++ b/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64
@@ -0,0 +1,22 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL8-x86_64
+# Expects RHEL8 RPMs gcc-toolset-12-gcc-c++ and readline-devel
+# to be installed in $(SYSROOT)
+# These can be installed on RHEL8 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+
+SYSROOT = /opt/RHEL8
+
+# "Cross" TOOLSET progs need to find their libraries.
+# But linker gets confused with LD_LIBRARY_PATH.
+# Thus only wrap the compiler.
+WRAPPER = -wrapper env,LD_LIBRARY_PATH=$(TOOLSET_DIR:%=$(SYSROOT)%/usr/lib64:)/usr/lib64:$(SYSROOT)/usr/lib64
+TARGET_CPPFLAGS += $(WRAPPER)
+
+# These programs as cross tools would also need LD_LIBRARY_PATH.
+# But but our host versions work just fine.
+AR = ar -rc
+RANLIB = ranlib
--- a/configure/os/CONFIG.RHEL9-x86_64.RHEL9-x86_64
+++ b/configure/os/CONFIG.RHEL9-x86_64.RHEL9-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.RHEL9-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL9-x86_64.windows-x64
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64
--- a/configure/os/CONFIG.deb10-x86_64.Common
+++ b/configure/os/CONFIG.deb10-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.deb10-x86_64.deb10-x86_64
+++ b/configure/os/CONFIG.deb10-x86_64.deb10-x86_64
@@ -0,0 +1,3 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+GNU_DIR=/usr
--- a/configure/os/CONFIG.deb12-x86_64.Common
+++ b/configure/os/CONFIG.deb12-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.deb12-x86_64.deb12-x86_64
+++ b/configure/os/CONFIG.deb12-x86_64.deb12-x86_64
@@ -0,0 +1,3 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+GNU_DIR=/usr
--- a/configure/os/CONFIG_SITE.Common.RTEMS
+++ b/configure/os/CONFIG_SITE.Common.RTEMS
@@ -24,6 +24,9 @@
 #RTEMS_VERSION = 5
 #RTEMS_BASE = /usr/local/vw/rtems/rtems-5.1

+# PSI:
+RTEMS_BASE = /opt/rtems/$(RTEMS_VERSION)
+
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
 RTEMS_TOOLS = $(RTEMS_BASE)
--- a/configure/os/CONFIG_SITE.Common.deb10-x86_64
+++ b/configure/os/CONFIG_SITE.Common.deb10-x86_64
@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE_NCURSES
--- a/configure/os/CONFIG_SITE.Common.deb12-x86_64
+++ b/configure/os/CONFIG_SITE.Common.deb12-x86_64
@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE
--- a/configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP
+++ b/configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP
@@ -0,0 +1,2 @@
+# DeltaTau PowerPMAC with gcc
+COMMANDLINE_LIBRARY=READLINE
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -8,3 +8,18 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>

+COMMANDLINE_LIBRARY = READLINE
+
+USR_CXXFLAGS += $(STD_CXXFLAGS)
+STD_CXXFLAGS = -std=c++11
+
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
+TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
+TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
+
+# backward compatibility: Keep unversioned libs
+# in order to prevent dynamic linking problems
+# when minor changes increment *_MAINTENANCE_VERSION
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
--- a/configure/os/CONFIG_SITE.Common.vxWorksCommon
+++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon
@@ -21,5 +21,9 @@ VXWORKS_VERSION = 6.9
 # WIND_BASE is where you installed the Wind River software.

 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
+
+# For the license counter
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
--- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common
@@ -0,0 +1,7 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
+
+# Build for old RHEL7 64 bit
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
--- a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common
@@ -0,0 +1,10 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
+
+# Build for old RHEL8 64 bit
+CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
+
+# Build for old RHEL7 64 bit
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
--- a/configure/os/CONFIG_SITE.UnixCommon.Common
+++ b/configure/os/CONFIG_SITE.UnixCommon.Common
@@ -0,0 +1,5 @@
+# Make sure hosts tools find their libraries during build
+# even if FINAL_LOCATION differs from INSTALL_LOCATION
+ifneq ($(FINAL_LOCATION:$(INSTALL_LOCATION)=),)
+export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_HOST_LIB)
+endif
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -5,3 +5,46 @@

 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
+
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# vxWorks for MVxxxx boards
+#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
+# NI compact RIO
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V64-ppc604
+# (No PVA because of old compiler)
+#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
+# because they overwrite their header files.)
+#CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS51-pc686
--- a/configure/os/CONFIG_SITE.linux-x86.RTEMS
+++ b/configure/os/CONFIG_SITE.linux-x86.RTEMS
@@ -4,5 +4,5 @@
 #-------------------------------------------------------

 # Needed by gcc
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(RTEMS_BASE)/lib
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(RTEMS_BASE)/lib

--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/configure/os/CONFIG_SITE.linux-x86_64.Common
@@ -7,3 +7,29 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100

+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += windows-x64
+
+# IOxOS IFC1211
+#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
+
+# Debian
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+CROSS_COMPILER_TARGET_ARCHS += deb12-x86_64
+
+# Newer DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+
+# NI Linux Real-Time 7.x
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
--- a/epics-base.sh
+++ b/epics-base.sh
@@ -0,0 +1,6 @@
+_OLD_EXTGLOB=$(shopt -p extglob)
+shopt -s extglob
+test -n "$EPICS_HOST_ARCH" || export EPICS_HOST_ARCH=$(/bin/sed "s%cpe:/o:redhat:enterprise_linux:\([0-9]*\).*%RHEL\1-`/bin/uname -m`%" /etc/system-release-cpe)
+PATH=${PATH//?(:)\/usr\/local\/epics\/base-+([0-9]).+([0-9]).+([0-9])\/bin\/$EPICS_HOST_ARCH}:$EPICS_BASE/bin/$EPICS_HOST_ARCH
+eval $_OLD_EXTGLOB
+unset _OLD_EXTGLOB
--- a/epics-base.spec
+++ b/epics-base.spec
@@ -0,0 +1,514 @@
+# Always make sure EpicsVersion.Version-Release matches the git tag!
+
+%define EpicsVersion 7.0.8
+
+Name:           epics-base-%{EpicsVersion}
+Summary:        EPICS Base %{EpicsVersion}
+Version:        2
+Release:        4%{?dist}
+License:        EPICS Open License
+Group:          Development/Languages
+URL:            https://git.psi.ch/epics_base/base-7.0
+
+Obsoletes:      caRepeater = 1
+
+%define module_name                          %{name}
+%define prog_folder                          /usr/local/epics/base-%{EpicsVersion}
+
+%define debug_package                        %{nil}
+%define _build_id_links                      none
+
+# do not strip libraries
+%global __strip                              /bin/true
+%undefine __brp_strip
+
+%undefine __brp_mangle_shebangs
+%undefine __brp_ldconfig
+%define _binaries_in_noarch_packages_terminate_build 0
+
+%if %{defined rhel}
+%global epics_host_arch RHEL%{rhel}-%{_host_cpu}
+%endif
+# else define epics_host_arch as suitable
+
+%description
+EPICS is a set of Open Source software tools, libraries and applications
+developed collaboratively and used worldwide to create distributed soft
+real-time control systems for scientific instruments such as a particle
+accelerators, telescopes and other large scientific experiments.
+This RPM is a binary-only package.
+
+###########################################
+
+%package host-devel
+Requires:       make >= 3.80
+BuildRequires:  make >= 3.80
+BuildRequires:  gfa-cross-compiler-links
+%if %{?rhel} >= 9
+BuildRequires:  gfa-wine
+%else
+BuildRequires:  wine
+%endif
+
+Summary:    Minimal stuff needed to build EPICS host apps
+Requires:   %{name} = %{version}-%{release}
+
+# This EPICS installation uses the toolset 12 compiler
+%if 0%{?rhel} >= 8
+Requires:       gcc-toolset-12-gcc-c++
+BuildRequires:  gcc-toolset-12-gcc-c++
+%endif
+
+# The perl stuff we need
+Requires:       perl-interpreter >= 5.10.1
+BuildRequires:  perl-interpreter >= 5.10.1
+Requires:       perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils
+BuildRequires:  perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils
+
+%if 0%{?rhel} >= 8
+Requires:       perl-Text-Tabs+Wrap
+BuildRequires:  perl-Text-Tabs+Wrap
+%endif
+
+%if 0%{?rhel} >= 9
+Requires:       perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX
+BuildRequires:  perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX
+%endif
+
+# Perl auto-detection is broken
+# It does not find all EPICS internal packages
+%global __requires_exclude_from ^%{prog_folder}/bin/.*\\.pl$
+
+%description host-devel
+Contains headers etc to build EPICS host applications.
+
+###########################################
+
+%if %{?rhel} > 8
+%package compat
+Summary:        EPICS base %{EpicsVersion} for older RHEL versions
+Requires:       %{name} = %{version}-%{release}
+AutoReqProv:    no
+
+%description compat
+Contains EPICS binaries that run on older RHEL versions.
+%endif
+
+###########################################
+
+%package wine
+Summary:        EPICS base %{EpicsVersion} for wine
+Requires:       %{name} = %{version}-%{release}
+%if %{?rhel} >= 9
+Requires:       gfa-wine
+%else
+Requires:       wine
+%endif
+
+%description wine
+Allows to run EPICS in wine.
+
+###########################################
+
+%package boot
+Summary:        EPICS base %{EpicsVersion} for boot servers
+BuildArch:      noarch
+AutoReqProv:    no
+Prefix:         /usr/local/epics
+
+%description boot
+Contains files needed on NFS server to boot EPICS targets from.
+This package can be relocated.
+
+###########################################
+
+%package devel
+Summary:        EPICS base %{EpicsVersion} for development environments
+Requires:       %{name}             = %{version}-%{release}
+Requires:       %{name}-host-devel  = %{version}-%{release}
+Requires:       gfa-cross-compiler-links
+BuildArch:      noarch
+AutoReqProv:    no
+
+%description devel
+All what is needed to develop EPICS for different target architectures.
+
+###########################################
+
+%package devel-static
+Summary:        EPICS base %{EpicsVersion} for development environments including static libraries
+Requires:       %{name}-devel = %{version}-%{release}
+BuildArch:      noarch
+AutoReqProv:    no
+
+%description devel-static
+Contains the static libraries (*.a) for EPICS development systems.
+Only needed to build statically linked applications.
+
+###########################################
+
+%package src
+Summary:        Sources code of EPICS base %{EpicsVersion}
+BuildArch:      noarch
+AutoReqProv:    no
+Prefix:         /usr/local/epics
+
+%description src
+The source code of EPICS base %{EpicsVersion}.
+May help when debugging
+
+###########################################
+
+%package doc
+Summary:        EPICS base %{EpicsVersion} documentation
+BuildArch:      noarch
+AutoReqProv:    no
+Prefix:         /usr/local/epics
+
+%description doc
+The documentation of EPICS base %{EpicsVersion}.
+
+###########################################
+
+# Our sources are locally in this directory
+# and here we also build
+# RPMS will be stored here, too
+%define _topdir %(pwd)
+%define _sourcedir %{_topdir}
+%define _builddir %{_topdir}
+
+%prep
+%{__rm} -rf %{buildroot}/usr/lib
+%{__rm} -f modules/RELEASE.*.local
+git submodule update --init --recursive modules
+%{__mkdir_p} RPMS
+
+%build
+%if %{defined epics_host_arch}
+export EPICS_HOST_ARCH=%{epics_host_arch}
+%endif
+%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} FINAL_LOCATION=%{prog_folder}
+%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} copysrc
+
+# remove files we do not need
+shopt -s extglob
+%{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA}
+%{__rm} -f %{buildroot}%{prog_folder}/bin/RTEMS*/TEMP.*
+
+# fix permissions of caRepeater.service
+%{__chmod} 644 %{buildroot}%{prog_folder}/bin/*/caRepeater.service
+
+# install the profile script
+/bin/sed 's!\$EPICS_BASE!%{prog_folder}!' epics-base.sh > %{buildroot}%{prog_folder}/bin/epics-base.sh
+
+# copy over old libraries for compatibility
+%if %{?rhel} > 8
+%{__cp} /opt/RHEL8/lib64/libreadline.so.7 %{buildroot}%{prog_folder}/lib/RHEL8-x86_64
+%endif
+
+# Do not use install section because build already installed
+# and install will delete our buildroot!
+
+%clean
+%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} realclean
+%{__rm} -f modules/RELEASE.*.local
+%{__rm} -rf %{buildroot}
+%{__cp} %{_rpmdir}/*/%{name}*%{version}-%{release}.*.rpm %{_sourcedir}
+
+# Link caRepeater and profile script to highest installed EPICS version after install and uninstall
+%post
+shopt -s extglob
+%{__rm} -f /etc/profile.d/epics-base.sh
+%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh | /usr/bin/head -n1)" /etc/profile.d/
+SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
+if [ -n "$SYSTEMD_DIR" ]
+then
+    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
+    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)
+    %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/
+    systemctl daemon-reload
+    systemctl reenable caRepeater.service
+    systemctl start caRepeater.service
+fi
+
+%postun
+shopt -s extglob
+%{__rm} -f /etc/profile.d/epics-base.sh
+%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh 2>/dev/null | /usr/bin/head -n1)" /etc/profile.d/ 2>/dev/null
+SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
+if [ -n "$SYSTEMD_DIR" ]
+then
+    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service 2>/dev/null | /usr/bin/head -n1)
+    if [ -z "$LATEST_REPEATER" ]
+    then
+        systemctl disable caRepeater.service
+        # Do not stop or restart caRepeater.service
+        # because EPICS clients cannot handle that.
+        # Next reboot will take care of this.
+    fi
+    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
+    if [ -n "$LATEST_REPEATER" ]
+    then
+        %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/ 2>/dev/null
+        systemctl reenable caRepeater.service
+    fi
+    systemctl daemon-reload
+fi
+
+###########################################
+
+%files
+%defattr(-,root,root,-)
+%dir %{prog_folder}
+%dir %{prog_folder}/configure
+%{prog_folder}/configure/CONFIG_BASE_VERSION
+
+%dir %{prog_folder}/dbd
+%{prog_folder}/dbd/softIoc*.dbd
+
+%dir %{prog_folder}/bin
+%dir %{prog_folder}/lib
+%{prog_folder}/db
+
+%{prog_folder}/bin/epics-base.sh
+%{prog_folder}/lib/perl/EpicsHostArch.pl
+%{prog_folder}/lib/perl/CA.pm
+%dir %{prog_folder}/lib/perl
+%dir %{prog_folder}/lib/perl/[0-9]*
+%dir %{prog_folder}/lib/perl/[0-9]*/*-linux-thread-multi
+%{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so
+
+# Install host binaries but avoid installing *.pl scripts
+# and other development tools
+
+%dir %{prog_folder}/bin/%{epics_host_arch}*
+%{prog_folder}/bin/%{epics_host_arch}*/[Scips]*[^.]??
+%{prog_folder}/bin/%{epics_host_arch}*/p2p
+%{prog_folder}/bin/%{epics_host_arch}*/msi
+%dir %{prog_folder}/lib/%{epics_host_arch}*
+%{prog_folder}/lib/%{epics_host_arch}*/*.so*
+
+###########################################
+
+%if %{?rhel} > 8
+
+%files compat
+%dir %{prog_folder}/bin/RHEL8*
+%{prog_folder}/bin/RHEL8*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL8*/p2p
+%{prog_folder}/bin/RHEL8*/msi
+%dir %{prog_folder}/lib/RHEL8*
+%{prog_folder}/lib/RHEL8*/*.so*
+
+%if %{?rhel} > 9
+%dir %{prog_folder}/bin/RHEL9*
+%{prog_folder}/bin/RHEL9*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL9*/p2p
+%{prog_folder}/bin/RHEL9*/msi
+%dir %{prog_folder}/lib/RHEL9*
+%{prog_folder}/lib/RHEL9*/*.so*
+%endif
+
+%endif
+
+###########################################
+
+%files wine
+%{prog_folder}/bin/win*
+
+###########################################
+
+%files boot
+# including files to build on some Linux cross archs
+# hence some configure/* and lib/perl/* listed twice
+%defattr(-,root,root,-)
+%dir %{prog_folder}
+%dir %{prog_folder}/configure
+%{prog_folder}/configure/RELEASE
+%{prog_folder}/configure/CONFIG*
+%{prog_folder}/configure/RULES*
+%dir %{prog_folder}/configure/os
+%{prog_folder}/configure/os/CONFIG.Common.UnixCommon
+%{prog_folder}/configure/os/CONFIG.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG.Common.linux-clang
+%{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
+%{prog_folder}/configure/os/CONFIG.Common.[a-z]*-*
+%{prog_folder}/configure/os/CONFIG.UnixCommon.Common
+%{prog_folder}/configure/os/CONFIG.[a-z]*-*.Common
+%{prog_folder}/configure/os/CONFIG.[a-z]*-*.[a-z]*-*
+%{prog_folder}/configure/os/CONFIG.linux-*.Common
+%{prog_folder}/configure/os/CONFIG.linux-*.linux-*
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linux-*
+%{prog_folder}/configure/os/CONFIG_SITE.[a-z]*-*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-*.UnixCommon
+%{prog_folder}/configure/os/CONFIG_SITE.linux-*.linux-*
+
+%dir %{prog_folder}/include
+%{prog_folder}/include/*.h
+%{prog_folder}/include/compiler
+%dir %{prog_folder}/include/os
+%{prog_folder}/include/os/Linux/
+%{prog_folder}/include/pv/
+%{prog_folder}/include/pva/
+%{prog_folder}/include/valgrind/
+%{prog_folder}/include/flex.skel.static
+
+%dir %{prog_folder}/dbd
+%{prog_folder}/dbd/softIoc*.dbd
+%{prog_folder}/db
+
+%dir %{prog_folder}/lib
+%dir %{prog_folder}/lib/[a-z]*-*
+%{prog_folder}/lib/[a-z]*-*/*.so*
+%dir %{prog_folder}/lib/perl
+%{prog_folder}/lib/perl/[A-Z]*/
+%{prog_folder}/lib/perl/DBD.pm
+
+%dir %{prog_folder}/bin
+# avoid pulling in host files again
+# but get all cross architectures (mostly lower case)
+# including all Windows dlls (hence listed twice: here and in wine)
+%dir %{prog_folder}/bin/[a-z]*
+%{prog_folder}/bin/[a-z]*/[Scips]*[^.]??
+%{prog_folder}/bin/[a-z]*/p2p
+%{prog_folder}/bin/[a-z]*/msi*
+%{prog_folder}/bin/[a-z]*/acctst*
+%{prog_folder}/bin/[a-z]*/*.dll
+%{prog_folder}/bin/[a-z]*/registerRecordDeviceDriver*
+
+# vxWorks and RTEMS
+%dir %{prog_folder}/bin/V*
+%{prog_folder}/bin/V*/*.munch
+%{prog_folder}/bin/V*/*.o
+%dir %{prog_folder}/bin/RTEMS*
+%{prog_folder}/bin/RTEMS*/*.boot
+
+###########################################
+
+%files host-devel
+%defattr(-,root,root,-)
+%dir %{prog_folder}/include
+%{prog_folder}/include/*.h
+%{prog_folder}/include/compiler
+%dir %{prog_folder}/include/os
+%{prog_folder}/include/os/Linux/
+%{prog_folder}/include/os/WIN32/
+%{prog_folder}/include/pv/
+%{prog_folder}/include/pva/
+%{prog_folder}/include/valgrind/
+%{prog_folder}/include/flex.skel.static
+%{prog_folder}/templates
+%dir %{prog_folder}/cfg
+%{prog_folder}/cfg/CONFIG*
+%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
+%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
+%dir %{prog_folder}/configure
+%{prog_folder}/configure/RELEASE
+%{prog_folder}/configure/CONFIG*
+%{prog_folder}/configure/RULES*
+%dir %{prog_folder}/configure/os
+%{prog_folder}/configure/os/CONFIG.Common.UnixCommon
+%{prog_folder}/configure/os/CONFIG.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG.Common.linux-clang
+%{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
+%{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
+%{prog_folder}/configure/os/CONFIG.UnixCommon.Common
+%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
+%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
+%{prog_folder}/configure/os/CONFIG.Linux.win*
+%{prog_folder}/configure/os/CONFIG.win*.win*
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
+%{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
+%{prog_folder}/bin/%{epics_host_arch}*/*.??
+%dir %{prog_folder}/lib/pkgconfig
+%{prog_folder}/lib/pkgconfig/epics-base.pc
+%{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
+%{prog_folder}/lib/perl/[A-Z]*/
+%{prog_folder}/lib/perl/DBD.pm
+%{prog_folder}/dbd
+
+###########################################
+
+%files devel
+%defattr(-,root,root,-)
+%{prog_folder}/include/os/vxWorks/
+%{prog_folder}/include/os/RTEMS/
+%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
+%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
+%{prog_folder}/cfg/TOOLCHAIN.*
+%exclude %{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
+%exclude %{prog_folder}/configure/os/CONFIG.Common.UnixCommon
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linuxCommon
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-clang
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
+%exclude %{prog_folder}/configure/os/CONFIG.UnixCommon.Common
+%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
+%exclude %{prog_folder}/configure/os/CONFIG.Linux.win*
+%exclude %{prog_folder}/configure/os/CONFIG.win*.win*
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/configure/os/
+%exclude %{prog_folder}/lib/pkgconfig/epics-base.pc
+%exclude %{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
+%{prog_folder}/lib/pkgconfig/
+%exclude %{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
+%exclude %{prog_folder}/bin/%{epics_host_arch}*/*.??
+%exclude %{prog_folder}/bin/*/[^Scips]*[^.]??
+%exclude %{prog_folder}/bin/*/*.??
+
+# VxWorks and RTEMS need static libs
+%{prog_folder}/lib/V*
+%{prog_folder}/lib/RTEMS*
+# Windows needs *.lib
+%{prog_folder}/lib/win*
+# Basic libraries to build stand-alone clients
+%exclude %{prog_folder}/lib/pkgconfig
+%dir %{prog_folder}/lib/[a-z]*
+%{prog_folder}/lib/[a-z]*/libCom.so*
+%{prog_folder}/lib/[a-z]*/libca.so*
+
+###########################################
+
+%files devel-static
+%defattr(-,root,root,-)
+
+# Install bulky static libs for Linux targets only on request
+%dir %{prog_folder}/lib/RHEL*
+%{prog_folder}/lib/RHEL*/*.a
+%dir %{prog_folder}/lib/[a-z]*
+%{prog_folder}/lib/[a-z]*/*.a
+
+###########################################
+
+%files src
+%defattr(-,root,root,-)
+%dir %{prog_folder}
+%{prog_folder}/modules
+
+###########################################
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{prog_folder}
+%docdir %{prog_folder}/html
+%docdir %{prog_folder}/doc
+%{prog_folder}/html
+%{prog_folder}/doc
--- a/modules/Makefile.local
+++ b/modules/Makefile.local
@@ -0,0 +1,2 @@
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca
--- a/modules/database/src/ioc/db/Makefile
+++ b/modules/database/src/ioc/db/Makefile
@@ -42,6 +42,7 @@ INC += dbState.h
 INC += db_access_routines.h
 INC += db_convert.h
 INC += dbUnitTest.h
+INC += dbCaPvt.h

 # Generate menuGlobal.dbd, not really by concatenation, see RULES
 DBDCAT += menuGlobal.dbd
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -1175,7 +1175,44 @@ static long dbPutFieldLink(DBADDR *paddr,

    if (!status) status = dbSetLink(plink, &link_info, new_devsup);

-    if (!status && special) status = dbPutSpecial(paddr, 1);
+    if (status) {
+        if (isDevLink) {
+            precord->dset = NULL;
+            precord->pact = TRUE;
+        }
+        goto postScanEvent;
+    }
+
+    /* We need to initialize any links with a link support layer, i.e.
+     * any CONSTANT, JSON_LINK, or PV_LINK types. However for a PV_LINK
+     * when isDevLink is set (i.e. this is the record's INP or OUT link)
+     * we must wait until after calling dsxt->add_record(). This allows
+     * the Async Soft Channel input supports to change it to a PN_LINK.
+     * For other cases we initialize the link before the second call to
+     * dbPutSpecial() because some record types such as calcout need to
+     * be able to call link support methods from prset->special().
+     */
+
+    switch (plink->type) { /* New type */
+    case PV_LINK:
+        if (isDevLink)
+            break;
+        /* else fall through */
+    case CONSTANT:
+    case JSON_LINK:
+        dbAddLink(&locker, plink, pfldDes->field_type, chan);
+        chan = NULL; /* we used it, don't clean it up */
+    }
+
+    if (special) status = dbPutSpecial(paddr, 1);
+
+    if (!status && isDevLink) {
+        precord->dpvt = NULL;
+        precord->dset = new_dset;
+        precord->pact = FALSE;
+
+        status = new_dsxt->add_record(precord);
+    }

    if (status) {
        if (isDevLink) {
@@ -1185,29 +1222,21 @@ static long dbPutFieldLink(DBADDR *paddr,
        goto postScanEvent;
    }

-    if (isDevLink) {
-        precord->dpvt = NULL;
-        precord->dset = new_dset;
-        precord->pact = FALSE;
-
-        status = new_dsxt->add_record(precord);
-        if (status) {
-            precord->dset = NULL;
-            precord->pact = TRUE;
-            goto postScanEvent;
-        }
-    }
-
    switch (plink->type) { /* New link type */
-    case PV_LINK:
    case CONSTANT:
+    case CA_LINK:
+    case DB_LINK:
+    case PN_LINK:
    case JSON_LINK:
-        dbAddLink(&locker, plink, pfldDes->field_type, chan);
-        chan = NULL; /* don't clean it up */
        break;

-    case DB_LINK:
-    case CA_LINK:
+    case PV_LINK:
+        if (isDevLink) {
+            dbAddLink(&locker, plink, pfldDes->field_type, chan);
+            chan = NULL; /* we used it, don't clean it up */
+        }
+        break;
+
    case MACRO_LINK:
        break;  /* should never get here */

@@ -1216,7 +1245,6 @@ static long dbPutFieldLink(DBADDR *paddr,
            status = S_db_badHWaddr;
            goto postScanEvent;
        }
-        break;
    }
    db_post_events(precord, plink, DBE_VALUE | DBE_LOG);

--- a/modules/database/src/ioc/db/dbCommon.dbd.pod
+++ b/modules/database/src/ioc/db/dbCommon.dbd.pod
@@ -240,6 +240,7 @@ The B<SPVT> field is for internal use by the scanning system.
 	}
 	field(PROC,DBF_UCHAR) {
 		prompt("Force Processing")
+		asl(ASL0)
 		pp(TRUE)
 		interest(3)
 	}
--- a/modules/database/src/ioc/db/dbConvertJSON.c
+++ b/modules/database/src/ioc/db/dbConvertJSON.c
@@ -24,7 +24,7 @@ typedef struct parseContext {
    short dbrType;
    short dbrSize;
    char *pdest;
-    int elems;
+    size_t elems;
 } parseContext;

 static int dbcj_null(void *ctx) {
@@ -62,19 +62,20 @@ static int dbcj_double(void *ctx, double num) {
    return 1;
 }

-static int dblsj_number(void *ctx, const char *val, size_t len) {
-    errlogPrintf("dbLSConvertJSON: Numeric value %.*s provided, string expected\n",
-        (int)len, val);
-    return 0;    /* Illegal */
-}
-
 static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
    parseContext *parser = (parseContext *) ctx;
    char *pdest = parser->pdest;

-    /* Not attempting to handle char-array fields here, they need more
-     * metadata about the field than we have available at the moment.
-     */
+    if (parser->dbrType == DBF_CHAR || parser->dbrType == DBF_UCHAR) {
+        /* Treating char array as long string */
+        if (len > parser->elems)
+            len = parser->elems;
+        strncpy(pdest, (const char *) val, len);
+        parser->elems -= len;
+        parser->pdest += len;
+        return 1;
+    }
+
    if (parser->dbrType != DBF_STRING) {
        errlogPrintf("dbConvertJSON: String \"%.*s\" provided, numeric value expected\n",
            (int)len, val);
@@ -92,21 +93,6 @@ static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
    return 1;
 }

-static int dblsj_string(void *ctx, const unsigned char *val, size_t len) {
-    parseContext *parser = (parseContext *) ctx;
-    char *pdest = parser->pdest;
-
-    if (parser->elems > 0) {
-        if (len > parser->dbrSize - 1)
-            len = parser->dbrSize - 1;
-        strncpy(pdest, (const char *) val, len);
-        pdest[len] = 0;
-        parser->pdest = pdest + len;
-        parser->elems = 0;
-    }
-    return 1;
-}
-
 static int dbcj_start_map(void *ctx) {
    errlogPrintf("dbConvertJSON: Map type not supported\n");
    return 0;    /* Illegal */
@@ -146,6 +132,11 @@ long dbPutConvertJSON(const char *json, short dbrType,
        return 0;
    }

+    if (!jlen) {
+        *pnRequest = 0;
+        return 0;
+    }
+
    parser->depth = 0;
    parser->dbrType = dbrType;
    parser->dbrSize = dbValueSize(dbrType);
@@ -181,20 +172,10 @@ long dbPutConvertJSON(const char *json, short dbrType,
    return status;
 }

-
-static yajl_callbacks dblsj_callbacks = {
-    dbcj_null, dbcj_boolean, NULL, NULL, dblsj_number, dblsj_string,
-    dbcj_start_map, NULL, NULL,
-    dbcj_start_array, NULL
-};
-
 long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
    epicsUInt32 *plen)
 {
-    parseContext context, *parser = &context;
-    yajl_handle yh;
-    yajl_status ys;
-    size_t jlen = strlen(json);
+    long nRequest = size-1;
    long status;

    if (!size) {
@@ -202,35 +183,8 @@ long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
        return 0;
    }

-    parser->depth = 0;
-    parser->dbrType = DBF_STRING;
-    parser->dbrSize = size;
-    parser->pdest = pdest;
-    parser->elems = 1;
-
-    yh = yajl_alloc(&dblsj_callbacks, NULL, parser);
-    if (!yh) {
-        errlogPrintf("dbLSConvertJSON: out of memory\n");
-        return S_db_noMemory;
-    }
-
-    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
-
-    switch (ys) {
-    case yajl_status_ok:
-        *plen = (char *) parser->pdest - pdest + 1;
-        status = 0;
-        break;
-
-    default: {
-            unsigned char *err = yajl_get_error(yh, 1,
-                (const unsigned char *) json, jlen);
-            errlogPrintf("dbLSConvertJSON: %s", err);
-            yajl_free_error(yh, err);
-            status = S_db_badField;
-        }
-    }
-
-    yajl_free(yh);
+    status = dbPutConvertJSON(json, DBF_CHAR, pdest, &nRequest);
+    pdest[nRequest++] = 0;
+    *plen = nRequest;
    return status;
 }
--- a/modules/database/src/ioc/db/dbDbLink.c
+++ b/modules/database/src/ioc/db/dbDbLink.c
@@ -232,19 +232,41 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
    return status;
 }

+/* Some records get options (precsision, units, ...) for some fields
+ * from an input link. We need to catch the case that this link
+ * points back to the same field or we will end in an infinite recursion.
+*/
+static long dbDbGetOptionLoopSafe(const struct link *plink, short dbrType,
+    void *pbuffer, long option)
+{
+    /* We need to cast away const to set the flags.
+       That's ok because we know that plink is never actually readonly.
+       And we reset everything to its original state.
+    */
+    struct link *mutable_plink = (struct link *)plink;
+    long status = S_dbLib_badLink;
+    dbChannel *chan = linkChannel(plink);
+    DBADDR *paddr = &chan->addr;
+    long number_elements = 0;
+
+    dbScanLock(paddr->precord);
+    if (!(mutable_plink->flags & DBLINK_FLAG_VISITED)) {
+        mutable_plink->flags |= DBLINK_FLAG_VISITED;
+        status = dbGet(paddr, dbrType, pbuffer, &option, &number_elements, NULL);
+        mutable_plink->flags &= ~DBLINK_FLAG_VISITED;
+    }
+    dbScanUnlock(paddr->precord);
+    return status;
+}
+
 static long dbDbGetControlLimits(const struct link *plink, double *low,
        double *high)
 {
-    dbChannel *chan = linkChannel(plink);
-    DBADDR *paddr = &chan->addr;
    struct buffer {
        DBRctrlDouble
        double value;
    } buffer;
-    long options = DBR_CTRL_DOUBLE;
-    long number_elements = 0;
-    long status = dbGet(paddr, DBR_DOUBLE, &buffer, &options, &number_elements,
-            NULL);
+    long status = dbDbGetOptionLoopSafe(plink, DBR_DOUBLE, &buffer, DBR_CTRL_DOUBLE);

    if (status)
        return status;
@@ -257,16 +279,11 @@ static long dbDbGetControlLimits(const struct link *plink, double *low,
 static long dbDbGetGraphicLimits(const struct link *plink, double *low,
        double *high)
 {
-    dbChannel *chan = linkChannel(plink);
-    DBADDR *paddr = &chan->addr;
    struct buffer {
        DBRgrDouble
        double value;
    } buffer;
-    long options = DBR_GR_DOUBLE;
-    long number_elements = 0;
-    long status = dbGet(paddr, DBR_DOUBLE, &buffer, &options, &number_elements,
-            NULL);
+    long status = dbDbGetOptionLoopSafe(plink, DBR_DOUBLE, &buffer, DBR_GR_DOUBLE);

    if (status)
        return status;
@@ -279,16 +296,11 @@ static long dbDbGetGraphicLimits(const struct link *plink, double *low,
 static long dbDbGetAlarmLimits(const struct link *plink, double *lolo,
        double *low, double *high, double *hihi)
 {
-    dbChannel *chan = linkChannel(plink);
-    DBADDR *paddr = &chan->addr;
    struct buffer {
        DBRalDouble
        double value;
    } buffer;
-    long options = DBR_AL_DOUBLE;
-    long number_elements = 0;
-    long status = dbGet(paddr, DBR_DOUBLE, &buffer, &options, &number_elements,
-            0);
+    long status = dbDbGetOptionLoopSafe(plink, DBR_DOUBLE, &buffer, DBR_AL_DOUBLE);

    if (status)
        return status;
@@ -302,16 +314,11 @@ static long dbDbGetAlarmLimits(const struct link *plink, double *lolo,

 static long dbDbGetPrecision(const struct link *plink, short *precision)
 {
-    dbChannel *chan = linkChannel(plink);
-    DBADDR *paddr = &chan->addr;
    struct buffer {
        DBRprecision
        double value;
    } buffer;
-    long options = DBR_PRECISION;
-    long number_elements = 0;
-    long status = dbGet(paddr, DBR_DOUBLE, &buffer, &options, &number_elements,
-            0);
+    long status = dbDbGetOptionLoopSafe(plink, DBR_DOUBLE, &buffer, DBR_PRECISION);

    if (status)
        return status;
@@ -322,16 +329,11 @@ static long dbDbGetPrecision(const struct link *plink, short *precision)

 static long dbDbGetUnits(const struct link *plink, char *units, int unitsSize)
 {
-    dbChannel *chan = linkChannel(plink);
-    DBADDR *paddr = &chan->addr;
    struct buffer {
        DBRunits
        double value;
    } buffer;
-    long options = DBR_UNITS;
-    long number_elements = 0;
-    long status = dbGet(paddr, DBR_DOUBLE, &buffer, &options, &number_elements,
-            0);
+    long status = dbDbGetOptionLoopSafe(plink, DBR_DOUBLE, &buffer, DBR_UNITS);

    if (status)
        return status;
--- a/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp
+++ b/modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp
@@ -6,7 +6,6 @@
 \*************************************************************************/

 #include <algorithm>
-#include <limits>
 #include <string>
 #include <set>

--- a/modules/database/src/ioc/dbStatic/dbLexRoutines.c
+++ b/modules/database/src/ioc/dbStatic/dbLexRoutines.c
@@ -1263,24 +1263,50 @@ static void dbRecordInfo(char *name, char *value)
    }
 }

+static long createAlias(DBENTRY *pdbentry, const char *alias)
+{
+    DBENTRY tempEntry;
+    long status;
+    dbRecordNode *precnode = pdbentry->precnode;
+
+    if (precnode->aliasedRecnode) precnode = precnode->aliasedRecnode;
+    dbInitEntry(pdbentry->pdbbase, &tempEntry);
+    status = dbFindRecord(&tempEntry, alias);
+    if (status == 0) {
+        if (tempEntry.precnode->aliasedRecnode != precnode) {
+            if (tempEntry.precnode->aliasedRecnode)
+                fprintf(stderr, ERL_ERROR ": Alias \"%s\" for \"%s\": name already used by an alias for \"%s\"\n",
+                            alias, dbGetRecordName(pdbentry),
+                            tempEntry.precnode->aliasedRecnode->recordname);
+            else
+                fprintf(stderr, ERL_ERROR ": Alias \"%s\" for \"%s\": name already used by a record\n",
+                            alias, dbGetRecordName(pdbentry));
+            status = S_dbLib_recExists;
+        } else if (dbRecordsOnceOnly) {
+            fprintf(stderr, ERL_ERROR ": Alias \"%s\" already defined and dbRecordsOnceOnly set.\n",
+                alias);
+            status = S_dbLib_recExists;
+        }
+    } else {
+        status = dbCreateAlias(pdbentry, alias);
+    }
+    dbFinishEntry(&tempEntry);
+    return status;
+}
+
 static void dbRecordAlias(char *name)
 {
    DBENTRY *pdbentry;
    tempListNode *ptempListNode;
-    long status;
-
    if(dbRecordNameValidate(name))
        return;

    if (duplicate) return;
    ptempListNode = (tempListNode *)ellFirst(&tempList);
    pdbentry = ptempListNode->item;
-    status = dbCreateAlias(pdbentry, name);
-    if (status) {
-        fprintf(stderr, "Can't create alias \"%s\" for \"%s\"\n",
-                    name, dbGetRecordName(pdbentry));
+
+    if (createAlias(pdbentry, name) != 0) {
        yyerror(NULL);
-        return;
    }
 }

@@ -1298,9 +1324,7 @@ static void dbAlias(char *name, char *alias)
                    alias, name);
        yyerror(NULL);
    }
-    else if (dbCreateAlias(pdbEntry, alias)) {
-        fprintf(stderr, "Can't create alias \"%s\" referring to \"%s\"\n",
-                    alias, name);
+    else if (createAlias(pdbEntry, alias) != 0) {
        yyerror(NULL);
    }
    dbFinishEntry(pdbEntry);
--- a/modules/database/src/ioc/dbStatic/dbStaticLib.c
+++ b/modules/database/src/ioc/dbStatic/dbStaticLib.c
@@ -1447,7 +1447,6 @@ long dbCreateRecord(DBENTRY *pdbentry,const char *precordName)
    pdbentry->precnode = pNewRecNode;
    ppvd = dbPvdAdd(pdbentry->pdbbase,precordType,pNewRecNode);
    if(!ppvd) {errMessage(-1,"Logic Err: Could not add to PVD");return(-1);}
-    pNewRecNode->order = pdbentry->pdbbase->no_records++;
    return(0);
 }

@@ -1701,7 +1700,6 @@ long dbCreateAlias(DBENTRY *pdbentry, const char *alias)
    }

    ellAdd(&precordType->recList, &pnewnode->node);
-    pnewnode->order = pdbentry->pdbbase->no_records++;
    precordType->no_aliases++;

    return 0;
--- a/modules/database/src/ioc/dbStatic/link.h
+++ b/modules/database/src/ioc/dbStatic/link.h
@@ -72,6 +72,7 @@ DBCORE_API extern const maplinkType pamaplinkType[LINK_NTYPES];
 /* DBLINK Flag bits */
 #define DBLINK_FLAG_INITIALIZED    1 /* dbInitLink() called */
 #define DBLINK_FLAG_TSELisTIME     2 /* Use TSEL to get timeStamp */
+#define DBLINK_FLAG_VISITED        4 /* Used in loop detection */

 struct macro_link {
    char *macroStr;
--- a/modules/database/src/ioc/dbtemplate/Makefile
+++ b/modules/database/src/ioc/dbtemplate/Makefile
@@ -11,7 +11,7 @@

 SRC_DIRS += $(IOCDIR)/dbtemplate

-PROD_HOST += msi
+PROD_CMD += msi

 msi_SRCS = msi.cpp
 DOCS += msi.md
--- a/modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
+++ b/modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
@@ -11,6 +11,7 @@

 #include <stdint.h>
 #include <string.h>
+#include <stdint.h>

 #define EPICS_PRIVATE_API

--- a/modules/database/src/ioc/rsrv/Makefile
+++ b/modules/database/src/ioc/rsrv/Makefile
@@ -16,6 +16,7 @@ caserverio_INCLUDES = -I$(SRC)/ca/client
 camessage_INCLUDES = -I$(SRC)/ca/client

 INC += rsrv.h
+INC += server.h

 DBD += rsrv.dbd

--- a/modules/database/src/ioc/rsrv/camessage.c
+++ b/modules/database/src/ioc/rsrv/camessage.c
@@ -280,6 +280,37 @@ static void log_header (
    struct channel_in_use *pciu;
    char hostName[256];

+    const char * cmd_str [] = {
+         "CA_PROTO_VERSION",
+         "CA_PROTO_EVENT_ADD",
+         "CA_PROTO_EVENT_CANCEL",
+         "CA_PROTO_READ",
+         "CA_PROTO_WRITE",
+         "CA_PROTO_SNAPSHOT",
+         "CA_PROTO_SEARCH",
+         "CA_PROTO_BUILD",
+         "CA_PROTO_EVENTS_OFF",
+         "CA_PROTO_EVENTS_ON",
+         "CA_PROTO_READ_SYNC",
+         "CA_PROTO_ERROR",
+         "CA_PROTO_CLEAR_CHANNEL",
+         "CA_PROTO_RSRV_IS_UP",
+         "CA_PROTO_NOT_FOUND",
+         "CA_PROTO_READ_NOTIFY",
+         "CA_PROTO_READ_BUILD",
+         "REPEATER_CONFIRM",
+         "CA_PROTO_CREATE_CHAN",
+         "CA_PROTO_WRITE_NOTIFY",
+         "CA_PROTO_CLIENT_NAME",
+         "CA_PROTO_HOST_NAME",
+         "CA_PROTO_ACCESS_RIGHTS",
+         "CA_PROTO_ECHO",
+         "REPEATER_REGISTER",
+         "CA_PROTO_SIGNAL",
+         "CA_PROTO_CREATE_CH_FAIL",
+         "CA_PROTO_SERVER_DISCONN"
+    };
+
    ipAddrToDottedIP (&client->addr, hostName, sizeof(hostName));

    pciu = MPTOPCIU(mp);
@@ -289,8 +320,10 @@ static void log_header (
            hostName, pContext);
    }

-    epicsPrintf ( "CAS: Request from %s => cmmd=%d cid=0x%x type=%d count=%d postsize=%u\n",
-        hostName, mp->m_cmmd, mp->m_cid, mp->m_dataType, mp->m_count, mp->m_postsize);
+    epicsPrintf ( "CAS: %s Request from %s => cmmd=%d (%s) cid=0x%x type=%d count=%d postsize=%u version=%u\n",
+        client->proto==IPPROTO_TCP ? "TCP" : "UDP",
+        hostName, mp->m_cmmd, mp->m_cmmd <= CA_PROTO_LAST_CMMD ? cmd_str[mp->m_cmmd] : "invalid",
+        mp->m_cid, mp->m_dataType, mp->m_count, mp->m_postsize, client->minor_version_number);

    epicsPrintf ( "CAS: Request from %s =>   available=0x%x \tN=%u paddr=%p\n",
        hostName, mp->m_available, mnum, (pciu ? (void *)&pciu->dbch : NULL));
@@ -319,6 +352,18 @@ unsigned            lineno
    SEND_UNLOCK ( client );
 }

+/*
+ * bad_udp_cmd_beacon()
+ */
+static int bad_udp_cmd_beacon ( caHdrLargeArray *mp,
+                       void *pPayload, struct client *pClient )
+{
+    if (CASDEBUG > 0)
+        log_header ("got a beacon on the wrong UDP port",
+                    pClient, mp, pPayload, 0);
+    return RSRV_ERROR;
+}
+
 /*
 * bad_udp_cmd_action()
 */
@@ -363,6 +408,8 @@ static int tcp_version_action ( caHdrLargeArray *mp, void *pPayload,

    client->minor_version_number = mp->m_count;

+    DLOG(3, ("TCP set version %u\n", client->minor_version_number));
+
    if (!CA_VSUPPORTED(mp->m_count)) {
        DLOG ( 2, ( "CAS: Ignore version from unsupported client %u\n", mp->m_count ) );
        return RSRV_ERROR;
@@ -1213,6 +1260,7 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
    struct dbChannel *dbch;
    char *pName = (char *) pPayload;

+    DLOG (3, ("claim_ciu_action: version = %u\n", mp->m_available));
    /*
     * The available field is used (abused)
     * here to communicate the miner version number
@@ -2121,6 +2169,8 @@ static int udp_version_action ( caHdrLargeArray *mp, void *pPayload, struct clie
 {
    client->minor_version_number = mp->m_count;

+    DLOG (3, ("UDP set version %u\n", client->minor_version_number));
+
    if (!CA_VSUPPORTED(mp->m_count)) {
        DLOG ( 2, ( "CAS: Ignore version from unsupported client %u\n", mp->m_count ) );
        return RSRV_ERROR;
@@ -2174,6 +2224,9 @@ static int search_reply_udp ( caHdrLargeArray *mp, void *pPayload, struct client
    size_t          spaceNeeded;
    size_t          reasonableMonitorSpace = 10;

+    DLOG (3, epicsPrintf("UDP search for \"%.*s\" by %s@%s client version %u, m_count = %u\n",
+        mp->m_postsize, pName, client->pUserName, client->pHostName, client->minor_version_number, mp->m_count));
+
    if (!CA_VSUPPORTED(mp->m_count)) {
        DLOG ( 2, ( "CAS: Ignore search from unsupported client %u\n", mp->m_count ) );
        return RSRV_ERROR;
@@ -2261,6 +2314,9 @@ static int search_reply_tcp (
    size_t          spaceNeeded;
    size_t          reasonableMonitorSpace = 10;

+    DLOG (3, ("TCP search for \"%.*s\" by %s@%s client version %u, m_count = %u\n",
+        mp->m_postsize, pName, client->pUserName, client->pHostName, client->minor_version_number, mp->m_count));
+
    if (!CA_VSUPPORTED(mp->m_count)) {
        DLOG ( 2, ( "CAS: Ignore search from unsupported client %u\n", mp->m_count ) );
        return RSRV_ERROR;
@@ -2368,7 +2424,7 @@ static const pProtoStubUDP udpJumpTable[] =
    bad_udp_cmd_action,
    bad_udp_cmd_action,
    bad_udp_cmd_action,
-    bad_udp_cmd_action,
+    bad_udp_cmd_beacon,
    bad_udp_cmd_action,
    bad_udp_cmd_action,
    bad_udp_cmd_action,
@@ -2449,6 +2505,7 @@ int camessage ( struct client *client )
            pBody = ( void * ) ( mp + 1 );
        }

+#if 0
        /* ignore deprecated clients, but let newer clients identify themselves. */
        if (msg.m_cmmd!=CA_PROTO_VERSION && !CA_VSUPPORTED(client->minor_version_number)) {
            if (client->proto==IPPROTO_TCP) {
@@ -2470,6 +2527,7 @@ int camessage ( struct client *client )
            }
            break;
        }
+#endif

        /*
         * disconnect clients that don't send 8 byte
--- a/modules/database/src/std/dev/devAiSoftCallback.c
+++ b/modules/database/src/std/dev/devAiSoftCallback.c
@@ -81,7 +81,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devBiSoftCallback.c
+++ b/modules/database/src/std/dev/devBiSoftCallback.c
@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devI64inSoftCallback.c
+++ b/modules/database/src/std/dev/devI64inSoftCallback.c
@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devLiSoftCallback.c
+++ b/modules/database/src/std/dev/devLiSoftCallback.c
@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devMbbiDirectSoftCallback.c
+++ b/modules/database/src/std/dev/devMbbiDirectSoftCallback.c
@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devMbbiSoftCallback.c
+++ b/modules/database/src/std/dev/devMbbiSoftCallback.c
@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/dev/devSiSoftCallback.c
+++ b/modules/database/src/std/dev/devSiSoftCallback.c
@@ -81,7 +81,7 @@ static long add_record(dbCommon *pcommon)
    devPvt *pdevPvt;
    processNotify *ppn;

-    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
+    if (plink->type == CONSTANT)
        return 0;

    if (plink->type != PV_LINK) {
--- a/modules/database/src/std/rec/mbboDirectRecord.dbd.pod
+++ b/modules/database/src/std/rec/mbboDirectRecord.dbd.pod
@@ -138,6 +138,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
        prompt("Word")
        promptgroup("50 - Output")
        asl(ASL0)
+        special(SPC_RESET)
        pp(TRUE)
    }
    field(OMSL,DBF_MENU) {
--- a/modules/database/src/std/rec/seqRecord.c
+++ b/modules/database/src/std/rec/seqRecord.c
@@ -282,10 +282,10 @@ static void processCallback(epicsCallback *arg)
 static long get_units(DBADDR *paddr, char *units)
 {
    seqRecord *prec = (seqRecord *) paddr->precord;
-    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1);
+    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY0);

    if (fieldOffset >= 0)
-        switch (fieldOffset & 2) {
+        switch (fieldOffset & 3) {
        case 0: /* DLYn */
            strcpy(units, "s");
            break;
@@ -299,11 +299,11 @@ static long get_units(DBADDR *paddr, char *units)
 static long get_precision(const DBADDR *paddr, long *pprecision)
 {
    seqRecord *prec = (seqRecord *) paddr->precord;
-    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1);
+    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY0);
    short precision;

    if (fieldOffset >= 0)
-        switch (fieldOffset & 2) {
+        switch (fieldOffset & 3) {
        case 0: /* DLYn */
            *pprecision = seqDLYprecision;
            return 0;
@@ -321,10 +321,10 @@ static long get_precision(const DBADDR *paddr, long *pprecision)
 static long get_graphic_double(DBADDR *paddr, struct dbr_grDouble *pgd)
 {
    seqRecord *prec = (seqRecord *) paddr->precord;
-    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1);
+    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY0);

    if (fieldOffset >= 0)
-        switch (fieldOffset & 2) {
+        switch (fieldOffset & 3) {
        case 0: /* DLYn */
            pgd->lower_disp_limit = 0.0;
            pgd->lower_disp_limit = 10.0;
@@ -341,9 +341,9 @@ static long get_graphic_double(DBADDR *paddr, struct dbr_grDouble *pgd)

 static long get_control_double(DBADDR *paddr, struct dbr_ctrlDouble *pcd)
 {
-    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1);
+    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY0);

-    if (fieldOffset >= 0 && (fieldOffset & 2) == 0) { /* DLYn */
+    if (fieldOffset >= 0 && (fieldOffset & 3) == 0) { /* DLYn */
        pcd->lower_ctrl_limit = 0.0;
        pcd->upper_ctrl_limit = seqDLYlimit;
    }
@@ -355,9 +355,9 @@ static long get_control_double(DBADDR *paddr, struct dbr_ctrlDouble *pcd)
 static long get_alarm_double(DBADDR *paddr, struct dbr_alDouble *pad)
 {
    seqRecord *prec = (seqRecord *) paddr->precord;
-    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY1);
+    int fieldOffset = dbGetFieldIndex(paddr) - indexof(DLY0);

-    if (fieldOffset >= 0 && (fieldOffset & 2) == 2)  /* DOn */
+    if (fieldOffset >= 0 && (fieldOffset & 3) == 2)  /* DOn */
        dbGetAlarmLimits(get_dol(prec, fieldOffset),
            &pad->lower_alarm_limit,   &pad->lower_warning_limit,
            &pad->upper_warning_limit, &pad->upper_alarm_limit);
--- a/modules/database/test/ioc/db/Makefile
+++ b/modules/database/test/ioc/db/Makefile
@@ -36,6 +36,7 @@ dbTestIoc_DBD += xLink.dbd
 dbTestIoc_DBD += devx.dbd
 dbTestIoc_DBD += jlinkz.dbd
 dbTestIoc_DBD += dbLinkdset.dbd
+dbTestIoc_DBD += dbCore.dbd
 TESTFILES += $(COMMON_DIR)/dbTestIoc.dbd ../xRecord.db

 testHarness_SRCS += dbTestIoc_registerRecordDeviceDriver.cpp
@@ -183,6 +184,11 @@ testHarness_SRCS += dbStaticTest.c
 TESTFILES += ../dbStaticTest.db
 TESTFILES += ../dbStaticTestAlias1.db
 TESTFILES += ../dbStaticTestAlias2.db
+TESTFILES += ../dbStaticTestAliasAgain1.db
+TESTFILES += ../dbStaticTestAliasAgain2.db
+TESTFILES += ../dbStaticTestAliasAgain3.db
+TESTFILES += ../dbStaticTestAliasAgainError1.db
+TESTFILES += ../dbStaticTestAliasAgainError2.db
 TESTFILES += ../dbStaticTestRemove.db
 TESTS += dbStaticTest

--- a/modules/database/test/ioc/db/dbStaticTest.c
+++ b/modules/database/test/ioc/db/dbStaticTest.c
@@ -14,6 +14,7 @@
 #include <dbUnitTest.h>
 #include <testMain.h>
 #include <epicsString.h>
+#include <iocsh.h>


 static void testEntryRemoved(const char *pv)
@@ -321,16 +322,19 @@ static void testDbVerify(const char *record)
    dbFinishEntry(&entry);
 }

-static void testWrongAliasRecord(const char *filename)
+static void testReadDatabase(const char *filename, int expectToFail)
 {
    FILE *fp = NULL;
+    long status;
    dbPath(pdbbase,"." OSI_PATH_LIST_SEPARATOR "..");
    dbOpenFile(pdbbase, filename, &fp);
    if(!fp) {
-        testAbort("Unable to read %s", filename);
+        testAbort("Unable to open %s", filename);
    }
-    testOk(dbReadDatabaseFP(&pdbbase, fp, NULL, NULL) != 0,
-           "Wrong alias record in %s is expected to fail", filename);
+    status = dbReadDatabaseFP(&pdbbase, fp, NULL, NULL);
+    testOk(!status == !expectToFail,
+            "Reading %s%s", filename,
+            expectToFail ? " is expected to fail" : "");
 }

 void dbTestIoc_registerRecordDeviceDriver(struct dbBase *);
@@ -341,7 +345,7 @@ MAIN(dbStaticTest)
    char *ldirDup;
    FILE *fp = NULL;

-    testPlan(340);
+    testPlan(350);
    testdbPrepare();

    testdbReadDatabase("dbTestIoc.dbd", NULL, NULL);
@@ -370,8 +374,21 @@ MAIN(dbStaticTest)
    }
    free(ldirDup);

-    testWrongAliasRecord("dbStaticTestAlias1.db");
-    testWrongAliasRecord("dbStaticTestAlias2.db");
+    testReadDatabase("dbStaticTestAlias1.db", 1);
+    testReadDatabase("dbStaticTestAlias2.db", 1);
+
+    /* Test re-defining aliases */
+    testReadDatabase("dbStaticTestAliasAgain1.db", 0);
+    testReadDatabase("dbStaticTestAliasAgain1.db", 0);
+    testReadDatabase("dbStaticTestAliasAgain2.db", 0);
+    testReadDatabase("dbStaticTestAliasAgain2.db", 0);
+    testReadDatabase("dbStaticTestAliasAgain3.db", 0);
+    testReadDatabase("dbStaticTestAliasAgain3.db", 0);
+    testReadDatabase("dbStaticTestAliasAgainError1.db", 1);
+    testReadDatabase("dbStaticTestAliasAgainError2.db", 1);
+    iocshCmd("var dbRecordsOnceOnly 1");
+    testReadDatabase("dbStaticTestAliasAgain2.db", 1);
+    testReadDatabase("dbStaticTestAliasAgain3.db", 1);

    testEntry("testrec.VAL");
    testEntry("testalias.VAL");
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG.Linux.windows-x64`