| /trunk/debian/control |
|---|
| 0,0 → 1,54 |
| Source: libspf2 |
| Priority: optional |
| Section: libs |
| Maintainer: Magnus Holmgren <magnus@kibibyte.se> |
| Build-Depends: debhelper (>> 5), cdbs, dpatch, autotools-dev |
| Standards-Version: 3.7.2 |
| Package: libspf2-dev |
| Section: libdevel |
| Architecture: any |
| Depends: libspf2-2 (= ${binary:Version}) |
| Description: Header and development libraries for libspf2 |
| libspf2 implements the Sender Policy Framework, a part of the SPF/SRS |
| protocol pair. libspf2 is a library which allows email systems such |
| as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF |
| records and make sure that the email is authorized by the domain name |
| that it is coming from. This prevents email forgery, commonly used by |
| spammers, scammers and email viruses/worms. |
| . |
| Homepage: http://www.libspf2.org/ |
| Package: libspf2-2 |
| Section: libs |
| Architecture: any |
| Conflicts: libspf2-0 |
| Replaces: libspf2-0 |
| Depends: ${shlibs:Depends} |
| Description: library for validating mail senders with SPF |
| libspf2 implements the Sender Policy Framework, a part of the SPF/SRS |
| protocol pair. libspf2 is a library which allows email systems such |
| as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF |
| records and make sure that the email is authorized by the domain name |
| that it is coming from. This prevents email forgery, commonly used by |
| spammers, scammers and email viruses/worms. |
| . |
| Homepage: http://www.libspf2.org/ |
| Package: spfquery |
| Section: mail |
| Architecture: any |
| Depends: ${shlibs:Depends} |
| Conflicts: libmail-spf-query-perl (<< 1:1.999.1-3) |
| Description: query SPF (Sender Policy Framework) to validate mail senders |
| The Sender Policy Framework (SPF) is one part of the SPF/SRS protocol |
| pair. SPF allows email systems such as Sendmail, Postfix, Exim, |
| Zmailer and MS Exchange to check SPF records and make sure that the |
| email is authorized by the domain name that it is coming from. This |
| prevents email forgery, commonly used by spammers, scammers and email |
| viruses/worms. |
| . |
| This package contains simple utilities that use libspf2 to test and |
| query SPF records. |
| . |
| Homepage: http://www.libspf2.org/ |
| /trunk/debian/spfquery.postinst |
|---|
| 0,0 → 1,16 |
| #!/bin/sh -e |
| mode=$1 |
| source_package=libspf2 |
| case "$mode" in |
| configure ) |
| prev_version=$2 |
| update-alternatives --install /usr/bin/spfquery spfquery /usr/bin/spfquery.$source_package 75 |
| update-alternatives --install /usr/sbin/spfd spfd /usr/sbin/spfd.$source_package 75 |
| ;; |
| esac |
| #DEBHELPER# |
| /trunk/debian/libspf2-dev.install |
|---|
| 0,0 → 1,4 |
| debian/tmp/usr/lib/*.so usr/lib |
| debian/tmp/usr/lib/*.a usr/lib |
| debian/tmp/usr/lib/*.la usr/lib |
| debian/tmp/usr/include/* usr/include |
| /trunk/debian/spfquery.prerm |
|---|
| 0,0 → 1,14 |
| #!/bin/sh -e |
| mode=$1 |
| source_package=libspf2 |
| case "$mode" in |
| remove ) |
| update-alternatives --remove spfquery /usr/bin/spfquery.$source_package |
| update-alternatives --remove spfd /usr/sbin/spfd.$source_package |
| ;; |
| esac |
| #DEBHELPER# |
| /trunk/debian/compat |
|---|
| 0,0 → 1,0 |
| 5 |
| /trunk/debian/spfquery.install |
|---|
| 0,0 → 1,4 |
| debian/tmp/usr/bin/spfquery usr/bin |
| debian/tmp/usr/bin/spftest usr/bin |
| debian/tmp/usr/bin/spf_example usr/bin |
| debian/tmp/usr/bin/spfd usr/sbin |
| /trunk/debian/libspf2-2.install |
|---|
| 0,0 → 1,0 |
| debian/tmp/usr/lib/*.so.* usr/lib |
| /trunk/debian/watch |
|---|
| 0,0 → 1,3 |
| version=3 |
| http://www.libspf2.org/download.html spf/libspf2-(.+)\.tar\.gz |
| /trunk/debian/changelog |
|---|
| 0,0 → 1,115 |
| libspf2 (1.2.5.dfsg-1) unstable; urgency=low |
| * New maintainer (Closes: #372629). |
| * Repacked .orig.tar.gz without non-free IETF Internet Draft (Closes: |
| #393390). |
| * Merge updates from Ubuntu: |
| - Add debian/compat and Build-depend on debhelper >= 5. |
| - Add alternatives handling for /usr/bin/spfquery (Closes: #306875). |
| - Conflict on libmail-spf-query-perl << 1:1.999.1-3. |
| - Add postinst and prerm scripts. |
| - debian/copyright: update author address. |
| - debian/control: add final newline. |
| * debian/control: |
| * Change description of spfquery (Closes: #410592). |
| * Add homepage to package descriptions. |
| * Reduce Debian diff by changing line endings with sed instead. |
| * Further reduce Debian diff by eliminating config.sub and config.guess |
| from there. Build-depend on autotools-dev to ensure up-to-date |
| versions instead. |
| * The autogenerated spf_lib_version.h was put in the wrong directory, |
| while there was a static spf_lib_version.h in the right directory. |
| Fix that with some rules in debian/rules. |
| * Use dpatch to manage patches. |
| * Apply 20_64bit_types.dpatch to hopefully prevent segfaults on 64-bit |
| architectures (Closes: #392793). Thanks to Thomas Jacob, Carsten |
| Koch-Mauthe and Herbert Straub. |
| * 20_printf_types.dpatch: Change format strings to use the z flag, |
| meaning size_t, among other things. |
| * 30_spfd_check_unlink_failure.dpatch: Fix a typo in spfd (patch from |
| Thomas Jacob). |
| * debian/watch: added. |
| * Update Standards-Version to 3.7.2 without changes. |
| * Apply 20_spf_dns_include_std_headers.dpatch: Include arpa/nameser.h and |
| netdb.h from spf_dns.h instead of defining the constants needed unless |
| certain HAVE_ macros are defined (Closes: #405885). |
| * Apply 25_maxvals.dpatch, which brings certain processing limits (meant |
| to mitigate DoS attacks) in line with RFC 4408. Thanks to Scott |
| Kitterman. |
| * debian/control: Change libspf2-dev dependency to ${binary:Version} so |
| that binNMUs will work. |
| * Ship spfd in the spfquery package (Closes: #258360). |
| -- Magnus Holmgren <magnus@kibibyte.se> Sat, 24 Mar 2007 14:51:23 +0100 |
| libspf2 (1.2.5-4) unstable; urgency=low |
| * Orphan. |
| -- Eric Dorland <eric@debian.org> Mon, 20 Nov 2006 02:16:20 -0500 |
| libspf2 (1.2.5-3) unstable; urgency=low |
| * src/include/spf_server.h: Remove useless include to |
| spf_dns_internal.h. (Closes: #312145) |
| * debian/control: Have spfquery against libmail-spf-query-perl to work |
| around #306875, hopefully temporarily. |
| -- Eric Dorland <eric@debian.org> Sat, 30 Jul 2005 01:25:24 -0400 |
| libspf2 (1.2.5-2) unstable; urgency=low |
| * The "Doh, missed a soname change" release. |
| * debian/libspf2-0.install: Rename to libspf2-2.install. |
| * debian/control: |
| - Change libspf2-0 to libspf2-2 to reflect soname change. |
| (Closes: #306205) |
| - Add spfquery package, don't package spfd for now, can't figure |
| out how to make it work. This partially addresses #258360. |
| * debian/spfquery.install: New file. |
| -- Eric Dorland <eric@debian.org> Mon, 25 Apr 2005 20:07:48 -0400 |
| libspf2 (1.2.5-1) unstable; urgency=low |
| * New upstream release. |
| -- Eric Dorland <eric@debian.org> Sun, 17 Apr 2005 23:37:27 -0400 |
| libspf2 (1.0.4-4) unstable; urgency=medium |
| * configure, aclocal.m4: Run aclocal and autoconf to get the right code |
| for the libtool test to use the pass_all method on arm. (Closes: |
| #276516) |
| * Urgency medium to get this bloody thing fixed already. |
| -- Eric Dorland <eric@debian.org> Fri, 26 Nov 2004 00:15:04 -0500 |
| libspf2 (1.0.4-3) unstable; urgency=low |
| * config/ltmain.sh: Re-libtoolize again, hopefully this will fix arm |
| building. |
| -- Eric Dorland <eric@debian.org> Wed, 17 Nov 2004 13:50:50 -0500 |
| libspf2 (1.0.4-2) unstable; urgency=low |
| * config/ltmain.sh: Re-libtoolize. (Closes: #269936) |
| * configure.ac: Apply patch from Kurt Roeckx to fix build on |
| amd64. (Closes: #262687) |
| * Rerun autoconf to apply the changes. |
| -- Eric Dorland <eric@debian.org> Mon, 6 Sep 2004 19:36:20 -0400 |
| libspf2 (1.0.4-1) unstable; urgency=low |
| * New upstream release. (Closes: #261709) |
| -- Eric Dorland <eric@debian.org> Mon, 9 Aug 2004 00:57:49 -0400 |
| libspf2 (1.0.3-1) unstable; urgency=low |
| * Initial release. (Closes: #257644) |
| -- Eric Dorland <eric@debian.org> Fri, 2 Jul 2004 00:00:19 -0400 |
| /trunk/debian/patches/20_64bit_types.dpatch |
|---|
| 0,0 → 1,105 |
| #! /bin/sh /usr/share/dpatch/dpatch-run |
| ## 20_64bit_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| ## |
| ## All lines beginning with `## DP:' are a description of the patch. |
| ## DP: Change various ints to size_t etc, to avoid crashes on 64-bit |
| ## DP: architectures. |
| @DPATCH@ |
| diff -Nur libspf2-1.2.5.dfsg/src/include/spf_internal.h libspf2-1.2.5.dfsg.new/src/include/spf_internal.h |
| --- libspf2-1.2.5.dfsg/src/include/spf_internal.h 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/include/spf_internal.h 2007-03-23 23:08:54.000000000 +0100 |
| @@ -71,7 +71,7 @@ |
| static inline size_t _align_sz(size_t s) |
| { return (s + (_ALIGN_SZ - 1 - (((s - 1) & (_ALIGN_SZ - 1))))); } |
| static inline char * _align_ptr(char *s) |
| - { return (s + (_ALIGN_SZ - 1 - ((((unsigned int)s - 1) & (_ALIGN_SZ - 1))))); } |
| + { return (s + (_ALIGN_SZ - 1 - ((((size_t)s - 1) & (_ALIGN_SZ - 1))))); } |
| #else |
| static inline size_t _align_sz(size_t s) { return s; } |
| static inline char * _align_ptr(char *s) { return s; } |
| diff -Nur libspf2-1.2.5.dfsg/src/include/spf_record.h libspf2-1.2.5.dfsg.new/src/include/spf_record.h |
| --- libspf2-1.2.5.dfsg/src/include/spf_record.h 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/include/spf_record.h 2007-03-23 23:08:54.000000000 +0100 |
| @@ -224,7 +224,7 @@ |
| struct SPF_macro_struct |
| { |
| - unsigned int macro_len; /* bytes of data */ |
| + size_t macro_len; /* bytes of data */ |
| /* data: (SPF_data_t[] = char[macro_len]) follows */ |
| }; |
| diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c |
| --- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c 2007-03-23 23:18:41.000000000 +0100 |
| @@ -98,7 +98,7 @@ |
| } |
| static void |
| -SPF_c_ensure_capacity(void **datap, int *sizep, int length) |
| +SPF_c_ensure_capacity(void **datap, size_t *sizep, int length) |
| { |
| int size = *sizep; |
| if (length > size) |
| @@ -435,7 +435,7 @@ |
| static SPF_errcode_t |
| SPF_c_parse_macro(SPF_server_t *spf_server, |
| SPF_response_t *spf_response, |
| - SPF_data_t *data, int *data_len, |
| + SPF_data_t *data, size_t *data_len, |
| const char **startp, const char **endp, |
| size_t max_len, SPF_errcode_t big_err, |
| int is_mod) |
| @@ -551,10 +551,10 @@ |
| static SPF_errcode_t |
| SPF_c_parse_domainspec(SPF_server_t *spf_server, |
| SPF_response_t *spf_response, |
| - SPF_data_t *data, int *data_len, |
| + SPF_data_t *data, size_t *data_len, |
| const char **startp, const char **endp, |
| size_t max_len, SPF_errcode_t big_err, |
| - int cidr_ok, int is_mod) |
| + SPF_cidr_t cidr_ok, int is_mod) |
| { |
| SPF_errcode_t err; |
| /* Generic parsing iterators and boundaries */ |
| diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_dns_resolv.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_dns_resolv.c |
| --- libspf2-1.2.5.dfsg/src/libspf2/spf_dns_resolv.c 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_dns_resolv.c 2007-03-23 23:08:54.000000000 +0100 |
| @@ -393,7 +393,7 @@ |
| if ( SPF_dns_rr_buf_realloc( spfrr, cnt, rdlen ) != SPF_E_SUCCESS ) |
| return spfrr; |
| - dst = spfrr->rr[cnt]->txt; |
| + dst = (u_char *)(spfrr->rr[cnt]->txt); |
| len = 0; |
| src = (u_char *)rdata; |
| while ( rdlen > 0 ) |
| diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c |
| --- libspf2-1.2.5.dfsg/src/libspf2/spf_interpret.c 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_interpret.c 2007-03-23 23:20:30.000000000 +0100 |
| @@ -49,8 +49,8 @@ |
| SPF_record_t *spf_record; |
| SPF_errcode_t err; |
| char *buf; |
| - int buflen; |
| - int len; |
| + size_t buflen; |
| + size_t len; |
| SPF_ASSERT_NOTNULL(spf_response); |
| spf_request = spf_response->spf_request; |
| diff -Nur libspf2-1.2.5.dfsg/src/spfd/spfd.c libspf2-1.2.5.dfsg.new/src/spfd/spfd.c |
| --- libspf2-1.2.5.dfsg/src/spfd/spfd.c 2007-03-23 22:37:26.000000000 +0100 |
| +++ libspf2-1.2.5.dfsg.new/src/spfd/spfd.c 2007-03-23 23:08:54.000000000 +0100 |
| @@ -168,7 +168,7 @@ |
| struct sockaddr_in in; |
| struct sockaddr_un un; |
| } addr; |
| - int addrlen; |
| + socklen_t addrlen; |
| char *data; |
| int datalen; |
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/02_wrong_lib_version_h.dpatch |
| =================================================================== |
| --- debian/patches/02_wrong_lib_version_h.dpatch (nonexistent) |
| +++ debian/patches/02_wrong_lib_version_h.dpatch (revision 2) |
| @@ -0,0 +1,30 @@ |
| +#!/bin/sh |
| +## 02_wrong_lib_version_h.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Move static spf_lib_version.h out of the way and patch configure to put |
| +## DP: the autogenerated one in the right place. |
| + |
| +set -e |
| + |
| +lib_version_h=src/include/spf_lib_version.h |
| + |
| +dpatch_patch() { |
| + # Update configure script so that it writes to the right .h file |
| + test -e configure.old || \ |
| + sed -ri.old -e 's%src/libspf2/spf_lib_version%src/include/spf_lib_version%' configure |
| + # Move the bad .h file out of the way |
| + test -e $lib_version_h.old || mv -f $lib_version_h $lib_version_h.old |
| +} |
| + |
| +dpatch_unpatch() { |
| + # Move the bad .h file back to its position |
| + if test -e $lib_version_h.old; then mv -f $lib_version_h.old $lib_version_h; fi |
| + # Move the original configure script back |
| + if test -e configure.old; then mv -f configure.old configure; fi |
| +} |
| + |
| + |
| +DPATCH_LIB_NO_DEFAULT=1 |
| + |
| +. /usr/share/dpatch/dpatch.lib.sh |
| /debian/patches/02_wrong_lib_version_h.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/20_spf_server_unnecessary_include.dpatch |
| =================================================================== |
| --- debian/patches/20_spf_server_unnecessary_include.dpatch (nonexistent) |
| +++ debian/patches/20_spf_server_unnecessary_include.dpatch (revision 2) |
| @@ -0,0 +1,18 @@ |
| +#! /bin/sh /usr/share/dpatch/dpatch-run |
| +## 20_spf_server_unnecessary_include.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: src/include/spf_server.h: Remove useless include of spf_dns_internal.h. |
| + |
| +@DPATCH@ |
| + |
| +--- libspf2-1.2.5.dfsg.orig/src/include/spf_server.h |
| ++++ libspf2-1.2.5.dfsg/src/include/spf_server.h |
| +@@ -20,7 +20,6 @@ |
| + |
| + #include "spf_record.h" |
| + #include "spf_dns.h" |
| +-#include "spf_dns_internal.h" |
| + |
| + #ifndef SPF_MAX_DNS_MECH |
| + /* It is a bad idea to change this for two reasons. |
| /debian/patches/20_spf_server_unnecessary_include.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/25_maxvals.dpatch |
| =================================================================== |
| --- debian/patches/25_maxvals.dpatch (nonexistent) |
| +++ debian/patches/25_maxvals.dpatch (revision 2) |
| @@ -0,0 +1,61 @@ |
| +#! /bin/sh /usr/share/dpatch/dpatch-run |
| +## 25_maxvals.dpatch by Thomas Jacob <jacob@internet24.de> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Bring certain processing limits (meant to mitigate DoS attacks) in line |
| +## DP: with RFC 4408. |
| + |
| +@DPATCH@ |
| + |
| +diff -ruN libspf2-1.2.5/src/include/spf.h libspf2-1.2.5.patched/src/include/spf.h |
| +--- libspf2-1.2.5/src/include/spf.h 2005-02-17 01:56:55.000000000 +0100 |
| ++++ libspf2-1.2.5.patched/src/include/spf.h 2007-03-14 16:58:21.000000000 +0100 |
| +@@ -52,8 +52,8 @@ |
| + |
| + /* FYI only -- defaults can't be changed without recompiling the library */ |
| + #define SPF_DEFAULT_MAX_DNS_MECH 10 /* DoS limit on SPF mechanisms */ |
| +-#define SPF_DEFAULT_MAX_DNS_PTR 5 /* DoS limit on PTR records */ |
| +-#define SPF_DEFAULT_MAX_DNS_MX 5 /* DoS limit on MX records */ |
| ++#define SPF_DEFAULT_MAX_DNS_PTR 10 /* DoS limit on PTR records */ |
| ++#define SPF_DEFAULT_MAX_DNS_MX 10 /* DoS limit on MX records */ |
| + #define SPF_DEFAULT_SANITIZE 1 |
| + #define SPF_DEFAULT_WHITELIST "include:spf.trusted-forwarder.org" |
| + #define SPF_EXP_MOD_NAME "exp-text" |
| +diff -ruN libspf2-1.2.5/src/include/spf_internal.h libspf2-1.2.5.patched/src/include/spf_internal.h |
| +--- libspf2-1.2.5/src/include/spf_internal.h 2005-02-24 05:10:49.000000000 +0100 |
| ++++ libspf2-1.2.5.patched/src/include/spf_internal.h 2007-03-14 16:58:04.000000000 +0100 |
| +@@ -57,13 +57,13 @@ |
| + /* It is a bad idea to change this for the same reasons as mentioned |
| + * above for SPF_MAX_DNS_MECH |
| + */ |
| +-#define SPF_MAX_DNS_PTR 5 |
| ++#define SPF_MAX_DNS_PTR 10 |
| + #endif |
| + #ifndef SPF_MAX_DNS_MX |
| + /* It is a bad idea to change this for the same reasons as mentioned |
| + * above for SPF_MAX_DNS_MECH |
| + */ |
| +-#define SPF_MAX_DNS_MX 5 |
| ++#define SPF_MAX_DNS_MX 10 |
| + #endif |
| + |
| + #if 1 |
| +diff -ruN libspf2-1.2.5/src/include/spf_server.h libspf2-1.2.5.patched/src/include/spf_server.h |
| +--- libspf2-1.2.5/src/include/spf_server.h 2004-09-29 12:33:09.000000000 +0200 |
| ++++ libspf2-1.2.5.patched/src/include/spf_server.h 2007-03-14 16:58:54.000000000 +0100 |
| +@@ -44,13 +44,13 @@ |
| + /* It is a bad idea to change this for the same reasons as mentioned |
| + * above for SPF_MAX_DNS_MECH |
| + */ |
| +-#define SPF_MAX_DNS_PTR 5 |
| ++#define SPF_MAX_DNS_PTR 10 |
| + #endif |
| + #ifndef SPF_MAX_DNS_MX |
| + /* It is a bad idea to change this for the same reasons as mentioned |
| + * above for SPF_MAX_DNS_MECH |
| + */ |
| +-#define SPF_MAX_DNS_MX 5 |
| ++#define SPF_MAX_DNS_MX 10 |
| + #endif |
| + |
| + struct SPF_server_struct { |
| /debian/patches/25_maxvals.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/30_spfd_check_unlink_failure.dpatch |
| =================================================================== |
| --- debian/patches/30_spfd_check_unlink_failure.dpatch (nonexistent) |
| +++ debian/patches/30_spfd_check_unlink_failure.dpatch (revision 2) |
| @@ -0,0 +1,20 @@ |
| +#! /bin/sh /usr/share/dpatch/dpatch-run |
| +## 30_spfd_check_unlink_failure.dpatch by Thomas Jacob <jacob@internet24.de> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Fix a call to unlink() in spfd.c. It passed 'path < 0' as the argument |
| +## DP: instead of checking whether the return value < 0. |
| + |
| +@DPATCH@ |
| + |
| +--- libspf2-1.2.5/src/spfd/spfd.c 2005-02-19 03:40:35.000000000 +0100 |
| ++++ libspf2-1.2.5-amd64/src/spfd/spfd.c 2007-03-08 21:17:09.000000000 +0100 |
| +@@ -640,7 +640,7 @@ |
| + memset(&addr, 0, sizeof(addr)); |
| + addr.sun_family = AF_UNIX; |
| + strcpy(addr.sun_path, spfd_config.path); |
| +- if (unlink(spfd_config.path < 0)) { |
| ++ if (unlink(spfd_config.path) < 0) { |
| + if (errno != ENOENT) { |
| + perror("unlink"); |
| + DIE("Failed to unlink socket"); |
| /debian/patches/30_spfd_check_unlink_failure.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/20_spf_dns_include_std_headers.dpatch |
| =================================================================== |
| --- debian/patches/20_spf_dns_include_std_headers.dpatch (nonexistent) |
| +++ debian/patches/20_spf_dns_include_std_headers.dpatch (revision 2) |
| @@ -0,0 +1,60 @@ |
| +#! /bin/sh /usr/share/dpatch/dpatch-run |
| +## 20_spf_dns_include_std_headers.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Include arpa/nameser.h and netdb.h from spf_dns.h instead of defining |
| +## DP: the constants needed unless certain HAVE_ macros are defined. |
| + |
| +@DPATCH@ |
| + |
| +diff -Nur libspf2-1.2.5.dfsg/src/include/spf_dns.h libspf2-1.2.5.dfsg.new/src/include/spf_dns.h |
| +--- libspf2-1.2.5.dfsg/src/include/spf_dns.h 2004-08-29 16:59:33.000000000 +0200 |
| ++++ libspf2-1.2.5.dfsg.new/src/include/spf_dns.h 2007-03-23 18:04:17.000000000 +0100 |
| +@@ -61,43 +61,12 @@ |
| + * |
| + */ |
| + |
| +- |
| +-/* |
| +- * For those who don't have <arpa/nameserv.h> |
| ++/* The following two header files might not exist on all platforms, |
| ++ * but at least they exist on Debian with libc6. |
| + */ |
| ++#include <arpa/nameser.h> |
| ++#include <netdb.h> |
| + |
| +-#if !defined( HAVE_NS_TYPE ) |
| +- |
| +-#define ns_t_invalid 0 |
| +-#define ns_t_a 1 |
| +-#define ns_t_ns 2 |
| +-#define ns_t_cname 5 |
| +-#define ns_t_ptr 12 |
| +-#define ns_t_mx 15 |
| +-#define ns_t_txt 16 |
| +-#define ns_t_aaaa 28 |
| +-/* #define ns_t_a6 38 */ |
| +-#define ns_t_any 255 /* Wildcard match. */ |
| +- |
| +-typedef int ns_type; |
| +-#endif |
| +- |
| +-#ifndef ns_t_invalid |
| +-#define ns_t_invalid 0 |
| +-#endif |
| +- |
| +- |
| +-/* |
| +- * For those who don't have <netdb.h> |
| +- */ |
| +- |
| +-#if !defined(HAVE_NETDB_H) && !defined(_WIN32) |
| +-#define NETDB_SUCCESS 0 |
| +-#define HOST_NOT_FOUND 1 /* NXDOMAIN (authoritative answer)*/ |
| +-#define TRY_AGAIN 2 /* SERVFAIL (no authoritative answer)*/ |
| +-#define NO_RECOVERY 3 /* invalid/unimplmeneted query */ |
| +-#define NO_DATA 4 /* host found, but no RR of req type*/ |
| +-#endif |
| + typedef int SPF_dns_stat_t; |
| + |
| + typedef struct SPF_dns_server_struct SPF_dns_server_t; |
| /debian/patches/20_spf_dns_include_std_headers.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/20_printf_types.dpatch |
| =================================================================== |
| --- debian/patches/20_printf_types.dpatch (nonexistent) |
| +++ debian/patches/20_printf_types.dpatch (revision 2) |
| @@ -0,0 +1,58 @@ |
| +#! /bin/sh /usr/share/dpatch/dpatch-run |
| +## 20_printf_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Change the format strings of various calls to printf-style functions to |
| +## DP: match the arguments. |
| + |
| +@DPATCH@ |
| + |
| +diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c |
| +--- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-23 22:37:26.000000000 +0100 |
| ++++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c 2007-03-23 23:18:41.000000000 +0100 |
| +@@ -469,8 +469,8 @@ |
| + if ( p + len > end ) /* Don't re-parse the CIDR mask */ |
| + len = end - p; |
| + if (spf_server->debug) |
| +- SPF_debugf("Adding string literal (%d): '%*.*s'", |
| +- len, len, len, p); |
| ++ SPF_debugf("Adding string literal (%zu): '%*.*s'", |
| ++ len, (int)len, (int)len, p); |
| + memcpy( dst, p, len ); |
| + ds_len += len; |
| + dst += len; |
| +diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c |
| +--- libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-23 22:37:26.000000000 +0100 |
| ++++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c 2007-03-23 23:13:55.000000000 +0100 |
| +@@ -309,7 +309,7 @@ |
| + p_end = *bufp + *buflenp; |
| + |
| + if (debug) |
| +- SPF_debugf("stringify: Buffer length is %d\n", *buflenp); |
| ++ SPF_debugf("stringify: Buffer length is %zu\n", *buflenp); |
| + |
| + |
| + /* |
| +diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_print.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c |
| +--- libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-23 22:37:26.000000000 +0100 |
| ++++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c 2007-03-23 23:12:30.000000000 +0100 |
| +@@ -54,7 +54,7 @@ |
| + return SPF_E_SUCCESS; |
| + } |
| + |
| +- SPF_infof( "SPF header: version: %d mech %d/%d mod %d/%d len=%d", |
| ++ SPF_infof( "SPF header: version: %hhu mech %hhu/%zu mod %hhu/%zu len=%zu", |
| + spf_record->version, |
| + spf_record->num_mech, spf_record->mech_len, |
| + spf_record->num_mod, spf_record->mod_len, |
| +@@ -81,7 +81,7 @@ |
| + void SPF_print_sizeof(void) |
| + { |
| + // SPF_infof( "sizeof(SPF_rec_header_t)=%u", sizeof(SPF_rec_header_t)); |
| +- SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
| +- SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
| +- SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
| ++ SPF_infof( "sizeof(SPF_mech_t)=%zu", sizeof(SPF_mech_t)); |
| ++ SPF_infof( "sizeof(SPF_data_t)=%zu", sizeof(SPF_data_t)); |
| ++ SPF_infof( "sizeof(SPF_mod_t)=%zu", sizeof(SPF_mod_t)); |
| + } |
| /debian/patches/20_printf_types.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/patches/00list |
| =================================================================== |
| --- debian/patches/00list (nonexistent) |
| +++ debian/patches/00list (revision 2) |
| @@ -0,0 +1,8 @@ |
| +01_line-endings |
| +02_wrong_lib_version_h |
| +20_64bit_types |
| +20_printf_types |
| +20_spf_dns_include_std_headers |
| +20_spf_server_unnecessary_include |
| +25_maxvals |
| +30_spfd_check_unlink_failure |
| Index: debian/patches/01_line-endings.dpatch |
| =================================================================== |
| --- debian/patches/01_line-endings.dpatch (nonexistent) |
| +++ debian/patches/01_line-endings.dpatch (revision 2) |
| @@ -0,0 +1,30 @@ |
| +#!/bin/sh |
| +## 01_line-endings.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
| +## |
| +## All lines beginning with `## DP:' are a description of the patch. |
| +## DP: Convert CRLF line endings to LF in certain Windows-related files |
| + |
| +FILES_WITH_CRLF="src/libspf2/spf_dns_windns.c |
| + src/libspf2/spf_win32.c |
| + src/libreplace/win32_config.h |
| + src/include/spf_dns_windns.h |
| + src/include/spf_win32.h" |
| + |
| +set -e |
| + |
| +dpatch_patch() { |
| + # Change line endings to LF in files with CRLF |
| + sed -ri -e 's/\r$//' $FILES_WITH_CRLF |
| +} |
| + |
| +dpatch_unpatch() { |
| + # Change line endings back to CRLF in files that had it in the tarball |
| + # Unfortunately there are exceptions ... have to watch out for changes |
| + # in future upstream versions (or simply make backups instead). |
| + sed -ri -e '/\r$|^#pragma comment/!s/$/\r/' $FILES_WITH_CRLF |
| + sed -ri -e '$s/\r$//' src/libspf2/spf_dns_windns.c |
| +} |
| + |
| +DPATCH_LIB_NO_DEFAULT=1 |
| + |
| +. /usr/share/dpatch/dpatch.lib.sh |
| /debian/patches/01_line-endings.dpatch |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/copyright |
| =================================================================== |
| --- debian/copyright (nonexistent) |
| +++ debian/copyright (revision 2) |
| @@ -0,0 +1,19 @@ |
| +This package was debianized by Eric Dorland <eric@debian.org> on |
| +Sun, 04 Jul 2004 19:00:36 -0400 |
| + |
| +The current maintainer is Magnus Holmgren <magnus@kibibyte.se>. |
| + |
| +It was downloaded from http://www.libspf2.org/ |
| + |
| +Upstream Author: Wayne Schlitt <wayne@schlitt.net> |
| + |
| +Copyright: |
| + |
| +This software is copyright (c) 2004 by Wayne Schlitt <wayne@schlitt.net> |
| + |
| +You are free to distribute this software under the terms of |
| +the GNU General Public License version 2 or the BSD license, at your choice. |
| + |
| +On Debian systems, the complete text of the GNU General Public |
| +License can be found in the file `/usr/share/common-licenses/GPL-2' and |
| +the BSD license can be found in the file `/usr/share/common-licenses/BSD'. |
| Index: debian/libspf2-dev.README.Debian |
| =================================================================== |
| --- debian/libspf2-dev.README.Debian (nonexistent) |
| +++ debian/libspf2-dev.README.Debian (revision 2) |
| @@ -0,0 +1,8 @@ |
| +libspf2 for Debian |
| +------------------ |
| + |
| +Information and more recent versions of libspf2 are available from |
| + |
| + http://www.libspf2.org/ |
| + |
| + -- Eric Dorland <eric@debian.org>, Sun Jul 4 19:02:07 2004 |
| Index: debian/rules |
| =================================================================== |
| --- debian/rules (nonexistent) |
| +++ debian/rules (revision 2) |
| @@ -0,0 +1,17 @@ |
| +#!/usr/bin/make -f |
| + |
| +SOURCE_PACKAGE = libspf2 |
| + |
| +include /usr/share/cdbs/1/class/autotools.mk |
| +include /usr/share/cdbs/1/rules/debhelper.mk |
| +include /usr/share/cdbs/1/rules/dpatch.mk |
| + |
| +DEB_DH_MAKESHLIBS_ARGS_libspf2-2 = -V 'libspf2-2 (>= 1.2.5)' |
| + |
| +binary-install/spfquery:: |
| +# Rename the `spfquery` tool for the alternatives system: |
| + mv debian/spfquery/usr/bin/spfquery debian/spfquery/usr/bin/spfquery.$(SOURCE_PACKAGE) |
| + mv debian/spfquery/usr/sbin/spfd debian/spfquery/usr/sbin/spfd.$(SOURCE_PACKAGE) |
| + |
| +get-orig-source: |
| + wget http://www.libspf2.org/spf/libspf2-1.2.5.tar.gz |
| /debian/rules |
|---|
| Property changes: |
| Added: svn:executable |
| ## -0,0 +1 ## |
| +* |
| \ No newline at end of property |
| Index: debian/README.Debian-source |
| =================================================================== |
| --- debian/README.Debian-source (nonexistent) |
| +++ debian/README.Debian-source (revision 2) |
| @@ -0,0 +1,16 @@ |
| +The upstream tarball has been repackaged because it contained non-free |
| +material in the form of an (obsolete) IETF Internet Draft |
| +(draft-mengwong-spf-00.txt in the docs subdirectory). As far as I can |
| +see It's non-free because it doesn't contain any copyright information |
| +at all, thereby defaulting to "all right reserved" in most |
| +jurisdictions. |
| + |
| +Current SPF specifications can be found at |
| +<http://www.openspf.org/Specifications>. |
| + |
| +To download the original tarball use `debian/rules get-orig-source' or |
| +go to <http://www.libspf2.org/download.html> (beware that running |
| +debian/rules outside the package directory can have unwanted side |
| +effects due to CDBS). |
| + |
| + -- Magnus Holmgren <magnus@kibibyte.se> Fri, 23 Mar 2007 16:44:20 +0100 |
| Index: debian |
| =================================================================== |
| --- debian (nonexistent) |
| +++ debian (revision 2) |
| /debian |
|---|
| Property changes: |
| Added: mergeWithUpstream |
| ## -0,0 +1 ## |
| +1 |
| \ No newline at end of property |