CVS commit: pkgsrc/devel/readline

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Apr 21 22:03:42 UTC 2023

Modified Files:
        pkgsrc/devel/readline: distinfo
        pkgsrc/devel/readline/patches: patch-ae

Log Message:
Fix a rather obvious race condition.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/readline/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/readline/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/readline/distinfo
diff -u pkgsrc/devel/readline/distinfo:1.37 pkgsrc/devel/readline/distinfo:1.38
--- pkgsrc/devel/readline/distinfo:1.37 Tue Dec  6 05:34:06 2022
+++ pkgsrc/devel/readline/distinfo      Fri Apr 21 22:03:42 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2022/12/06 05:34:06 sekiya Exp $
+$NetBSD: distinfo,v 1.38 2023/04/21 22:03:42 joerg Exp $
 
 BLAKE2s (readline-8.2.tar.gz) = 680d2c3d7ce2de64a7e3a72adc5021e564f29af270d48781b0669b3e075f55e8
 SHA512 (readline-8.2.tar.gz) = 0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a
 Size (readline-8.2.tar.gz) = 3043952 bytes
-SHA1 (patch-ae) = ea0d02a1975696ff51c4b1dd34d62a97d990a6b9
+SHA1 (patch-ae) = 15a0252befd0770f5de646ef8b36bf19cc93ec28
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
 SHA1 (patch-ai) = 92600d64a9184e7b3b0ee31c3e7fccb115e3343d

Index: pkgsrc/devel/readline/patches/patch-ae
diff -u pkgsrc/devel/readline/patches/patch-ae:1.22 pkgsrc/devel/readline/patches/patch-ae:1.23
--- pkgsrc/devel/readline/patches/patch-ae:1.22 Mon Aug  1 18:22:12 2022
+++ pkgsrc/devel/readline/patches/patch-ae      Fri Apr 21 22:03:42 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.22 2022/08/01 18:22:12 wiz Exp $
+$NetBSD: patch-ae,v 1.23 2023/04/21 22:03:42 joerg Exp $
 
 Libtoolify.
 Pass -no-undefined to libtool for building shared library.
@@ -54,12 +54,11 @@ Fix race condition so the examples are b
  
  asan:
        ${MAKE} ${MFLAGS} ASAN_CFLAGS='${ASAN_XCFLAGS}' ASAN_LDFLAGS='${ASAN_XLDFLAGS}' everything
-@@ -176,17 +188,33 @@ libreadline.a: $(OBJECTS)
+@@ -176,17 +188,30 @@ libreadline.a: $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $(OBJECTS)
        -test -n "$(RANLIB)" && $(RANLIB) $@
  
 +libreadline.la: $(OBJECTS:.o=.lo)
-+      $(LIBTOOL) --mode=clean $(RM) $@
 +      $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
 +              -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +              $(LDFLAGS)
@@ -70,7 +69,6 @@ Fix race condition so the examples are b
        -test -n "$(RANLIB)" && $(RANLIB) $@
  
 +libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo
-+      $(LIBTOOL) --mode=clean $(RM) $@
 +      $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
 +              -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +              $(LDFLAGS)
@@ -82,7 +80,6 @@ Fix race condition so the examples are b
        $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
  
 +tilde.lo:     tilde.c
-+      $(LIBTOOL) --mode=clean rm -f $@
 +      $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
 +
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a