pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamdyke On some platforms the "tls" option was s...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f14eb46528fc
branches: trunk
changeset: 771224:f14eb46528fc
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Wed Dec 15 14:06:21 2021 +0000
description:
On some platforms the "tls" option was silently a noop. Fix the OpenSSL
configure check. While here, avoid unconditionally stripping the binary.
Bump PKGREVISION.
diffstat:
mail/spamdyke/Makefile | 4 +-
mail/spamdyke/distinfo | 8 +-
mail/spamdyke/patches/patch-Makefile.in | 14 ++-
mail/spamdyke/patches/patch-configure | 149 +++++++++++++++---------------
mail/spamdyke/patches/patch-configure.ac | 20 +++-
5 files changed, 108 insertions(+), 87 deletions(-)
diffs (truncated from 727 to 300 lines):
diff -r c5318091f226 -r f14eb46528fc mail/spamdyke/Makefile
--- a/mail/spamdyke/Makefile Wed Dec 15 10:06:25 2021 +0000
+++ b/mail/spamdyke/Makefile Wed Dec 15 14:06:21 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2020/01/26 17:31:36 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2021/12/15 14:06:21 schmonz Exp $
#
DISTNAME= spamdyke-5.0.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/
EXTRACT_SUFX= .tgz
diff -r c5318091f226 -r f14eb46528fc mail/spamdyke/distinfo
--- a/mail/spamdyke/distinfo Wed Dec 15 10:06:25 2021 +0000
+++ b/mail/spamdyke/distinfo Wed Dec 15 14:06:21 2021 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.38 2021/12/14 12:49:35 schmonz Exp $
+$NetBSD: distinfo,v 1.39 2021/12/15 14:06:21 schmonz Exp $
BLAKE2s (spamdyke-5.0.1.tgz) = bbee05a4d7529e2aa4ddb58e1a5babe4b3ba35b8dba9c4007d09c67e0e28d07c
SHA512 (spamdyke-5.0.1.tgz) = a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
Size (spamdyke-5.0.1.tgz) = 383720 bytes
-SHA1 (patch-Makefile.in) = a68d1077ada42e034c9ea3c989aa5ece77887b6c
+SHA1 (patch-Makefile.in) = 10fb0c5e5645d7395e49193767b14e00e7682eb4
SHA1 (patch-configuration.c) = 81548b8a7cc557446d3ecfca3546a129b04a2173
-SHA1 (patch-configure) = 4800a832a8144a6e394220e5cd09cecaa9e9c2d8
-SHA1 (patch-configure.ac) = c7a17cc40a677db1d0d04a10395aabc214440fa0
+SHA1 (patch-configure) = 75fe140d9ce85544ab2442a39130ff6fda03eff4
+SHA1 (patch-configure.ac) = 6bd679c9908e7b217b0292f7a32f4116f5c36df4
SHA1 (patch-md5.c) = d30f421e28fbc6b87c4dc78f4a2e7f5048c61a45
SHA1 (patch-spamdyke.h) = 689d4774d78b60a4dd2fbb62a99b218aca9b500b
SHA1 (patch-tls.c) = 1cc05d30dfd3736727c6203a81ebb24c44cd2c1f
diff -r c5318091f226 -r f14eb46528fc mail/spamdyke/patches/patch-Makefile.in
--- a/mail/spamdyke/patches/patch-Makefile.in Wed Dec 15 10:06:25 2021 +0000
+++ b/mail/spamdyke/patches/patch-Makefile.in Wed Dec 15 14:06:21 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile.in,v 1.1 2021/12/14 12:49:35 schmonz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2021/12/15 14:06:21 schmonz Exp $
-Remove unneeded workaround.
+Remove unneeded workaround and unconditional strip.
--- Makefile.in.orig 2015-04-30 00:53:36.000000000 +0000
+++ Makefile.in
@@ -12,7 +12,15 @@
CFLAGS := @CFLAGS@ -funsigned-char @CPPFLAGS@
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
-@@ -59,10 +58,8 @@ filter.o: filter.c filter.h Makefile spa
+@@ -26,7 +25,6 @@ OFILES := spamdyke.o configuration.o dns
+
+ spamdyke: $(OFILES)
+ $(CC) $(CFLAGS) $(DEFS) -o spamdyke $(OFILES) $(LDFLAGS) $(LIBS)
+- @STRIP_CMD@
+
+ install: spamdyke
+ cp spamdyke /usr/local/bin/spamdyke-@PACKAGE_VERSION@
+@@ -59,10 +57,8 @@ filter.o: filter.c filter.h Makefile spa
$(CC) $(CFLAGS) $(DEFS) -c filter.c
cdb.o: cdb.c cdb.h Makefile spamdyke.h config.h
$(CC) $(CFLAGS) $(DEFS) -c cdb.c
diff -r c5318091f226 -r f14eb46528fc mail/spamdyke/patches/patch-configure
--- a/mail/spamdyke/patches/patch-configure Wed Dec 15 10:06:25 2021 +0000
+++ b/mail/spamdyke/patches/patch-configure Wed Dec 15 14:06:21 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2021/12/14 12:49:35 schmonz Exp $
+$NetBSD: patch-configure,v 1.4 2021/12/15 14:06:21 schmonz Exp $
Remove anonymous inner functions to build with clang.
Remove outdated OpenSSL check to build with 1.1.x.
@@ -4321,7 +4321,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -3939,155 +3991,81 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -3939,155 +3991,83 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4378,10 +4378,8 @@
+printf "%s\n" "$ac_cv_search_RSA_sign" >&6; }
ac_res=$ac_cv_search_RSA_sign
-if test "$ac_res" != no; then :
-+if test "$ac_res" != no
-+then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -4441,15 +4439,18 @@
-$as_echo "$ac_cv_search_SSL_library_init" >&6; }
-ac_res=$ac_cv_search_SSL_library_init
-if test "$ac_res" != no; then :
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- LIBS="$LIBS -lssl"
++if test "$ac_res" != no
++then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ LIBS="$LIBS -lssl"
- $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
--
++ printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL libraries (for TLS support)" >&5
-$as_echo_n "checking for OpenSSL libraries (for TLS support)... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
--
+
-else
- if test "x$enable_tls" = "xcheck" ; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL libraries (for TLS support)" >&5
@@ -4477,11 +4478,11 @@
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Unable to include openssl/ssl.h (required by OpenSSL), TLS support disabled" >&5
-$as_echo "$as_me: Unable to include openssl/ssl.h (required by OpenSSL), TLS support disabled" >&6;}
+- enable_tls="no"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
-+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to include openssl/ssl.h (required by OpenSSL), TLS support disabled" >&5
-+printf "%s\n" "$as_me: Unable to include openssl/ssl.h (required by OpenSSL), TLS support disabled" >&6;}
- enable_tls="no"
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to include openssl/ssl.h (required by OpenSSL)" >&5
++printf "%s\n" "$as_me: Unable to include openssl/ssl.h (required by OpenSSL)" >&6;}
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4510,7 +4511,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4095,60 +4073,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4095,60 +4075,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4595,7 +4596,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4156,60 +4137,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4156,60 +4139,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4680,7 +4681,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4217,60 +4201,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4217,60 +4203,63 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4765,7 +4766,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4278,58 +4265,61 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4278,58 +4267,61 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4846,7 +4847,7 @@
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4337,51 +4327,53 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4337,51 +4329,53 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -4916,7 +4917,7 @@
as_fn_error $? "unable to compile without getopt_long(), you may need to install the libgnugetopt package/port
See \`config.log' for more details" "$LINENO" 5; }
fi
-@@ -4390,113 +4382,15 @@ fi
+@@ -4390,113 +4384,15 @@ fi
fi
@@ -5033,7 +5034,7 @@
{
struct option tmp_option;
if ((tmp_option.name = NULL)) return(0);
-@@ -4504,22 +4398,23 @@ main ()
+@@ -4504,22 +4400,23 @@ main ()
return 0;
}
_ACEOF
@@ -5068,7 +5069,7 @@
{
struct option tmp_option;
if ((tmp_option.name = NULL)) return(0);
-@@ -4527,49 +4422,51 @@ main ()
+@@ -4527,49 +4424,51 @@ main ()
return 0;
}
_ACEOF
@@ -5143,7 +5144,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
-@@ -4578,28 +4475,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4578,28 +4477,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5186,7 +5187,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
-@@ -4609,28 +4507,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4609,28 +4509,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5229,7 +5230,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
-@@ -4640,28 +4539,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4640,28 +4541,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5272,7 +5273,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
-@@ -4670,28 +4570,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4670,28 +4572,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5315,7 +5316,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_INTTYPES_H
-@@ -4704,7 +4605,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -4704,7 +4607,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#include <sys/types.h>
#endif
int
@@ -5324,7 +5325,7 @@
{
int64_t foo;
int64_t bar;
-@@ -4715,17 +4616,19 @@ main ()
+@@ -4715,17 +4618,19 @@ main ()
return 0;
}
_ACEOF
@@ -5353,7 +5354,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_INTTYPES_H
-@@ -4742,7 +4645,7 @@ else
+@@ -4742,7 +4647,7 @@ else
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5362,7 +5363,7 @@
{
int64_t tmp;
tmp = 0x7777777777777777ULL;
-@@ -4756,24 +4659,26 @@ main ()
+@@ -4756,24 +4661,26 @@ main ()
}
_ACEOF
@@ -5405,7 +5406,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_INTTYPES_H
-@@ -4790,7 +4695,7 @@ else
+@@ -4790,7 +4697,7 @@ else
#pragma GCC diagnostic error "-Wformat"
#endif
int
@@ -5414,7 +5415,7 @@
{
int64_t tmp;
tmp = 0x7777777777777777ULL;
-@@ -4804,24 +4709,26 @@ main ()
+@@ -4804,24 +4711,26 @@ main ()
}
_ACEOF
@@ -5457,7 +5458,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_INTTYPES_H
-@@ -4838,7 +4745,7 @@ else
+@@ -4838,7 +4747,7 @@ else
Home |
Main Index |
Thread Index |
Old Index