CVS commit: pkgsrc/net/fehqlibs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/fehqlibs
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 10 Sep 2024 20:08:30 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Sep 10 20:08:29 UTC 2024

Modified Files:
        pkgsrc/net/fehqlibs: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/net/fehqlibs/patches: patch-install patch-src_Makefile
            patch-src_dnsstub_Makefile
Removed Files:
        pkgsrc/net/fehqlibs/patches: patch-Makefile patch-dnsstub_Makefile

Log Message:
fehqlibs: update to 25a. Changes:

- Removed 'register' in functions. Added 'const' for input strings.
- Compatibility with current gcc and clang compilers:
- (Internal) Unrolling for() loops removed. Internal functions are
  static now.
- (Internal) buffer_init uses now 'buffer_unixread' and
  'buffer_unixwrite' with matching signatures.
- (External) Added getopb() as external and thus removing getop()
  compatibility.
- (Installation) Moved C source files to ./src. Added INSTALL.md to
  describe changes.
- (Compilation) Added -fwrapv flag to the compiler (correctly handling
  two's complement).
- (Internal) alloc_re()'s first argument is now a void pointer to a list
  [gcc 14.2].


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/fehqlibs/Makefile \
    pkgsrc/net/fehqlibs/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/fehqlibs/buildlink3.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/net/fehqlibs/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/fehqlibs/patches/patch-dnsstub_Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/net/fehqlibs/patches/patch-install
cvs rdiff -u -r0 -r1.1 pkgsrc/net/fehqlibs/patches/patch-src_Makefile \
    pkgsrc/net/fehqlibs/patches/patch-src_dnsstub_Makefile

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

Modified files:

Index: pkgsrc/net/fehqlibs/Makefile
diff -u pkgsrc/net/fehqlibs/Makefile:1.24 pkgsrc/net/fehqlibs/Makefile:1.25
--- pkgsrc/net/fehqlibs/Makefile:1.24   Mon Apr 15 16:24:52 2024
+++ pkgsrc/net/fehqlibs/Makefile        Tue Sep 10 20:08:29 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2024/04/15 16:24:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2024/09/10 20:08:29 schmonz Exp $
 
-DISTNAME=              fehQlibs-23
+DISTNAME=              fehQlibs-25a
 PKGNAME=               ${DISTNAME:S/Qlibs-/qlibs-/}
-PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/fehQlibs/
 EXTRACT_SUFX=          .tgz
@@ -12,10 +11,14 @@ HOMEPAGE=           https://www.fehcom.de/ipnet/q
 COMMENT=               State-of-the-art C routines for Internet services
 LICENSE=               public-domain
 
+WRKSRC=                        ${WRKDIR}/${DISTNAME:C/a$//}
+
 MAKE_JOBS_SAFE=                no
 USE_LIBTOOL=           yes
+HAS_CONFIGURE=         yes
 
 BUILD_TARGET=          libs shared
+BUILD_DIRS=            src
 
 REPLACE_SH=            configure install
 
@@ -27,25 +30,23 @@ SUBST_NOOP_OK.echo= yes # ECHO_N may be 
 
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       do-configure
-SUBST_FILES.etc=       dnsstub/dns_rcrw.c
+SUBST_FILES.etc=       src/dnsstub/dns_rcrw.c
 SUBST_SED.etc=         -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
 
 SUBST_CLASSES+=                libtool
 SUBST_STAGE.libtool=   pre-configure
-SUBST_FILES.libtool=   Makefile
+SUBST_FILES.libtool=   src/Makefile
 SUBST_SED.libtool=     -e 's|\$$(MAKELIB) \$$(LDFLAGS) |$$(MAKELIB) |g'
 SUBST_SED.libtool+=    -e 's|\.o|\.lo|g'
 
 BUILD_DEFS+=           PKG_SYSCONFBASE
 
-do-configure:
-       cd ${WRKSRC};                                                           \
+pre-configure:
        ${ECHO} "LIBDIR=${DESTDIR}${PREFIX}/lib/qlibs" >> ${WRKSRC}/conf-build; \
-       ${ECHO} "HDRDIR=${DESTDIR}${PREFIX}/include/qlibs" >> ${WRKSRC}/conf-build; \
-       ${MAKE} check
+       ${ECHO} "HDRDIR=${DESTDIR}${PREFIX}/include/qlibs" >> ${WRKSRC}/conf-build
 
 post-install:
-       cd ${WRKSRC} && for lib in *.la; do \
+       cd ${WRKSRC}/src && for lib in *.la; do \
                ${LIBTOOL} --mode=install ${INSTALL_LIB} $${lib} \
                        ${DESTDIR}${PREFIX}/lib/qlibs; \
        done
Index: pkgsrc/net/fehqlibs/distinfo
diff -u pkgsrc/net/fehqlibs/distinfo:1.24 pkgsrc/net/fehqlibs/distinfo:1.25
--- pkgsrc/net/fehqlibs/distinfo:1.24   Mon Apr 15 16:24:52 2024
+++ pkgsrc/net/fehqlibs/distinfo        Tue Sep 10 20:08:29 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.24 2024/04/15 16:24:52 schmonz Exp $
+$NetBSD: distinfo,v 1.25 2024/09/10 20:08:29 schmonz Exp $
 
-BLAKE2s (fehQlibs-23.tgz) = de9ac2a4af2e76cb321b3569ddc95e311929706a9e6aab1d2efd497514d9b277
-SHA512 (fehQlibs-23.tgz) = 676b8e57cac2f6700cdf4643d72c55df2beca42a893dd7428cebfbb2844f3643608ab25205f8b36cf35741847476df862773dd8a14a604d25dc69bec3a5b5999
-Size (fehQlibs-23.tgz) = 87995 bytes
-SHA1 (patch-Makefile) = 538147923d27c039b48711453a5b3deb775c36d2
+BLAKE2s (fehQlibs-25a.tgz) = be0b8d05405c72e35790ecf5c0255ec693a4febc87deb99e68b925941af81c19
+SHA512 (fehQlibs-25a.tgz) = 023ea5599dfb4fc400b885fdd357c2c029791ac1eafe3bf60d910e748d1d31bf927e68acdd6ae31bcf8d847079c43734133b8171e9d1bbed69d8eaf0d1df4f33
+Size (fehQlibs-25a.tgz) = 88732 bytes
 SHA1 (patch-configure) = 2d38e849e3cc684477831a6a1565860bc4c0e57f
-SHA1 (patch-dnsstub_Makefile) = 5eb9f77dd72c73126fe984d1cf626a9c28e932d2
+SHA1 (patch-install) = 2143ab4d8b0f07ef6735d25be722bae4ae35c5e3
+SHA1 (patch-src_Makefile) = 507887a0bdc26544683ff8285e5d7dc00a3778e5
+SHA1 (patch-src_dnsstub_Makefile) = a5694e7fce0bfbb52c4d5d6e1d8a37e544f93240

Index: pkgsrc/net/fehqlibs/buildlink3.mk
diff -u pkgsrc/net/fehqlibs/buildlink3.mk:1.11 pkgsrc/net/fehqlibs/buildlink3.mk:1.12
--- pkgsrc/net/fehqlibs/buildlink3.mk:1.11      Thu Oct 21 22:28:42 2021
+++ pkgsrc/net/fehqlibs/buildlink3.mk   Tue Sep 10 20:08:29 2024
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2021/10/21 22:28:42 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2024/09/10 20:08:29 schmonz Exp $
 
 BUILDLINK_TREE+=       fehqlibs
 
 .if !defined(FEHQLIBS_BUILDLINK3_MK)
 FEHQLIBS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fehqlibs+=       fehqlibs>=19
+BUILDLINK_API_DEPENDS.fehqlibs+=       fehqlibs>=25
 BUILDLINK_PKGSRCDIR.fehqlibs?=         ../../net/fehqlibs
 BUILDLINK_INCDIRS.fehqlibs+=           include/qlibs
 BUILDLINK_LIBDIRS.fehqlibs+=           lib/qlibs

Added files:

Index: pkgsrc/net/fehqlibs/patches/patch-install
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-install:1.3
--- /dev/null   Tue Sep 10 20:08:30 2024
+++ pkgsrc/net/fehqlibs/patches/patch-install   Tue Sep 10 20:08:29 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-install,v 1.3 2024/09/10 20:08:29 schmonz Exp $
+
+Fix build.
+
+--- install.orig       2024-09-09 01:41:04.749243496 +0000
++++ install
+@@ -2,7 +2,7 @@
+ 
+ . ./conf-build
+ 
+-install_libs() { cp *.a $OFILES "$LIBDIR" ; }
++install_libs() { ( cd src; cp *.a $OFILES "$LIBDIR" ; ) }
+ install_hdrs() { cp include/*.h "$HDRDIR" ; }
+ 
+ echo -n "Installing qlibs ..."

Index: pkgsrc/net/fehqlibs/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-src_Makefile:1.1
--- /dev/null   Tue Sep 10 20:08:30 2024
+++ pkgsrc/net/fehqlibs/patches/patch-src_Makefile      Tue Sep 10 20:08:29 2024
@@ -0,0 +1,79 @@
+$NetBSD: patch-src_Makefile,v 1.1 2024/09/10 20:08:29 schmonz Exp $
+
+Libtoolize for portable shared libraries.
+
+--- src/Makefile.orig  2024-08-04 15:23:43.000000000 +0000
++++ src/Makefile
+@@ -6,7 +6,11 @@ SHELL=/bin/sh
+ CCFLAGS=-I../include
+ 
+ SRCS=*.c
+-OBJS=*.o
++.SUFFIXES: .lo
++.c.lo:
++      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
++
++OBJS=*.lo
+ COMPILE=../compile
+ MAKELIB=../makelib
+ SHAREDLIB=../sharedlib
+@@ -25,42 +29,40 @@ clean:
+ core: alloc.a buffer.a case.a cdb.a constmap.a env.a \
+ fd.a fs.a getln.a getopt.a lock.a logmsg.a ndelay.a open.a \
+ seek.a sig.a str.a stralloc.a time.a wait.a \
+-ip.a socket.a dnsresolv.a 
+-
+-libs: obj core qlibs.a dnsresolv.a
++ip.a socket.a dnsresolv.a \
++base64.o pathexec.o prot.o readclose.o \
++uint128p.o uint16p.o uint32p.o uint64p.o uint8p.o
+ 
+-obj:
+-      @echo Making all in qlibs ...
+-      $(COMPILE) $(CCFLAGS) $(CFLAGS) $(SRCS)
++libs: core qlibs.a dnsresolv.a
+ 
+ install: setup
+ 
+ setup:
+-      @../install
++      @cd .. && ./install
+ 
+ shared: $(COMPILE) $(SHAREDLIB) $(OBJS) ./dnsstub/$(OBJS)
+       @echo "Building shared qlibs ..."
+-      $(SHAREDLIB) $(LDFLAGS) $(OBJS) -o libqlibs.so 
+-      $(SHAREDLIB) $(LDFLAGS) ./dnsstub/$(OBJS) -o libdnsresolv.so
+-      @ln -f libqlibs.so ../libqlibs.so
+-      @ln -f libdnsresolv.so ../libdnsresolv.so
+-
++      $(SHAREDLIB) libqlibs.la $(OBJS) \
++              -version-info 0:0:0 -rpath $(PREFIX)/lib/qlibs
++      $(SHAREDLIB) libdnsresolv.la ./dnsstub/$(OBJS) \
++              -version-info 0:0:0 -rpath $(PREFIX)/lib/qlibs
+  
+-qlibs.a: obj socket.a 
+-      $(MAKELIB) $(LDFLAGS) qlibs.a *.o 
++qlibs.a: $(OBJS) socket.a 
++      $(MAKELIB) $(LDFLAGS) qlibs.a $(OBJS)
+       @echo "Creating libqlibs ... "  
+-      @ln -f qlibs.a ../libqlibs.a
++      @ln -f qlibs.a libqlibs.a
+ 
+ dnsresolv.a: 
+       @echo "Building @dnsresolv lib ..."
+-      @cd dnsstub ; make
++      @cd dnsstub ; $(MAKE) dnsresolv.a
+       @cp dnsstub/dnsresolv.a dnsresolv.a
+-      @ln -f dnsresolv.a ../libdnsresolv.a
++      @ln -f dnsresolv.a libdnsresolv.a
+ 
+-socket.a: ip.a
++socket.a: socket_if.o socket_bind.o socket_connect.o \
++socket_info.o socket_recv.o socket_send.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
+       @echo "Building socket lib ..."
+       $(MAKELIB) $(LDFLAGS) socket.a socket_if.o socket_bind.o socket_connect.o \
+-      socket_info.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
++      socket_info.o socket_recv.o socket_send.o socket_setup.o socket_tcp.o socket_udp.o ip.a 
+ 
+ # build each file separately (backwards compat) - better use recipe qlibs.a
+ alloc.a: alloc.o
Index: pkgsrc/net/fehqlibs/patches/patch-src_dnsstub_Makefile
diff -u /dev/null pkgsrc/net/fehqlibs/patches/patch-src_dnsstub_Makefile:1.1
--- /dev/null   Tue Sep 10 20:08:30 2024
+++ pkgsrc/net/fehqlibs/patches/patch-src_dnsstub_Makefile      Tue Sep 10 20:08:29 2024
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_dnsstub_Makefile,v 1.1 2024/09/10 20:08:29 schmonz Exp $
+
+Libtoolize for portable shared libraries.
+
+--- src/dnsstub/Makefile.orig  2024-07-21 10:43:29.000000000 +0000
++++ src/dnsstub/Makefile
+@@ -1,8 +1,18 @@
+ # dnsstub Makefile
+ 
++SHELL=/bin/sh
++
++CCFLAGS=-I../../include
++
++.SUFFIXES: .lo
++.c.lo:
++      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CCFLAGS) -c -o $@ $<
++
++OBJS=dns_cname.lo dns_dfd.lo dns_domain.lo dns_dtda.lo dns_ip.lo dns_ipq.lo \
++     dns_mx.lo dns_name.lo dns_nd.lo dns_packet.lo dns_random.lo dns_rcip.lo \
++     dns_rcrw.lo dns_resolve.lo dns_sortip.lo dns_transmit.lo dns_txt.lo
+ COMPILE=../../compile
+ MAKELIB=../../makelib
+-CCFLAGS=-I../../include
+ 
+ default: clean check dnsresolv.a
+ 
+@@ -12,13 +22,5 @@ check:
+ clean:
+       rm -f `cat TARGETS`
+ 
+-dnsresolv.a: \
+-dns_domain.c dns_dtda.c dns_ip.c dns_ipq.c dns_name.c \
+-dns_nd.c dns_packet.c dns_random.c dns_rcip.c dns_rcrw.c dns_resolve.c \
+-dns_sortip.c dns_transmit.c dns_txt.c
+-      $(COMPILE) $(CCFLAGS) dns_domain.c dns_dfd.c dns_dtda.c dns_ip.c dns_ipq.c \
+-      dns_mx.c dns_name.c dns_nd.c dns_packet.c dns_random.c dns_rcip.c \
+-      dns_rcrw.c dns_resolve.c dns_sortip.c dns_transmit.c dns_txt.c dns_cname.c 
+-      $(MAKELIB) dnsresolv.a dns_domain.o dns_dfd.o dns_dtda.o dns_ip.o dns_ipq.o \
+-      dns_mx.o dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o \
+-      dns_rcrw.o dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o dns_cname.o 
++dnsresolv.a: $(OBJS)
++      $(MAKELIB) dnsresolv.a $(OBJS)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index