| /trunk/debian/changelog |
|---|
| 1,10 → 1,8 |
| libspf2 (1.2.10-1) unstable; urgency=low |
| * New upstream release. |
| * Drop ipv6-bugs.patch and private-glibc-functions.patch; incorporated |
| upstream. |
| -- Magnus Holmgren <holmgren@debian.org> Wed, 12 Jun 2013 22:20:34 +0200 |
| -- Magnus Holmgren <holmgren@debian.org> Wed, 12 Jun 2013 22:06:48 +0200 |
| libspf2 (1.2.9-7) unstable; urgency=high |
| /trunk/debian/patches/ipv6-bugs.patch |
|---|
| 0,0 → 1,56 |
| Author: Matthias Scheler <tron@netbsd.org> and others |
| Description: Fix various IPv6-related typos, C&P bugs etc. |
| These can crash applications using libspf2 or give the wrong result if |
| an e-mail gets delivered via SMTP over IPv6 depending on the remote |
| machine's IPv6 address. |
| --- a/src/libspf2/spf_expand.c 2008-11-03 21:29:00.000000000 +0000 |
| +++ b/src/libspf2/spf_expand.c 2009-09-08 11:27:52.000000000 +0100 |
| @@ -245,7 +245,7 @@ |
| case PARM_CLIENT_IP: /* SMTP client IP */ |
| #ifdef COMPUTE |
| if (compute_length) { |
| - len = sizeof(ip6_buf); |
| + len = sizeof(ip6_rbuf); |
| if (d->dv.url_encode) |
| len *= 3; |
| buflen += len; |
| --- a/src/libspf2/spf_interpret.c 2008-10-22 11:47:43.000000000 -0400 |
| +++ b/src/libspf2/spf_interpret.c 2009-09-08 00:42:25.000000000 -0400 |
| @@ -505,7 +505,7 @@ |
| char dst_ip6_buf[ INET6_ADDRSTRLEN ]; |
| struct in6_addr src_ipv6; |
| - int cidr, mask; |
| + int cidr, cidr_save, mask; |
| int i; |
| int match; |
| @@ -517,6 +517,7 @@ |
| cidr = SPF_i_mech_cidr(spf_request, mech); |
| if ( cidr == 0 ) |
| cidr = 128; |
| + cidr_save = cidr; |
| match = TRUE; |
| for( i = 0; i < array_elem( ipv6.s6_addr ) && match; i++ ) |
| @@ -538,7 +539,7 @@ |
| INET_NTOP(AF_INET6, &ipv6.s6_addr, |
| dst_ip6_buf, sizeof(dst_ip6_buf)); |
| SPF_debugf( "ip_match: %s == %s (/%d): %d", |
| - src_ip6_buf, dst_ip6_buf, cidr, match ); |
| + src_ip6_buf, dst_ip6_buf, cidr_save, match ); |
| } |
| return match; |
| --- a/src/libspf2/spf_compile.c 2008-11-03 15:37:33.000000000 -0500 |
| +++ b/src/libspf2/spf_compile.c 2009-09-07 23:46:02.000000000 -0400 |
| @@ -778,7 +778,7 @@ |
| const char *end; |
| const char *p; |
| - char buf[ INET_ADDRSTRLEN ]; |
| + char buf[ INET6_ADDRSTRLEN ]; |
| size_t len; |
| int err; |
| /trunk/debian/patches/series |
|---|
| 1,0 → 0,0 |
| private-glibc-functions.patch |
| spf_dns-include-std-headers.patch |
| ipv6-bugs.patch |
| /trunk/debian/patches/private-glibc-functions.patch |
|---|
| 0,0 → 1,41 |
| Author: Magnus Holmgren <holmgren@debian.org> |
| Description: Avoid linking private glibc functions (specifically __ns_get16). |
| --- trunk~/configure.ac 2008-11-04 16:32:10.000000000 +0100 |
| +++ trunk/configure.ac 2008-11-15 15:35:38.000000000 +0100 |
| @@ -272,7 +272,8 @@ |
| AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol]) |
| AC_REPLACE_FUNCS([getopt_long_only strncasecmp]) |
| -AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_get16 __ns_msg_getflag]) |
| +AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag]) |
| +AC_LIBOBJ(__ns_get16) |
| AC_CONFIG_FILES([Makefile |
| Doxyfile |
| diff -urNad trunk~/configure trunk/configure |
| --- trunk~/configure 2008-11-04 16:32:56.000000000 +0100 |
| +++ trunk/configure 2008-11-15 15:35:39.000000000 +0100 |
| @@ -25752,8 +25752,7 @@ |
| - |
| -for ac_func in __ns_initparse __ns_name_uncompress __ns_get16 __ns_msg_getflag |
| +for ac_func in __ns_initparse __ns_name_uncompress __ns_msg_getflag |
| do |
| as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
| { echo "$as_me:$LINENO: checking for $ac_func" >&5 |
| @@ -25854,6 +25853,12 @@ |
| done |
| +case " $LIBOBJS " in |
| + *" __ns_get16.$ac_objext "* ) ;; |
| + *) LIBOBJS="$LIBOBJS __ns_get16.$ac_objext" |
| + ;; |
| +esac |
| + |
| ac_config_files="$ac_config_files Makefile Doxyfile src/Makefile src/include/Makefile src/libreplace/Makefile src/libspf2/Makefile src/spfquery/Makefile src/spftest/Makefile src/spfd/Makefile src/spf_example/Makefile" |
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |