pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

www/privoxy: Update to 4.2.0



Module Name:	pkgsrc-wip
Committed By:	Stepan Ipatov <st.ipatov%gmail.com@localhost>
Pushed By:	st.ipatov
Date:		Thu Aug 13 17:50:39 2026 +0000
Changeset:	eb9b31bc92eb707c00a2c7f5005b0efbb8812a50

Modified Files:
	privoxy/distinfo
	privoxy/patches/patch-GNUmakefile.in
	privoxy/patches/patch-configure.in

Log Message:
www/privoxy: Update to 4.2.0

Improve detection of gethostbyaddr_r and gethostbyname_r by using
compile-time checks with implicit function declarations disabled.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb9b31bc92eb707c00a2c7f5005b0efbb8812a50

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

diffstat:
 privoxy/distinfo                     |   4 +-
 privoxy/patches/patch-GNUmakefile.in |   6 +-
 privoxy/patches/patch-configure.in   | 290 +++++++++++++++++++++++++++++++++++
 3 files changed, 295 insertions(+), 5 deletions(-)

diffs:
diff --git a/privoxy/distinfo b/privoxy/distinfo
index a22655a208..f238d0a8cc 100644
--- a/privoxy/distinfo
+++ b/privoxy/distinfo
@@ -3,9 +3,9 @@ $NetBSD$
 BLAKE2s (privoxy-4.2.0-stable-src.tar.gz) = 80f41f73a6b47eef30bfe5c7fe3332e37c0bcfe212e13b190477e04b90731e9d
 SHA512 (privoxy-4.2.0-stable-src.tar.gz) = e727a16ead5759e3e976d42558ad0c0af137a7f74d8ccc83ed53a34320654362489a77d3bd54c9b4d5b84c5b4ecf8e375d2c1d0e3108eb26acce3014dfbefdb0
 Size (privoxy-4.2.0-stable-src.tar.gz) = 1791064 bytes
-SHA1 (patch-GNUmakefile.in) = 5e4b2a2048706a6d02e61d2da32cfa3274d0f4c3
+SHA1 (patch-GNUmakefile.in) = b8b5d36d63c5b522d46580462cf08d4131fdbaa9
 SHA1 (patch-config) = a111b0d25be9166d64632e8c3b4b5ef61a6f0cb1
-SHA1 (patch-configure.in) = 8e245310c3d13467b7e2958c63ff89424ea1161d
+SHA1 (patch-configure.in) = ffbfaf2d1347d9ac7430500078d678ad0e8c7059
 SHA1 (patch-man_privoxy.8) = 3ec0da5655f9ae94b648b9d04511f4e18079fa89
 SHA1 (patch-man_uagen.1) = da9026d395b659bc0634520c0d0bf9365314a8ed
 SHA1 (patch-tools_uagen.pl) = 0f2c1ba3ff40baba1ea2afac1279b776ae3ff505
diff --git a/privoxy/patches/patch-GNUmakefile.in b/privoxy/patches/patch-GNUmakefile.in
index 202a7988e8..ebf1baa31f 100644
--- a/privoxy/patches/patch-GNUmakefile.in
+++ b/privoxy/patches/patch-GNUmakefile.in
@@ -70,15 +70,15 @@ Drop user/group existence checks; pkgsrc handles their creation.
  			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
  			$(ECHO) Installing fresh $$i;\
 -			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-+			$(INSTALL) -m 660 $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
++			$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
  		elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
  			$(ECHO) Installing $$i as $$i.new ;\
 -			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
-+			$(INSTALL) -m 660 $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
++			$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
  			NEW=1;\
  		else \
 -			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-+			$(INSTALL) -m 660 $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
++			$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
  		fi ;\
  	done ;\
  	if [ -n "$$NEW" ]; then \
diff --git a/privoxy/patches/patch-configure.in b/privoxy/patches/patch-configure.in
index 85d7bfc274..e2cc2641f6 100644
--- a/privoxy/patches/patch-configure.in
+++ b/privoxy/patches/patch-configure.in
@@ -1,6 +1,8 @@
 $NetBSD$
 
 Drop user/group existence checks; pkgsrc handles their creation.
+Improve detection of gethostbyaddr_r and gethostbyname_r by using 
+compile-time checks with implicit function declarations disabled.
 
 --- configure.in.orig	2026-06-02 15:06:25.000000000 +0000
 +++ configure.in
@@ -69,3 +71,291 @@ Drop user/group existence checks; pkgsrc handles their creation.
          ],
          [
            if test $BGROUPS = no ; then
+@@ -523,92 +484,192 @@ dnl ====================================
+ dnl Next line needed to find the gethost*_r functions on Solaris
+ AC_CHECK_LIB(nsl, gethostbyname)
+ 
+-AC_CHECK_FUNC(gethostbyaddr_r, [
+-  AC_MSG_CHECKING([signature of gethostbyaddr_r])
+-  AC_TRY_COMPILE([
+-#   include <netdb.h>
+-  ], [
+-    struct hostent *h, *hp;
+-    char *a, *b;
+-    int l, bl, t, e;
+-    (void) gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e)
+-  ], [
+-    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8_ARGS)
+-    AC_MSG_RESULT([8 args])
+-  ], [
+-    AC_TRY_COMPILE([
+-#     include <netdb.h>
+-    ], [
+-      struct hostent *h;
+-      char *a, *b;
+-      int l, bl, t, e;
+-      (void) gethostbyaddr_r(a, l, t, h, b, bl, &e)
+-    ], [
+-      AC_DEFINE(HAVE_GETHOSTBYADDR_R_7_ARGS)
+-      AC_MSG_RESULT([7 args])
+-    ], [
+-      AC_TRY_COMPILE([
+-#       include <netdb.h>
+-      ], [
+-        struct hostent_data *d;
+-        struct hostent *h;
+-        char a,
+-        int l, t;
+-        (void) gethostbyaddr_r(a, l, t, h, d)
+-      ], [
+-        AC_DEFINE(HAVE_GETHOSTBYADDR_R_5_ARGS)
+-        AC_MSG_RESULT([5 args])
+-      ], [
+-        AC_MSG_RESULT(unrecognised)
+-      ])
+-    ])
+-  ])
+-], [
+-  AC_MSG_RESULT(no)
+-])
++AC_MSG_CHECKING([for gethostbyaddr_r])
++AC_COMPILE_IFELSE(
++  [AC_LANG_PROGRAM(
++    [[
++      #include <netdb.h>
++      #if defined(__GNUC__) || defined(__clang__)
++      #pragma GCC diagnostic error "-Wimplicit-function-declaration"
++      #endif
++    ]],
++    [[
++      (void)gethostbyaddr_r;
++    ]]
++  )],
++  [
++    AC_MSG_RESULT([yes])
++    AC_MSG_CHECKING([signature of gethostbyaddr_r])
++
++    AC_COMPILE_IFELSE(
++      [AC_LANG_PROGRAM(
++        [[
++          #include <netdb.h>
++        ]],
++        [[
++          struct hostent *h, *hp;
++          char *a, *b;
++          int l, bl, t, e;
++          (void)gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e);
++        ]]
++      )],
++      [
++        AC_DEFINE([HAVE_GETHOSTBYADDR_R], [1],
++          [Define if gethostbyaddr_r is available.])
++        AC_DEFINE([HAVE_GETHOSTBYADDR_R_8_ARGS], [1],
++          [Define if gethostbyaddr_r has 8 arguments.])
++        AC_MSG_RESULT([8 args])
++      ],
++      [
++        AC_COMPILE_IFELSE(
++          [AC_LANG_PROGRAM(
++            [[
++              #include <netdb.h>
++            ]],
++            [[
++              struct hostent *h;
++              char *a, *b;
++              int l, bl, t, e;
++              (void)gethostbyaddr_r(a, l, t, h, b, bl, &e);
++            ]]
++          )],
++          [
++            AC_DEFINE([HAVE_GETHOSTBYADDR_R], [1],
++              [Define if gethostbyaddr_r is available.])
++            AC_DEFINE([HAVE_GETHOSTBYADDR_R_7_ARGS], [1],
++              [Define if gethostbyaddr_r has 7 arguments.])
++            AC_MSG_RESULT([7 args])
++          ],
++          [
++            AC_COMPILE_IFELSE(
++              [AC_LANG_PROGRAM(
++                [[
++                  #include <netdb.h>
++                ]],
++                [[
++                  struct hostent_data *d;
++                  struct hostent *h;
++                  char *a;
++                  int l, t;
++                  (void)gethostbyaddr_r(a, l, t, h, d);
++                ]]
++              )],
++              [
++                AC_DEFINE([HAVE_GETHOSTBYADDR_R], [1],
++                  [Define if gethostbyaddr_r is available.])
++                AC_DEFINE([HAVE_GETHOSTBYADDR_R_5_ARGS], [1],
++                  [Define if gethostbyaddr_r has 5 arguments.])
++                AC_MSG_RESULT([5 args])
++              ],
++              [
++                AC_MSG_RESULT([unrecognised])
++                AC_MSG_WARN(
++                  [gethostbyaddr_r is declared, but its signature is unrecognised]
++                )
++              ]
++            )
++          ]
++        )
++      ]
++    )
++  ],
++  [
++    AC_MSG_RESULT([no])
++  ]
++)
+ 
+-AC_CHECK_FUNC(gethostbyname_r, [
+-  AC_MSG_CHECKING([signature of gethostbyname_r])
+-  AC_TRY_COMPILE([
+-#   include <netdb.h>
+-  ], [
+-    struct hostent *h, *r;
+-    char *n, *b;
+-    int bl, e;
+-    (void) gethostbyname_r(n, h, b, bl, &r, &e)
+-  ], [
+-    AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARGS)
+-    AC_MSG_RESULT([6 args])
+-  ], [
+-    AC_TRY_COMPILE([
+-#     include <netdb.h>
+-    ], [
+-      struct hostent *h;
+-      char *n, *b;
+-      int bl, e;
+-      (void) gethostbyname_r(n, h, b, bl, &e)
+-    ], [
+-      AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARGS)
+-      AC_MSG_RESULT([5 args])
+-    ], [
+-      AC_TRY_COMPILE([
+-#       include <netdb.h>
+-      ], [
+-        struct hostent_data *d;
+-        struct hostent *h;
+-        char *n,
+-        (void) gethostbyname_r(n, h, d)
+-      ], [
+-        AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARGS)
+-        AC_MSG_RESULT([3 args])
+-      ], [
+-        AC_MSG_RESULT(unrecognised)
+-      ])
+-    ])
+-  ])
+-], [
+-  AC_MSG_RESULT(no)
+-])
++AC_MSG_CHECKING([for gethostbyname_r])
++AC_COMPILE_IFELSE(
++  [AC_LANG_PROGRAM(
++    [[
++      #include <netdb.h>
++      #if defined(__GNUC__) || defined(__clang__)
++      #pragma GCC diagnostic error "-Wimplicit-function-declaration"
++      #endif
++    ]],
++    [[
++      (void)gethostbyname_r;
++    ]]
++  )],
++  [
++    AC_MSG_RESULT([yes])
++    AC_MSG_CHECKING([signature of gethostbyname_r])
++
++    AC_COMPILE_IFELSE(
++      [AC_LANG_PROGRAM(
++        [[
++          #include <netdb.h>
++        ]],
++        [[
++          struct hostent *h, *r;
++          char *n, *b;
++          int bl, e;
++          (void)gethostbyname_r(n, h, b, bl, &r, &e);
++        ]]
++      )],
++      [
++        AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
++          [Define if gethostbyname_r is available.])
++        AC_DEFINE([HAVE_GETHOSTBYNAME_R_6_ARGS], [1],
++          [Define if gethostbyname_r has 6 arguments.])
++        AC_MSG_RESULT([6 args])
++      ],
++      [
++        AC_COMPILE_IFELSE(
++          [AC_LANG_PROGRAM(
++            [[
++              #include <netdb.h>
++            ]],
++            [[
++              struct hostent *h;
++              char *n, *b;
++              int bl, e;
++              (void)gethostbyname_r(n, h, b, bl, &e);
++            ]]
++          )],
++          [
++            AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
++              [Define if gethostbyname_r is available.])
++            AC_DEFINE([HAVE_GETHOSTBYNAME_R_5_ARGS], [1],
++              [Define if gethostbyname_r has 5 arguments.])
++            AC_MSG_RESULT([5 args])
++          ],
++          [
++            AC_COMPILE_IFELSE(
++              [AC_LANG_PROGRAM(
++                [[
++                  #include <netdb.h>
++                ]],
++                [[
++                  struct hostent_data *d;
++                  struct hostent *h;
++                  char *n;
++                  (void)gethostbyname_r(n, h, d);
++                ]]
++              )],
++              [
++                AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
++                  [Define if gethostbyname_r is available.])
++                AC_DEFINE([HAVE_GETHOSTBYNAME_R_3_ARGS], [1],
++                  [Define if gethostbyname_r has 3 arguments.])
++                AC_MSG_RESULT([3 args])
++              ],
++              [
++                AC_MSG_RESULT([unrecognised])
++                AC_MSG_WARN(
++                  [gethostbyname_r is declared, but its signature is unrecognised]
++                )
++              ]
++            )
++          ]
++        )
++      ]
++    )
++  ],
++  [
++    AC_MSG_RESULT([no])
++  ]
++)
+ 
+ AC_CHECK_FUNC(gmtime_r, [
+   AC_MSG_CHECKING([signature of gmtime_r])
+@@ -779,9 +840,7 @@ AC_CHECK_FUNCS([ \
+  calloc \
+  getcwd \
+  gethostbyaddr \
+- gethostbyaddr_r \
+  gethostbyname \
+- gethostbyname_r \
+  gettimeofday \
+  inet_ntoa \
+  memchr \


Home | Main Index | Thread Index | Old Index