Don't use build-ids. We don't build debug packages and it causes conflics for the copied over compatibility libraris readelf etc

for older RHEL7 versions because of backward compatibility problems with RPM.
Remove the exception in CONFIG_SITE.Common.linuxCommon for release 7.0.8!
Create links with full version shared library names to allow programs built
against previous rpm version to run.

.github/workflows/ci-scripts-build.yml

@@ -29,6 +29,7 @@ on:
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci

.gitignore

@@ -20,3 +20,5 @@ O.*/
 .iocsh_history
 RPMS
 SRPMS
+BUILDROOT
+*.rpm

configure/CONFIG_BASE_VERSION

@@ -48,7 +48,7 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 7
+EPICS_MODIFICATION = 8
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero

configure/CONFIG_CA_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 3
+EPICS_CA_MAINTENANCE_VERSION = 4
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_COMMON

@@ -422,10 +422,10 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 555
-LIB_PERMISSIONS = 444
-SHRLIB_PERMISSIONS = 555
-INSTALL_PERMISSIONS = 444
+BIN_PERMISSIONS = 755
+LIB_PERMISSIONS = 644
+SHRLIB_PERMISSIONS = 755
+INSTALL_PERMISSIONS = 644
 
 #---------------------------------------------------------------
 #

configure/CONFIG_DATABASE_VERSION

@@ -1,7 +1,7 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 22
+EPICS_DATABASE_MINOR_VERSION = 23
 EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_LIBCOM_VERSION

@@ -1,7 +1,7 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 22
+EPICS_LIBCOM_MINOR_VERSION = 23
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/RULES_BUILD

@@ -514,6 +514,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))
@@ -545,11 +552,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -1,6 +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

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -1 +1,3 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -1,6 +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 = gcc-toolset-12
 STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -1,3 +1,5 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
 
+BUILD_CLASS = HOST
+
 STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RHEL9-x86_64

@@ -1,6 +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 = gcc-toolset-12
 STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL9-x86_64-clang

@@ -1,3 +1,5 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
 
+BUILD_CLASS = HOST
+
 STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.V69-ppc32

@@ -1,3 +1,3 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
 VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+#export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -1,6 +1,6 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
 VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+#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

configure/os/CONFIG.Common.deb10-x86_64

@@ -5,18 +5,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = x86_64
 
-LDLIBS_SHARED_YES=LDLIBS
-
-SDK = gcc
-SDK_DIR  = /opt/xgcc/gcc-8.3.0-deb10
-GNU_ARCH = x86_64-deb10-linux-gnu
-SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
-GNU_DIR = $(SDK_DIR)
-GNU_BIN = $(GNU_DIR)/bin
-GNU_TARGET_INCLUDE_DIR =
-GNU_TARGET=x86_64-deb10-linux-gnu
-
-ARCH_DEP_CPPFLAGS =
-AS=$(GNU_BIN)/$(GNU_TARGET)-as
+GNU_DIR    = /opt/xgcc/gcc-8.3.0-deb10
+GNU_TARGET = x86_64-deb10-linux-gnu
 
 STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -5,17 +5,10 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = ppc
 
-SDK = gcc
-SDK_DIR = /opt/xgcc/gcc-8.5.0
-GNU_ARCH = powerpc-ppmac-linux-gnu
-SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
-GNU_DIR = $(SDK_DIR)
-GNU_BIN = $(GNU_DIR)/bin/
-GNU_TARGET_INCLUDE_DIR =
-GNU_TARGET=powerpc-ppmac-linux-gnu
+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,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/
-AS=$(GNU_BIN)/$(GNU_TARGET)-as
+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

configure/os/CONFIG.Common.linuxCommon

@@ -24,23 +24,17 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(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 = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(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))
 
-ifneq ($(LINKER_USE_RPATH:NO=),)
-ifeq ($(T_A),$(EPICS_HOST_ARCH))
-LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_LIB)
-endif
-endif
-
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both
 # readline and ncurses, and the oldest need readline and curses

configure/os/CONFIG.Common.moxa42-armv6l

@@ -6,7 +6,6 @@ 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
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
 
 COMMANDLINE_LIBRARY = READLINE_NCURSES
 

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -10,7 +10,9 @@ 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
-LD_LIBRARY_PATH=/usr/$$LIB:/opt/RHEL7/$$LIB
+
+# 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

configure/os/CONFIG.Common.raspbian-arm

@@ -37,5 +37,8 @@ SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
 # 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)

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -12,7 +12,10 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 SYSROOT = /opt/RHEL7
 
 # "Cross" TOOLSET progs need to find their libraries
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+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.

configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64

@@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 SYSROOT = /opt/RHEL7
 
 # "Cross" TOOLSET progs need to find their libraries
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
+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)

configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64

@@ -15,7 +15,6 @@ SYSROOT = /opt/RHEL8
 # Thus only wrap the compiler.
 WRAPPER = -wrapper env,LD_LIBRARY_PATH=$(TOOLSET_DIR:%=$(SYSROOT)%/usr/lib64:)/usr/lib64:$(SYSROOT)/usr/lib64
 TARGET_CPPFLAGS += $(WRAPPER)
-TARGET_PROD_LDFLAGS += $(WRAPPER)
 
 # These programs as cross tools would also need LD_LIBRARY_PATH.
 # But but our host versions work just fine.

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -92,6 +92,9 @@ WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
 #--------------------------------------------------
 # Modules we cannot build with old compiler
 
+# For the license counter
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+
 PV_MODULES = pv% normativeTypes
 SKIP_BUILDS_5 = $(PV_MODULES)
 SKIP_BUILDS_OLD = $(PV_MODULES)

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

configure/os/CONFIG_SITE.linux-x86.Common

@@ -11,10 +11,6 @@ INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPIC
 GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
 
-# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
-# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
-export LD_LIBRARY_PATH=
-
 # vxWorks for MVxxxx boards
 #CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
 #CROSS_COMPILER_TARGET_ARCHS += V67-ppc604

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
 

documentation/RELEASE_NOTES.md

@@ -20,7 +20,62 @@ should also be read to understand what has changed since earlier releases:
 
 **This version of EPICS has not been released yet.**
 
-## Changes made on the 7.0 branch since 7.0.7
+## Changes made on the 7.0 branch since 7.0.8
+
+
+-----
+
+## EPICS Release 7.0.8
+
+### bi "Raw Soft Channel" use MASK
+
+If MASK is non-zero, The raw device support will now apply MASK to the
+value read into RVAL.
+eg. allows extraction of a bit from an input integer.
+
+```
+record(longin, "integer") {
+    field(VAL, "0xff")
+}
+record(bi, "bit1") {
+    field(DESC, "extract bit 1")
+    field(DTYP, "Raw Soft Channel")
+    field(INP , "integer")
+    field(MASK, "0x2")
+    field(ZNAM, "Clear")
+    field(ONAM, "Set")
+}
+```
+
+### ANSI escapes in stderr
+
+ANSI escape charactor sequences may now be printed to the stderr stream.
+These escapes will appear in logs captured from that stream.
+Tools which parse and/or render these logs may need to be adjusted to
+either strip out the escapes, or to translate them into markup.
+(see [ansi2html](https://pypi.org/project/ansi2html/) for example)
+
+### Allow explicit append with `dbRecordsOnceOnly!=0`
+
+Previously setting `dbRecordsOnceOnly!=0` prevented any further changes to a record via a .db file.  eg.
+
+```
+record(ai, "myrec") {}
+```
+
+`dbRecordsOnceOnly!=0` previously disallowed appending fields with either form:
+
+```
+record("*", "myrec") {} # error
+record(ai, "myrec") {}  # error
+```
+
+Beginning with this release, `dbRecordsOnceOnly!=0` allows appending when explicitly intended (when record type is `"*"`).
+
+```
+record("*", "myrec") {} # allowed
+record(ai, "myrec") {}  # error
+```
 
 ### PROC field changed to ASL0
 

documentation/ReleaseChecklist.html

@@ -48,14 +48,14 @@ everything that has to be done since it's so easy to miss steps.</p>
 <p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> ()</dt>
+  <dt><strong>Release Manager</strong></dt>
     <dd>Responsible for managing and tagging the release</dd>
-  <dt><strong>Platform Developers</strong> (informal)</dt>
-    <dd>Responsible for individual operating system platforms</dd>
+  <dt><strong>Core Developers</strong></dt>
+    <dd>Responsible for maintaining the EPICS software</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>APS Website Editor</strong> (Andrew Johnson)</dt>
-    <dd>Responsible for the APS EPICS website</dd>
+  <dt><strong>Website Editors</strong></dt>
+    <dd>Responsible for the EPICS websites</dd>
 </dl>
 
 <form>
@@ -72,23 +72,22 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Email all developers about the upcoming release and ask for a list
-        of remaining tasks that must be finished.</td>
+      <td>Notify core developers about the upcoming release and ask about any
+        remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>All developers</td>
       <td>Check the bug tracker for any outstanding items and handle
-        appropriately. All bugs that have been fixed should have been marked
-        as Fix Committed.</td>
+        appropriately.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Git commits for
-        enhancements and new functionality should have been completed. After
-        this date, commits should only be made to fix problems that show up
-        during testing.</td>
+      <td>Set a Feature Freeze date, by which time all Git branches for
+        enhancements and new functionality should have been merged. After this
+        date, commits and merges should only be made to fix problems that show
+        up during testing.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -97,6 +96,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Ensure that documentation will be updated before the release date:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
         </ul>
       </td>
@@ -104,13 +104,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this checklist for the upcoming release.</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Create a release milestone on Launchpad. If a target release date is
-        known set "Date Targeted" to the expected release date.</td>
+      <td>Review and update this checklist for the upcoming release.
+        Update the release version number in the tags and messages below.</td>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -118,7 +113,7 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
-      <td>Run the built-in test programs on all available host platforms using
+      <td>Run the internal test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -156,6 +151,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Check that documentation has been updated:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
           </ul>
         </td>
@@ -167,8 +163,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Obtain a positive <q>Ok to release</q> from developers.</td>
+      <td>Core Developers</td>
+      <td>Reach a consensus that the software is ready to release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -191,27 +187,29 @@ everything that has to be done since it's so easy to miss steps.</p>
               cd base-7.0/modules/&lt;module&gt;/documentation<br />
               pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
               </tt></blockquote>
-            Commit changes (don't push).</li>
+            Commit these changes (don't push).</li>
 
           <li>Edit the module's release version file
-            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
-            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
-            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
-            Commit changes (don't push).</li>
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and the
+            <tt>Doxyfile</tt>s in the top-level and/or documentation
+            directories. In these, set <tt>DEVELOPMENT_FLAG</tt> to 0 and remove
+            <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string. Commit these
+            changes (don't push).</li>
 
           <li>Tag the module:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.7' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.8' &lt;module-version&gt;
               </tt></blockquote>
             </li>
 
           <li>Update the git submodule on the Base-7.0 branch to the
-            newly-tagged version, but don't commit yet:
+            newly-tagged version, check the module's status matches the tag:
             <blockquote><tt>
               cd base-7.0/modules<br />
               git add &lt;module&gt;<br />
               git submodule status --cached
               </tt></blockquote>
+            Don't commit the submodule updates yet.
             </li>
 
           <li>Edit the module's release version file
@@ -221,7 +219,8 @@ everything that has to be done since it's so easy to miss steps.</p>
             <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
             module version number. Commit changes.</li>
 
-          <li>Push commits and the new tag to the submodule's GitHub repository:
+          <li>Push commits and the new tag to the submodule's GitHub repository
+            (assumed to be the <tt>upstream</tt> remote):
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -270,10 +269,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for release' R7.0.7
+          git tag -m 'ANJ: Tagged for release' R7.0.8
           </tt></blockquote>
-        <p>Don't push anything to the Launchpad repository
-          yet.</p>
+        <p>Don't push to GitHub yet.</p>
         </td>
       </tr>
     <tr>
@@ -305,12 +303,12 @@ everything that has to be done since it's so easy to miss steps.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.7 ../base-7.0.7.tar.gz base-7.0.7/
+          ./.tools/make-tar.sh R7.0.8 ../base-7.0.8.tar.gz base-7.0.8/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.7.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.8.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -318,8 +316,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. When this succeeds the commits and new git
-        tag can be pushed to the Launchpad repository:
+        least one supported platform. If this succeeds the commits and new git
+        tag can be pushed to the GitHub repository's 7.0 branch (assumed to be
+        the <tt>upstream</tt> remote):
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -367,7 +366,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to epics-controls</th>
+      <th colspan="3">Publish to epics-controls.org</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -375,7 +374,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Upload the tar file and its <tt>.asc</tt> signature file to the
         epics-controls web-server.
         <blockquote><tt>
-          scp base-7.0.7.tar.gz base-7.0.7.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.8.tar.gz base-7.0.8.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -392,22 +391,22 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to Launchpad</th>
+      <th colspan="3">Publish to GitHub</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Go to the Launchpad milestone for this release. Click the Create
-        release button and add the release date. Put a URL for the release page
-        in the Release notes box, and click the Create release button. Upload
-        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
-        release page.</td>
+      <td>Go to the GitHub
+        <a href="https://github.com/epics-base/epics-base/releases/new?tag=R7.0.8">
+          Create release from tag R7.0.8</a> page.
+        Upload the tar file and its <tt>.asc</tt> signature file to the new
+        GitHub release page.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
+      <td>We used to close out bug reports in Launchpad at release-time, this
+        would be the time to do that if we have an equivalent on GitHub.</td>
       </tr>
 
     <tr>

epics-base.sh

@@ -1,6 +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}:$(echo $(ls -dvr /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/$EPICS_HOST_ARCH) | tr ' ' :)
+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

epics-base.spec

@@ -1,21 +1,22 @@
 # Always make sure EpicsVersion.Version-Release matches the git tag!
 
-%define EpicsVersion 7.0.7
+%define EpicsVersion 7.0.8
 
 Name:           epics-base-%{EpicsVersion}
 Summary:        EPICS Base %{EpicsVersion}
 Version:        1
-Release:        5%{?dist}
+Release:        0%{?dist}
 License:        EPICS Open License
 Group:          Development/Languages
 URL:            https://git.psi.ch/epics_base/base-7.0
 
-Obsoletes:      caRepeater
+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
@@ -28,6 +29,7 @@ Obsoletes:      caRepeater
 %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
@@ -41,6 +43,12 @@ 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}
@@ -75,11 +83,9 @@ Requires:       perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin pe
 BuildRequires:  perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX
 %endif
 
-%if 0%{?rhel} == 7
 # Perl auto-detection is broken
 # It does not find all EPICS internal packages
 %global __requires_exclude_from ^%{prog_folder}/bin/.*\\.pl$
-%endif
 
 %description host-devel
 Contains headers etc to build EPICS host applications.
@@ -99,8 +105,11 @@ Contains EPICS binaries that run on other RHEL versions.
 %package wine
 Summary:        EPICS base %{EpicsVersion} for wine
 Requires:       %{name} = %{version}-%{release}
+%if %{?rhel} >= 9
+Requires:       gfa-wine
+%else
 Requires:       wine
-BuildRequires:  wine
+%endif
 
 %description wine
 Allows to run EPICS in wine.
@@ -123,7 +132,6 @@ This package can be relocated.
 Summary:        EPICS base %{EpicsVersion} for development environments
 Requires:       %{name}             = %{version}-%{release}
 Requires:       %{name}-host-devel  = %{version}-%{release}
-Requires:       %{name}-boot        = %{version}-%{release}
 Requires:       gfa-cross-compiler-links
 BuildArch:      noarch
 AutoReqProv:    no
@@ -170,7 +178,7 @@ The documentation of EPICS base %{EpicsVersion}.
 
 # Our sources are locally in this directory
 # and here we also build
-# RPMS and SRPMS will be stored here, too
+# RPMS will be stored here, too
 %define _topdir %(pwd)
 %define _sourcedir %{_topdir}
 %define _builddir %{_topdir}
@@ -178,74 +186,83 @@ The documentation of EPICS base %{EpicsVersion}.
 %prep
 %{__rm} -rf %{buildroot}/usr/lib
 %{__rm} -f modules/RELEASE.*.local
-git submodule update --init modules
+git submodule update --init --recursive modules
 %{__mkdir_p} RPMS
-%{__mkdir_p} SRPMS
 
 %build
 %if %{defined epics_host_arch}
 export EPICS_HOST_ARCH=%{epics_host_arch}
 %endif
-%{__make} -j $RPM_BUILD_NCPUS INSTALL_LOCATION=%{buildroot}/%{prog_folder} FINAL_LOCATION=%{prog_folder}
-%{__make} INSTALL_LOCATION=%{buildroot}/%{prog_folder} copysrc
+%{__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.*
+%{__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
-%{__install} epics-base.sh %{buildroot}/%{prog_folder}/bin
+/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} > 7
+%{__cp} /opt/RHEL7/lib64/libreadline.so.6 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
+%endif
+%if %{?rhel} > 8
+%{__cp} /opt/RHEL7/lib64/libtinfo.so.5 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
+%{__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} realclean
+%{__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
-
-if [ -e /etc/profile.d/epics-base.sh ]
-then
-    %{__rm} -f /etc/profile.d/epics-base.sh
-fi
+%{__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
-    systemctl is-enabled caRepeater.service 2>/dev/null && systemctl disable --now caRepeater.service
-    test -e  $SYSTEMD_DIR/caRepeater.service && %{__rm} $SYSTEMD_DIR/caRepeater.service
-    %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)" $SYSTEMD_DIR/
+    %{__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
-    killall caRepeater 2>/dev/null
-    systemctl enable --now caRepeater.service
+    systemctl reenable caRepeater.service
+    systemctl start caRepeater.service
 fi
 
 %postun
 shopt -s extglob
-
-if [ -e /etc/profile.d/epics-base.sh ]
-then
-    %{__rm} -f /etc/profile.d/epics-base.sh
-fi
+%{__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
-    systemctl disable --now caRepeater.service
-    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
-    %{__ln_s} "$(/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)" $SYSTEMD_DIR/ 2>/dev/null
-    systemctl daemon-reload
-    if [ -e $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 2>/dev/null | /usr/bin/head -n1)
+    if [ -z "$LATEST_REPEATER" ]
     then
-        killall caRepeater 2>/dev/null
-        systemctl enable --now caRepeater.service
+        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
@@ -262,36 +279,49 @@ fi
 %{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/*
+%dir %{prog_folder}/lib/perl/*/*-linux-thread-multi
+%{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so
 
 # Install host binaries but avoid installing *.pl scripts
 # and other development tools
 
-%if %{defined rhel}
-%dir %{prog_folder}/bin/RHEL%{rhel}*
-%{prog_folder}/bin/RHEL%{rhel}*/[Scips]*[^.]??
-%{prog_folder}/bin/RHEL%{rhel}*/p2p
-%{prog_folder}/bin/RHEL%{rhel}*/msi
-%dir %{prog_folder}/lib/RHEL%{rhel}*
-%{prog_folder}/lib/RHEL%{rhel}*/*.so*
-%endif
+%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*
 
 ###########################################
 
 %files compat
 %if %{?rhel} > 7
-%{prog_folder}/bin/RHEL7*
+%dir %{prog_folder}/bin/RHEL7*
+%{prog_folder}/bin/RHEL7*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL7*/p2p
+%{prog_folder}/bin/RHEL7*/msi
 %dir %{prog_folder}/lib/RHEL7*
 %{prog_folder}/lib/RHEL7*/*.so*
 %endif
 
 %if %{?rhel} > 8
-%{prog_folder}/bin/RHEL8*
+%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*
 %endif
 
 %if %{?rhel} > 9
-%{prog_folder}/bin/RHEL9*
+%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
@@ -305,6 +335,7 @@ fi
 
 %files boot
 %defattr(-,root,root,-)
+%dir %{prog_folder}
 %dir %{prog_folder}/configure
 %{prog_folder}/configure/CONFIG_BASE_VERSION
 
@@ -324,6 +355,7 @@ fi
 %dir %{prog_folder}/bin/[a-z]*
 %{prog_folder}/bin/[a-z]*/[Scips]*[^.]??
 %{prog_folder}/bin/[a-z]*/msi*
+%{prog_folder}/bin/[a-z]*/acctst*
 %{prog_folder}/bin/[a-z]*/*.dll
 
 # vxWorks and RTEMS
@@ -337,29 +369,95 @@ fi
 
 %files host-devel
 %defattr(-,root,root,-)
-%{prog_folder}/configure
-%{prog_folder}/cfg
-%{prog_folder}/include
+%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
-%if %{defined rhel}
-%{prog_folder}/bin/RHEL%{rhel}*/[^Scips]*[^.]??
-%{prog_folder}/bin/RHEL%{rhel}*/*.??
-%endif
-%{prog_folder}/lib/pkgconfig
-%{prog_folder}/lib/perl
-%{prog_folder}/lib/win*
-%{prog_folder}/lib/RTEMS*
+%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/EPICS
+%{prog_folder}/lib/perl/DBD*
 %{prog_folder}/dbd
 
 ###########################################
 
 %files devel
 %defattr(-,root,root,-)
-
-%{prog_folder}/bin/[a-z]*/[^Scips]*[^.]??
+%{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*
+%{prog_folder}/lib/win*
 
 ###########################################
 
@@ -367,7 +465,9 @@ fi
 %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
 
 ###########################################

modules/Makefile

@@ -34,12 +34,6 @@ pvDatabase_DEPEND_DIRS = pvAccess
 SUBMODULES += pva2pva
 pva2pva_DEPEND_DIRS = pvAccess
 
-SUBMODULES += example
-example_DEPEND_DIRS = pva2pva pvaClient
-
-SUBMODULES += pcas
-pcas_DEPEND_DIRS = ca
-
 # Allow sites to add extra submodules
 -include Makefile.local
 

modules/Makefile.local

@@ -0,0 +1,2 @@
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca

modules/ca/src/client/acctst.c

@@ -2575,7 +2575,8 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     SEVCHK ( ca_get ( DBR_FLOAT, chan, &temp ), NULL );
     SEVCHK ( ca_pend_io ( timeoutToPendIO ), NULL );
 
-    /* printf ( "flow control bypassed %u events\n", flowCtrlCount ); */
+    if (0)
+        printf ( "flow control bypassed %u events\n", flowCtrlCount );
 
     showProgressEnd ( interestLevel );
 }

modules/ca/src/client/cac.cpp

@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <string> // vxWorks 6.0 requires this include
 
+#include "epicsStdio.h"
 #include "dbDefs.h"
 #include "epicsGuard.h"
 #include "epicsVersion.h"
@@ -1008,7 +1009,7 @@ bool cac::defaultExcep (
     char buf[512];
     char hostName[64];
     iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
-    sprintf ( buf, "host=%s ctx=%.400s", hostName, pCtx );
+    epicsSnprintf( buf, sizeof(buf), "host=%s ctx=%.400s", hostName, pCtx );
     this->notify.exception ( guard, status, buf, 0, 0u );
     return true;
 }
@@ -1312,7 +1313,7 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
     const char * pChannelName, const char * pAcc, const char * pRej )
 {
     char buf[256];
-    sprintf ( buf, "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
+    epicsSnprintf( buf, sizeof(buf), "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
             pChannelName, pAcc, pRej );
     {
         callbackManager mgr ( this->notify, this->cbMutex );

modules/ca/src/client/iocinf.cpp

@@ -21,6 +21,9 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include <vector>
+#include <exception>
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,6 +31,7 @@
 
 #include "envDefs.h"
 #include "epicsAssert.h"
+#include "epicsString.h"
 #include "epicsStdioRedirect.h"
 #include "errlog.h"
 #include "osiWireFormat.h"
@@ -35,39 +39,6 @@
 #include "addrList.h"
 #include "iocinf.h"
 
-/*
- * getToken()
- */
-static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
-{
-    bool tokenFound = false;
-    const char *pToken;
-    unsigned i;
-
-    pToken = *ppString;
-    while ( isspace (*pToken) && *pToken ){
-        pToken++;
-    }
-
-    for ( i=0u; i<bufSIze; i++ ) {
-        if ( isspace (pToken[i]) || pToken[i]=='\0' ) {
-            pBuf[i] = '\0';
-            *ppString = &pToken[i];
-            if ( i != 0 ) {
-                tokenFound = true;
-            }
-            break;
-        }
-        pBuf[i] = pToken[i];
-    }
-
-    if ( tokenFound ) {
-        pBuf[bufSIze-1] = '\0';
-        return pBuf;
-    }
-    return NULL;
-}
-
 /*
  * addAddrToChannelAccessAddressList ()
  */
@@ -77,9 +48,7 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
 {
     osiSockAddrNode *pNewNode;
     const char *pStr;
-    const char *pToken;
     struct sockaddr_in addr;
-    char buf[256u]; /* large enough to hold an IP address or hostname */
     int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
@@ -87,31 +56,45 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
         return ret;
     }
 
-    while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
-        status = aToIPAddr ( pToken, port, &addr );
-        if (status<0) {
-            fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
-            fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
-            continue;
+    try {
+        std::vector<char> scratch(pStr, pStr+strlen(pStr)+1); // copy chars and trailing nil
+
+        char *save = NULL;
+        for(const char *pToken = epicsStrtok_r(&scratch[0], " \t\n\r", &save);
+            pToken;
+            pToken = epicsStrtok_r(NULL, " \t\n\r", &save))
+        {
+            if(!pToken[0]) {
+                continue;
+            }
+
+            status = aToIPAddr ( pToken, port, &addr );
+            if (status<0) {
+                fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
+                fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
+                continue;
+            }
+
+            if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
+                continue;
+            }
+
+            pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
+            if (pNewNode==NULL) {
+                fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
+                break;
+            }
+
+            pNewNode->addr.ia = addr;
+
+            /*
+             * LOCK applied externally
+             */
+            ellAdd (pList, &pNewNode->node);
+            ret = 0; /* success if anything is added to the list */
         }
-
-        if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
-            continue;
-        }
-
-        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
-        if (pNewNode==NULL) {
-            fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            break;
-        }
-
-        pNewNode->addr.ia = addr;
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd (pList, &pNewNode->node);
-        ret = 0; /* success if anything is added to the list */
+    } catch(std::exception&) { // only bad_alloc currently possible
+        ret = -1;
     }
 
     return ret;

modules/database/src/ioc/as/asIocRegister.c

@@ -90,7 +90,7 @@ static const iocshFuncDef asprulesFuncDef = {
     "asprules",1,asprulesArgs,
     "List rules of an Access Security Group.\n"
     "If no Group is specified then list the rules for all groups\n"
-    "Example: asprules mygroup"
+    "Example: asprules mygroup\n"
 };
 static void asprulesCallFunc(const iocshArgBuf *args)
 {

modules/database/src/ioc/db/dbUnitTest.c

@@ -50,6 +50,7 @@ void testdbPrepare(void)
 {
     if(!testEvtLock)
         testEvtLock = epicsMutexMustCreate();
+    initHookAnnounce(initHookAfterPrepareDatabase);
 }
 
 void testdbReadDatabase(const char* file,
@@ -94,6 +95,7 @@ void testIocShutdownOk(void)
 
 void testdbCleanup(void)
 {
+    initHookAnnounce(initHookBeforeCleanupDatabase);
     dbFreeBase(pdbbase);
     db_cleanup_events();
     initHookFree();

modules/database/src/ioc/dbStatic/dbBase.h

@@ -118,6 +118,10 @@ typedef struct dbRecordNode {
     char            *recordname;
     ELLLIST         infoList;       /*LIST head of info nodes*/
     int             flags;
+    /** Parse order of this record()
+     *  @since UNRELEASED
+     */
+    unsigned        order;
     struct dbRecordNode *aliasedRecnode; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
 }dbRecordNode;
 
@@ -184,5 +188,9 @@ typedef struct dbBase {
     struct gphPvt   *pgpHash;
     short           ignoreMissingMenus;
     short           loadCdefs;
+    /** Total number of records.
+     *  @since UNRELEASED
+     */
+    unsigned        no_records;
 }dbBase;
 #endif

modules/database/src/ioc/dbStatic/dbLexRoutines.c

@@ -247,23 +247,23 @@ static long dbReadCOM(DBBASE **ppdbbase,const char *filename, FILE *fp,
     }
     my_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
     freeListInitPvt(&freeListPvt,sizeof(tempListNode),100);
-    if(substitutions) {
-        if(macCreateHandle(&macHandle,NULL)) {
-            epicsPrintf("macCreateHandle error\n");
-            status = -1;
-            goto cleanup;
-        }
-        macParseDefns(macHandle,(char *)substitutions,&macPairs);
-        if(macPairs ==NULL) {
-            macDeleteHandle(macHandle);
-            macHandle = NULL;
-        } else {
-            macInstallMacros(macHandle,macPairs);
-            free((void *)macPairs);
-            mac_input_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
-        }
-        macSuppressWarning(macHandle,dbQuietMacroWarnings);
+    if (substitutions == NULL)
+        substitutions = "";
+    if(macCreateHandle(&macHandle,NULL)) {
+        epicsPrintf("macCreateHandle error\n");
+        status = -1;
+        goto cleanup;
     }
+    macParseDefns(macHandle,substitutions,&macPairs);
+    if(macPairs == NULL) {
+        macDeleteHandle(macHandle);
+        macHandle = NULL;
+    } else {
+        macInstallMacros(macHandle,macPairs);
+        free(macPairs);
+        mac_input_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
+    }
+    macSuppressWarning(macHandle,dbQuietMacroWarnings);
     pinputFile = dbCalloc(1,sizeof(inputFile));
     if (filename) {
         pinputFile->filename = macEnvExpand(filename);

modules/database/src/ioc/dbStatic/link.h

@@ -193,7 +193,7 @@ struct lset;
 struct link {
     struct dbCommon *precord;   /* Pointer to record owning link */
     short type;
-    short flags;
+    unsigned short flags;
     struct lset *lset;
     char *text;             /* Raw link text */
     union value value;

modules/database/src/std/rec/biRecord.dbd.pod

@@ -61,8 +61,8 @@ this chapter for information on soft device support.
 If the record gets its values from hardware or uses the C<Raw Soft Channel>
 device support, the device support routines place the value in the RVAL
 field.
-(Since UNRELEASED) If the MASK field is non-zero, then this MASK is applied to RVAL.
-The value of RVAL is then converted using the process described in the
+(Since 7.0.8) If the MASK field is non-zero, then this MASK is applied to RVAL.
+The value from RVAL is then converted using the process described in the
 next section.
 
 =fields INP, DTYP, ZNAM, ONAM, RVAL, VAL

modules/database/src/std/rec/calcRecord.dbd.pod

@@ -158,7 +158,7 @@ CEIL: Ceiling (unary)
 FLOOR: Floor (unary)
 
 =item *
-FMOD: Floating point modulo (binary)  Added in UNRELEASED
+FMOD: Floating point modulo (binary)  Added in 7.0.8
 
 =item *
 LOG: Log base 10 (unary)

modules/database/src/std/rec/calcoutRecord.dbd.pod

@@ -184,7 +184,7 @@ CEIL: Ceiling (unary)
 FLOOR: Floor (unary)
 
 =item *
-FMOD: Floating point modulo (binary)  Added in UNRELEASED
+FMOD: Floating point modulo (binary)  Added in 7.0.8
 
 =item *
 LOG: Log base 10 (unary)

modules/database/src/std/rec/longoutRecord.dbd.pod

@@ -85,7 +85,7 @@ for information on the format of hardware addresses and database links.
 
 =head4 Menu longoutOOPT
 
-The OOPT field was added in EPICS UNRELEASED.
+The OOPT field was added in EPICS 7.0.8.
 
 It determines the condition that causes the output link to be
 written to. It's a menu field that has six choices:
@@ -119,7 +119,7 @@ VAL is non-zero and last value was zero.
 
 =head4 Changes in OUT field when OOPT = On Change
 
-The OOCH field was added in EPICS UNRELEASED.
+The OOCH field was added in EPICS 7.0.8.
 
 If OOCH is C<YES> (its default value) and the OOPT field is C<On Change>,
 the record will write to the device support the first time the record gets

modules/database/src/tools/dbdExpand.pl

@@ -20,10 +20,14 @@ use EPICS::Getopts;
 use EPICS::Readfile;
 use EPICS::macLib;
 
-our ($opt_D, @opt_I, @opt_S, $opt_o);
+our ($opt_D, $opt_A, @opt_I, @opt_S, $opt_o);
 
-getopts('DI@S@o:') or
-    die "Usage: dbdExpand [-D] [-I dir] [-S macro=val] [-o out.dbd] in.dbd ...";
+getopts('DAI@S@o:') or
+    die "Usage: dbdExpand [-D] [-A] [-I dir] [-S macro=val] [-o out.dbd] in.dbd ...";
+
+if ($opt_A) {
+    $DBD::Parser::allowAutoDeclarations = 1;
+}
 
 my @path = map { split /[:;]/ } @opt_I; # FIXME: Broken on Win32?
 my $macros = EPICS::macLib->new(@opt_S);

modules/libcom/src/as/asLibRoutines.c

@@ -366,7 +366,7 @@ long epicsStdCall asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,
 {
     ASGMEMBER   *pasgmember = asMemberPvt;
     ASGCLIENT   *pasgclient;
-    int         len, i;
+    size_t      len, i;
 
     long        status;
     if(!asActive) return(S_asLib_asNotActive);
@@ -394,7 +394,7 @@ long epicsStdCall asChangeClient(
 {
     ASGCLIENT   *pasgclient = asClientPvt;
     long        status;
-    int         len, i;
+    size_t      len, i;
 
     if(!asActive) return(S_asLib_asNotActive);
     if(!pasgclient) return(S_asLib_badClient);

modules/libcom/src/calc/postfix.h

@@ -222,7 +222,7 @@ extern "C" {
  *    - n parameter minimum value: min(a, b, ...)
  *    - Square root: sqr(a) or sqrt(a)
  *    - Floating point modulo: fmod(num, den)
- *  \since The fmod() function was added in UNRELEASED
+ *  \since The fmod() function was added in 7.0.8
  *
  * -# ***Trigonometric Functions***
  *  Standard circular trigonometric functions, with angles expressed in radians:

modules/libcom/src/error/errlog.h

@@ -180,8 +180,8 @@ LIBCOM_API void errlogAddListener(errlogListener listener, void *pPrivate);
  * \param listener Function pointer of type ::errlogListener
  * \param pPrivate This will be passed as the first argument of listener()
  *
- * \since UNRELEASED Safe to call from a listener callback.
- * \until UNRELEASED Self-removal from a listener callback caused corruption.
+ * \since 7.0.8 Safe to call from a listener callback.
+ * \until 7.0.8 Self-removal from a listener callback caused corruption.
  */
 LIBCOM_API int errlogRemoveListeners(errlogListener listener,
     void *pPrivate);

modules/libcom/src/flex/Makefile

@@ -19,7 +19,7 @@ parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
 
 INC += flex.skel.static
 
-# flex.c is included in parse.c
+# flex.c, scan.c and yylex.c are #included by parse.c
 e_flex_SRCS += ccl.c
 e_flex_SRCS += dfa.c
 e_flex_SRCS += ecs.c

modules/libcom/src/flex/ccl.c

@@ -132,7 +132,6 @@ void cclnegate(int cclp)
 void list_character_set(FILE *file, int cset[])
 {
     int i;
-    char *readable_form();
 
     putc( '[', file );
 

modules/libcom/src/flex/flex.c

@@ -188,7 +188,6 @@ int main(int argc, char *argv[])
 void flexend(int status)
 {
     int tblsiz;
-    char *flex_gettime();
 
     if ( skelfile != NULL )
         {
@@ -382,7 +381,7 @@ void flexend(int status)
 void flexinit(int argc, char **argv)
 {
     int i, sawcmpflag;
-    char *arg, *flex_gettime(), *mktemp();
+    char *arg;
 
     printstats = syntaxerror = trace = spprdflt = interactive = caseins = false;
     backtrack_report = performance_report = ddebug = fulltbl = fullspd = false;

modules/libcom/src/flex/flexdef.h

@@ -567,8 +567,8 @@ extern int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs;
 extern int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave;
 extern int num_backtracking, bol_needed;
 
-void *allocate_array(int size, int element_size);
-void *reallocate_array(void *array, int size, int element_size);
+extern void *allocate_array(int size, int element_size);
+extern void *reallocate_array(void *array, int size, int element_size);
 
 #define allocate_integer_array(size) \
     (int *) allocate_array( size, sizeof( int ) )
@@ -677,10 +677,20 @@ extern int all_upper (Char *);
 /* bubble sort an integer array */
 extern void bubble (int [], int);
 
+/* replace upper-case letter to lower-case */
+extern Char clower(int c);
+
+/* returns copy of a string */
+extern char *copy_string(char *str);
+
+/* returns copy of a (potentially) unsigned string */
+extern Char *copy_unsigned_string(Char *str);
+
 /* shell sort a character array */
 extern void cshell (Char [], int, int);
 
-extern void dataend (void);     /* finish up a block of data declarations */
+/* finish up a block of data declarations */
+extern void dataend (void);
 
 /* report an error message and terminate */
 extern void flexerror (char[]) NORETURN;
@@ -688,6 +698,9 @@ extern void flexerror (char[]) NORETURN;
 /* report a fatal error message and terminate */
 extern void flexfatal (char[]);
 
+/* return current time */
+extern char *flex_gettime();
+
 /* report an error message formatted with one integer argument */
 extern void lerrif (char[], int);
 
@@ -700,11 +713,18 @@ extern void line_directive_out (FILE*);
 /* generate a data statment for a two-dimensional array */
 extern void mk2data (int);
 
-extern void mkdata (int);       /* generate a data statement */
+/* generate a data statement */
+extern void mkdata (int);
 
 /* return the integer represented by a string of digits */
 extern int myctoi (Char []);
 
+/* return character corresponding to escape sequence */
+extern Char myesc(Char *array);
+
+/* return the the human-readable form of a character */
+extern char *readable_form(int c);
+
 /* write out one section of the skeleton file */
 extern void skelout (void);
 
@@ -784,8 +804,14 @@ extern void cclinstal (Char [], int);
 /* lookup the number associated with character class */
 extern int ccllookup (Char []);
 
-extern void ndinstal (char[], Char[]);  /* install a name definition */
-extern void scinstal (char[], int);     /* make a start condition */
+/* install a name definition */
+extern void ndinstal (char[], Char[]);
+
+/* lookup a name definition */
+extern Char *ndlookup(char *nd);
+
+/* make a start condition */
+extern void scinstal (char[], int);
 
 /* lookup the number associated with a start condition */
 extern int sclookup (char[]);

modules/libcom/src/flex/gen.c

@@ -217,7 +217,6 @@ void genecs(void)
     int i, j;
     static char C_char_decl[] = "static const %s %s[%d] =\n    {   0,\n";
     int numrows;
-    Char clower();
 
     if ( numecs < csize )
         printf( C_char_decl, "YY_CHAR", "yy_ec", csize );
@@ -237,8 +236,6 @@ void genecs(void)
 
     if ( trace )
         {
-        char *readable_form();
-
         fputs( "\n\nEquivalence Classes:\n\n", stderr );
 
         numrows = csize / 8;

modules/libcom/src/flex/parse.y

@@ -34,11 +34,18 @@
 
 int pat, scnum, eps, headcnt, trailcnt, anyccl, lastchar, i, actvp, rulelen;
 int trlcontxt, xcluflg, cclsorted, varlength, variable_trail_rule;
-Char clower();
 
 static int madeany = false;  /* whether we've made the '.' character class */
 int previous_continued_action;  /* whether the previous rule's action was '|' */
 
+/* forward declarations */
+
+void build_eof_action( void );
+void synerr( char str[] );
+void format_pinpoint_message( char msg[], char arg[] );
+void pinpoint_message( char str[] );
+void yyerror( char msg[] );
+
 %}
 
 %%
@@ -626,7 +633,7 @@ string          :  string CHAR
  *                    conditions
  */
 
-void build_eof_action()
+void build_eof_action( void )
 
     {
     int i;
@@ -652,8 +659,7 @@ void build_eof_action()
 
 /* synerr - report a syntax error */
 
-void synerr( str )
-char str[];
+void synerr( char str[] )
 
     {
     syntaxerror = true;
@@ -665,8 +671,7 @@ char str[];
  *                           pinpointing its location
  */
 
-void format_pinpoint_message( msg, arg )
-char msg[], arg[];
+void format_pinpoint_message( char msg[], char arg[] )
 
     {
     char errmsg[MAXLINE];
@@ -678,8 +683,7 @@ char msg[], arg[];
 
 /* pinpoint_message - write out a message, pinpointing its location */
 
-void pinpoint_message( str )
-char str[];
+void pinpoint_message( char str[] )
 
     {
     fprintf( stderr, "\"%s\", line %d: %s\n", infilename, linenum, str );
@@ -690,8 +694,7 @@ char str[];
  *           currently, messages are ignore
  */
 
-void yyerror( msg )
-char msg[];
+void yyerror( char msg[] )
 
     {
     }

modules/libcom/src/flex/scan.c

@@ -953,6 +953,7 @@ void yy_load_buffer_state ( void );
 YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
 void yy_delete_buffer ( YY_BUFFER_STATE b );
 void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
+void set_input_file( char *file );
 
 #define yy_new_buffer yy_create_buffer
 
@@ -966,7 +967,7 @@ YY_DECL
     static int bracelevel, didadef;
     int i, indented_code = false, checking_used = false, new_xlation = false;
     int doing_codeblock = false;
-    Char nmdef[MAXLINE], myesc();
+    Char nmdef[MAXLINE];
 
 
     if ( yy_init )
@@ -1488,7 +1489,6 @@ case 65:
 # line 333 "scan.l"
 {
                         Char *nmdefptr;
-                        Char *ndlookup();
 
                         (void) strcpy( nmstr, (char *) yytext );
                         nmstr[yyleng - 1] = '\0';  /* chop trailing brace */
@@ -2230,8 +2230,7 @@ int yywrap()
 
 /* set_input_file - open the given file (if NULL, stdin) for scanning */
 
-void set_input_file( file )
-char *file;
+void set_input_file( char *file )
 
     {
     if ( file )

modules/libcom/src/flex/sym.c

@@ -108,8 +108,6 @@ void cclinstal(Char *ccltxt, int cclnum)
     /* we don't bother checking the return status because we are not called
      * unless the symbol is new
      */
-    Char *copy_unsigned_string();
-
     (void) addsym( (char *) copy_unsigned_string( ccltxt ), (char *) 0, cclnum,
                    ccltab, CCL_HASH_SIZE );
     }
@@ -191,9 +189,6 @@ int hashfunct(char *str, int hash_size)
 
 void ndinstal(char *nd, Char *def)
 {
-    char *copy_string();
-    Char *copy_unsigned_string();
-
     if ( addsym( copy_string( nd ), (char *) copy_unsigned_string( def ), 0,
                  ndtbl, NAME_TABLE_HASH_SIZE ) )
         synerr( "name defined twice" );
@@ -227,8 +222,6 @@ Char *ndlookup(char *nd)
 
 void scinstal(char *str, int xcluflg)
 {
-    char *copy_string();
-
     /* bit of a hack.  We know how the default start-condition is
      * declared, and don't put out a define for it, because it
      * would come out as "#define 0 1"

modules/libcom/src/gpHash/gpHashLib.c

@@ -63,7 +63,7 @@ GPHENTRY * epicsStdCall gphFindParse(gphPvt *pgphPvt, const char *name, size_t l
     ELLLIST **paplist;
     ELLLIST *gphlist;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return NULL;
     paplist = pgphPvt->paplist;
@@ -99,7 +99,7 @@ GPHENTRY * epicsStdCall gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
     ELLLIST **paplist;
     ELLLIST *plist;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return NULL;
     paplist = pgphPvt->paplist;
@@ -144,7 +144,7 @@ void epicsStdCall gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
     ELLLIST **paplist;
     ELLLIST *plist = NULL;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return;
     paplist = pgphPvt->paplist;

modules/libcom/src/iocsh/initHooks.c

@@ -139,6 +139,9 @@ const char *initHookName(int state)
         "initHookBeforeFree",
         "initHookAfterShutdown",
 
+        "initHookAfterPrepareDatabase",
+        "initHookBeforeCleanupDatabase",
+
         "initHookAfterInterruptAccept",
         "initHookAtEnd"
     };

modules/libcom/src/iocsh/initHooks.h

@@ -71,6 +71,7 @@ extern "C" {
  * if the IOC is later paused and restarted.
  */
 typedef enum {
+
     // iocInit() begins
     initHookAtIocBuild = 0,         /**< Start of iocBuild() / iocInit() */
     initHookAtBeginning,            /**< Database sanity checks passed */
@@ -110,7 +111,7 @@ typedef enum {
      */
     initHookAfterCloseLinks,
     /** \brief Scan tasks stopped.
-     *  \since UNRELEASED Triggered during normal IOC shutdown
+     *  \since 7.0.8 Triggered during normal IOC shutdown
      *  \since 7.0.3.1 Added, triggered only by unittest code.
      */
     initHookAfterStopScan,
@@ -119,7 +120,7 @@ typedef enum {
      */
     initHookAfterStopCallback,
     /** \brief CA links stopped.
-     *  \since UNRELEASED Triggered during normal IOC shutdown
+     *  \since 7.0.8 Triggered during normal IOC shutdown
      *  \since 7.0.3.1 Added, triggered only by unittest code.
      */
     initHookAfterStopLinks,
@@ -133,6 +134,17 @@ typedef enum {
     initHookAfterShutdown,
     // iocShutdown() ends
 
+    /** \brief Called during testdbPrepare()
+     * Use this hook to repeat actions each time an empty test database is initialized.
+     * \since 7.0.8 Added, triggered only by unittest code.
+     */
+    initHookAfterPrepareDatabase,
+    /** \brief Called during testdbCleanup()
+     * Use this hook to perform cleanup each time before a test database is free()'d.
+     * \since 7.0.8 Added, triggered only by unittest code.
+     */
+    initHookBeforeCleanupDatabase,
+
     /* Deprecated states: */
     /** Only announced once.  Deprecated in favor of initHookAfterDatabaseRunning */
     initHookAfterInterruptAccept,

modules/libcom/src/iocsh/iocsh.h

@@ -66,12 +66,16 @@ typedef enum {
     iocshArgPdbbase,
     iocshArgArgv,
     iocshArgPersistentString,
-    /** Equivalent to iocshArgString with a hint for tab completion as a record name.
-     *  @since UNRELEASED
+    /**
+     * Equivalent to iocshArgString with a hint for tab completion that the
+     * argument is a record name.
+     * @since 7.0.8
      */
     iocshArgStringRecord,
-    /** Equivalent to iocshArgString with a hint for tab completion as a file system path.
-     *  @since UNRELEASED
+    /**
+     * Equivalent to iocshArgString with a hint for tab completion that the
+     * argument is a file system path.
+     * @since 7.0.8
      */
     iocshArgStringPath,
 }iocshArgType;

modules/libcom/src/iocsh/libComRegister.c

@@ -193,7 +193,7 @@ static const iocshFuncDef epicsEnvShowFuncDef = {"epicsEnvShow",1,epicsEnvShowAr
                                                  "  (default) - show all environment variables\n"
                                                  "   name     - show value of specific environment variable\n"
                                                  "Example: epicsEnvShow\n"
-                                                 "Example: epicsEnvShow PATH"};
+                                                 "Example: epicsEnvShow PATH\n"};
 static void epicsEnvShowCallFunc(const iocshArgBuf *args)
 {
     epicsEnvShow (args[0].sval);

modules/libcom/src/log/iocLogServer.c

@@ -43,7 +43,7 @@ static char ioc_log_file_command[256];
 
 
 struct iocLogClient {
-    int insock;
+    SOCKET insock;
     struct ioc_log_server *pserver;
     size_t nChar;
     char recvbuf[1024];

modules/libcom/src/misc/adjustment.c

@@ -15,40 +15,25 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-/* Up to now epicsShareThings have been declared as imports
- *   (Appropriate for other stuff)
- * After setting the following they will be declared as exports
- *   (Appropriate for what we implement)
- */
+#include <epicsAssert.h>
 #include "adjustment.h"
 
-LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size)
+size_t adjustToWorstCaseAlignment(size_t size)
 {
-    int align_size, adjust;
-    struct test_long_word { char c; long lw; };
-    struct test_double { char c; double d; };
-    struct test_ptr { char c; void *p; };
-    int test_long_size = sizeof(struct test_long_word) - sizeof(long);
-    int test_double_size = sizeof(struct test_double) - sizeof(double);
-    int test_ptr_size = sizeof(struct test_ptr) - sizeof(void *);
-    size_t adjusted_size = size;
+    union aline {
+        /* largest primative types (so far...) */
+        double dval;
+        size_t uval;
+        char *ptr;
+    };
 
-    /*
-     * Use Jeff's alignment tests to determine worst case of long,
-     * double or pointer alignment requirements.
-    */
-    align_size = test_long_size > test_ptr_size ?
-                  test_long_size : test_ptr_size;
+    /* assert that alignment size is a power of 2 */
+    STATIC_ASSERT((sizeof(union aline) & (sizeof(union aline)-1))==0);
 
-    align_size = align_size > test_double_size ?
-                  align_size : test_double_size;
+    /* round up to aligment size */
+    size--;
+    size |= sizeof(union aline)-1;
+    size++;
 
-    /*
-     * Increase the size to fit worst case alignment if not already
-     * properly aligned.
-     */
-    adjust = align_size - size%align_size;
-    if (adjust != align_size) adjusted_size += adjust;
-
-    return (adjusted_size);
+    return size;
 }

modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp

@@ -17,6 +17,7 @@
 #include <climits>
 #include <stdexcept>
 #include <cstdio>
+#include <vector>
 
 //#define EPICS_FREELIST_DEBUG
 #define EPICS_PRIVATE_API
@@ -82,7 +83,6 @@ struct ipAddrToAsciiGlobal : public epicsThreadRunable {
 
     virtual void run ();
 
-    char nameTmp [1024];
     tsFreeList
         < ipAddrToAsciiTransactionPrivate, 0x80 >
             transactionFreeList;
@@ -297,6 +297,8 @@ ipAddrToAsciiTransaction & ipAddrToAsciiEnginePrivate::createTransaction ()
 
 void ipAddrToAsciiGlobal::run ()
 {
+    std::vector<char> nameTmp(1024);
+
     epicsGuard < epicsMutex > guard ( this->mutex );
     while ( ! this->exitFlag ) {
         {
@@ -313,14 +315,13 @@ void ipAddrToAsciiGlobal::run ()
 
             if ( this->exitFlag )
             {
-                sockAddrToDottedIP ( & addr.sa, this->nameTmp,
-                    sizeof ( this->nameTmp ) );
+                sockAddrToDottedIP ( & addr.sa, &nameTmp[0], nameTmp.size() );
             }
             else {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 // depending on DNS configuration, this could take a very long time
                 // so we release the lock
-                sockAddrToA ( &addr.sa, this->nameTmp, sizeof ( this->nameTmp ) );
+                sockAddrToA ( &addr.sa, &nameTmp[0], nameTmp.size() );
             }
 
             // the ipAddrToAsciiTransactionPrivate destructor is allowed to
@@ -339,7 +340,7 @@ void ipAddrToAsciiGlobal::run ()
             {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 // don't call callback with lock applied
-                pCur->pCB->transactionComplete ( this->nameTmp );
+                pCur->pCB->transactionComplete ( &nameTmp[0] );
             }
 
             this->callbackInProgress = false;

modules/libcom/src/osi/epicsTime.cpp

@@ -238,7 +238,7 @@ size_t epicsStdCall epicsTimeToStrftime (char *pBuff, size_t bufLength, const ch
                     // convert nanosecs to integer of correct range
                     frac /= div[fracWid];
                     char fracFormat[32];
-                    sprintf ( fracFormat, "%%0%lulu", fracWid );
+                    epicsSnprintf ( fracFormat, sizeof ( fracFormat ), "%%0%lulu", fracWid );
                     int status = epicsSnprintf ( pBufCur, bufLenLeft, fracFormat, frac );
                     if ( status > 0 ) {
                         unsigned long nChar = static_cast < unsigned long > ( status );

modules/libcom/src/osi/os/WIN32/osdSock.c

@@ -119,8 +119,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
     return socket ( domain, type, protocol );
 }
 
-LIBCOM_API int epicsStdCall epicsSocketAccept ( 
-    int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
+LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
+    SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
 {
     return accept ( sock, pAddr, addrlen );
 }

modules/libcom/src/osi/os/WIN32/osdThread.c

@@ -500,8 +500,6 @@ static unsigned WINAPI epicsWin32ThreadEntry ( LPVOID lpParameter )
     BOOL success;
 
     if ( pGbl )  {
-        setThreadName ( pParm->id, pParm->pName );
-
         success = FlsSetValue ( pGbl->flsIndexThreadLibraryEPICS, pParm );
         if ( success ) {
             osdThreadHooksRun ( ( epicsThreadId ) pParm );
@@ -659,6 +657,7 @@ epicsThreadId epicsThreadCreateOpt (
         pParmWIN32->id = ( DWORD ) threadId ;
     }
 
+    setThreadName ( pParmWIN32->id, pParmWIN32->pName );
     osdPriority = epicsThreadGetOsdPriorityValue (opts->priority);
     bstat = SetThreadPriority ( pParmWIN32->handle, osdPriority );
     if (!bstat) {

modules/libcom/src/osi/os/WIN32/osdTime.cpp

@@ -215,6 +215,7 @@ void currentTime :: startPLL ()
                 CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION,
                 & this->threadId );
         assert ( this->threadHandle );
+        setThreadName ( this->threadId, "EPICS Time PLL" );
         BOOL bstat = SetThreadPriority (
             this->threadHandle, THREAD_PRIORITY_HIGHEST );
         assert ( bstat );
@@ -496,7 +497,6 @@ static unsigned __stdcall _pllThreadEntry ( void * pCurrentTimeIn )
 {
     currentTime * pCT =
         reinterpret_cast < currentTime * > ( pCurrentTimeIn );
-    setThreadName ( pCT->threadId, "EPICS Time PLL" );
     while ( ! pCT->threadShutdownCmd ) {
         Sleep ( currentTime :: pllDelay * 1000 /* mS */ );
         pCT->updatePLL ();

modules/libcom/src/osi/os/default/osdMessageQueue.cpp

@@ -40,7 +40,16 @@ struct threadNode {
     struct eventNode   *evp;
     void               *buf;
     unsigned int        size;
-    volatile bool       eventSent;
+    bool                eventSent;
+    inline
+    threadNode()
+        :evp(NULL)
+        ,buf(NULL)
+        ,size(0u)
+        ,eventSent(false)
+    {
+        memset(&link, 0, sizeof(link));
+    }
 };
 
 /*
@@ -366,9 +375,10 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size,
 
     freeEventNode(pmsg, threadNode.evp, status);
 
+    bool wasSent = threadNode.eventSent;
     epicsMutexUnlock(pmsg->mutex);
 
-    if (threadNode.eventSent && (threadNode.size <= size))
+    if (wasSent && (threadNode.size <= size))
         return threadNode.size;
     return -1;
 }

modules/libcom/src/osi/os/posix/osdSock.c

@@ -27,6 +27,7 @@
 #include "osiSock.h"
 #include "epicsAssert.h"
 #include "errlog.h"
+#include "epicsAtomic.h"
 
 /* Linux and *BSD (at least) specific way to atomically set O_CLOEXEC.
  * RTEMS 5.1 provides SOCK_CLOEXEC, but doesn't implement accept4()
@@ -60,19 +61,18 @@ static void unlockInfo (void)
     epicsMutexUnlock (infoMutex);
 }
 
-/*
- * NOOP
- */
+
+static size_t nAttached;
+
 int osiSockAttach()
 {
+    epicsAtomicIncrSizeT(&nAttached);
     return 1;
 }
 
-/*
- * NOOP
- */
 void osiSockRelease()
 {
+    epicsAtomicDecrSizeT(&nAttached);
 }
 
 /*
@@ -83,6 +83,11 @@ void osiSockRelease()
 LIBCOM_API SOCKET epicsStdCall epicsSocketCreate ( 
     int domain, int type, int protocol )
 {
+    static unsigned char warnAttached;
+    if(!epicsAtomicGetSizeT(&nAttached) && !warnAttached) {
+        warnAttached = 1;
+        errlogPrintf(ERL_WARNING ": epicsSocketCreate() without osiSockAttach() is not portable\n");
+    }
     SOCKET sock = socket ( domain, type | SOCK_CLOEXEC, protocol );
     if ( sock < 0 ) {
         sock = INVALID_SOCKET;
@@ -119,8 +124,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
     return sock;
 }
 
-LIBCOM_API int epicsStdCall epicsSocketAccept ( 
-    int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
+LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
+    SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
 {
 #ifndef HAVE_SOCK_CLOEXEC
     int newSock = accept ( sock, pAddr, addrlen );

modules/libcom/src/osi/os/vxWorks/osdSock.c

@@ -44,8 +44,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
     return sock;
 }
 
-LIBCOM_API int epicsStdCall epicsSocketAccept ( 
-    int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
+LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
+    SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
 {
     int newSock = accept ( sock, pAddr, addrlen );
     if ( newSock < 0 ) {

modules/libcom/src/osi/osiSock.h

@@ -63,8 +63,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
  * peer address.
  * \return A new socket used for communicating with the peer just accepted, or -1 on error.
  */
-LIBCOM_API int epicsStdCall epicsSocketAccept ( 
-    int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen );
+LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
+    SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen );
 /*!
  * \brief Close and free resources held by a SOCKET object.
  *

modules/libcom/test/epicsEventTest.cpp

@@ -16,12 +16,12 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #include <math.h>
 #include <float.h>
 
+#include "epicsStdio.h"
 #include "epicsThread.h"
 #include "epicsEvent.h"
 #include "epicsMutex.h"
@@ -244,7 +244,7 @@ MAIN(epicsEventTest)
     name = (char **)calloc(nthreads, sizeof(char *));
     for(int i = 0; i < nthreads; i++) {
         name[i] = (char *)calloc(16, sizeof(char));
-        sprintf(name[i],"producer %d",i);
+        epicsSnprintf(name[i], 16, "producer %d",i);
         id[i] = epicsThreadCreate(name[i], 40, stackSize, producer, pinfo);
         epicsThreadSleep(0.1);
     }

modules/libcom/test/epicsMessageQueueTest.cpp

@@ -10,11 +10,11 @@
 /*
  *      Author  W. Eric Norum
  */
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
+#include "epicsStdio.h"
 #include "epicsMessageQueue.h"
 #include "epicsThread.h"
 #include "epicsExit.h"
@@ -232,7 +232,7 @@ sender(void *arg)
     int i = 0;
 
     while (!sendExit) {
-        len = sprintf(cbuf, "%s -- %d.", epicsThreadGetNameSelf(), ++i);
+        len = epicsSnprintf(cbuf, sizeof(cbuf), "%s -- %d.", epicsThreadGetNameSelf(), ++i);
         while (q->trySend((void *)cbuf, len) < 0)
             epicsThreadSleep(0.005 * (randBelow(5)));
         epicsThreadSleep(0.005 * (randBelow(20)));
@@ -421,7 +421,7 @@ extern "C" void messageQueueTest(void *parm)
             epicsThreadPriorityHigh,
             epicsThreadPriorityHigh
         };
-        sprintf(name, "Sender %d", i+1);
+        epicsSnprintf(name, sizeof(name), "Sender %d", i+1);
         opts.priority = pri[i];
         senderId[i] = epicsThreadCreateOpt(name, sender, &q1, &opts);
         if (!senderId[i])

modules/libcom/test/epicsMutexTest.cpp

@@ -18,10 +18,10 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <stdio.h>
 #include <errno.h>
 #include <time.h>
 
+#include "epicsStdio.h"
 #include "epicsTime.h"
 #include "epicsThread.h"
 #include "epicsMutex.h"
@@ -266,7 +266,7 @@ MAIN(epicsMutexTest)
     stackSize = epicsThreadGetStackSize(epicsThreadStackSmall);
     for(i=0; i<nthreads; i++) {
         name[i] = (char *)calloc(10,sizeof(char));
-        sprintf(name[i],"task%d",i);
+        epicsSnprintf(name[i], 10, "task%d",i);
         pinfo[i] = (info *)calloc(1,sizeof(info));
         pinfo[i]->threadnum = i;
         pinfo[i]->mutex = mutex;

modules/libcom/test/epicsThreadTest.cpp

@@ -13,11 +13,11 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #include <math.h>
 
+#include "epicsStdio.h"
 #include "epicsThread.h"
 #include "epicsEvent.h"
 #include "epicsTime.h"
@@ -73,7 +73,7 @@ void testMyThread()
     int startPriority = 0;
     for (int i = 0; i < ntasks; i++) {
         char name[10];
-        sprintf(name, "t%d", i);
+        epicsSnprintf(name, sizeof(name), "t%d", i);
         myThreads[i] = new myThread(i, name);
         if (i == 0)
             startPriority = myThreads[i]->thread.getPriority();

modules/libcom/test/epicsTimeZoneTest.c

@@ -60,11 +60,11 @@ void test_gmtime(time_t T, int sec, int min, int hour,
     struct tm B;
     testDiag("test_gmtime(%ld, ...)", (long)T);
     if(epicsTime_gmtime(&T, &B)!=epicsTimeOK) {
-        testFail("epicsTime_localtime() error");
-        testSkip(9, "epicsTime_localtime() failed");
+        testFail("epicsTime_gmtime() error");
+        testSkip(9, "epicsTime_gmtime() failed");
     } else {
         B.tm_year += 1900; /* for readability */
-        testPass("epicsTime_localtime() success");
+        testPass("epicsTime_gmtime() success");
 #define TEST(FLD) testOk(B.tm_##FLD==FLD, "%s %d==%d", #FLD, B.tm_##FLD, FLD)
         TEST(sec);
         TEST(min);

src/tools/installEpics.pl

@@ -57,6 +57,9 @@ foreach my $source (@ARGV) {
     my $temp   = "$install_dir/TEMP.$name.$$";
     my $target = "$install_dir/$name";
 
+    # Don't try to install the file if it already exists
+    next if $source eq $target;
+
     if (-f $target) {
         next if -M $target < -M $source and -C $target < -C $source;
         # Remove old target, making sure it is deletable first