Subversion Repositories libspf2

Compare Revisions

Ignore whitespace Rev 5 → Rev 4

/trunk/debian/spfquery.postinst
8,8 → 8,8
configure )
prev_version=$2
update-alternatives --install /usr/bin/spfquery spfquery /usr/bin/spfquery.$source_package 25
update-alternatives --install /usr/sbin/spfd spfd /usr/sbin/spfd.$source_package 25
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
 
/trunk/debian/watch
1,3 → 1,3
version=3
 
opts=dversionmangle=s/\.dfsg$// http://www.libspf2.org/download.html spf/libspf2-(.+)\.tar\.gz
http://www.libspf2.org/download.html spf/libspf2-(.+)\.tar\.gz
/trunk/debian/changelog
1,15 → 1,3
libspf2 (1.2.5.dfsg-2) unstable; urgency=low
 
* 21_spfquery_infininte_loop.dpatch: Fix infinite loop when giving
unimplemented options to spfquery.
* 20_printf_types.dpatch: Revert to using standard conversion specifiers
without z modifiers.
* debian/watch: mangle away .dfsg from package version.
* Lower spfquery and spfd alternatives priorities to 25.
* Skip applying 01_line-endings.dpatch; it's meaningless.
 
-- Magnus Holmgren <magnus@kibibyte.se> Wed, 06 Jun 2007 19:31:01 +0200
 
libspf2 (1.2.5.dfsg-1) unstable; urgency=low
 
* New maintainer (Closes: #372629).
/trunk/debian/patches/21_spfquery_infininte_loop.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/20_printf_types.dpatch
===================================================================
--- debian/patches/20_printf_types.dpatch (revision 5)
+++ debian/patches/20_printf_types.dpatch (revision 4)
@@ -6,51 +6,45 @@
## DP: match the arguments.
@DPATCH@
-diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c
---- libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c 2007-03-27 14:28:00.931960929 +0200
-+++ libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-27 14:30:04.000000000 +0200
-@@ -470,7 +470,7 @@
+
+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'",
+- SPF_debugf("Adding string literal (%d): '%*.*s'",
- len, len, len, p);
-+ (int)len, (int)len, (int)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 -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c
---- libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c 2007-03-27 14:27:58.171600935 +0200
-+++ libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-27 14:30:51.000000000 +0200
+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 %u\n", (unsigned int)*buflenp);
++ SPF_debugf("stringify: Buffer length is %zu\n", *buflenp);
/*
-diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c libspf2-1.2.5.dfsg/src/libspf2/spf_print.c
---- libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c 2007-03-27 14:27:58.231608763 +0200
-+++ libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-27 14:47:39.000000000 +0200
-@@ -54,12 +54,12 @@
+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: %d mech %d/%u mod %d/%u len=%u",
++ 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,
-- sizeof(SPF_record_t) + spf_record->mech_len
-- + spf_record->mod_len);
-+ (int)spf_record->num_mech, (unsigned int)spf_record->mech_len,
-+ (int)spf_record->num_mod, (unsigned int)spf_record->mod_len,
-+ (unsigned int)(sizeof(SPF_record_t) + spf_record->mech_len
-+ + spf_record->mod_len));
-
- err = SPF_record_stringify(spf_record, &prt_buf, &prt_len);
- if ( err == SPF_E_RESULT_UNKNOWN )
+ 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)
{
@@ -58,7 +52,7 @@
- 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)=%u", (unsigned int)sizeof(SPF_mech_t));
-+ SPF_infof( "sizeof(SPF_data_t)=%u", (unsigned int)sizeof(SPF_data_t));
-+ SPF_infof( "sizeof(SPF_mod_t)=%u", (unsigned int)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));
}
/trunk/debian/patches/00list
1,9 → 1,8
#01_line-endings
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
21_spfquery_infininte_loop
25_maxvals
30_spfd_check_unlink_failure
/trunk/debian/patches/01_line-endings.dpatch
13,16 → 13,16
set -e
 
dpatch_patch() {
if [ ! -f debian/patched/patched-line-endings.tar.gz ]; then
tar -czf debian/patched/patched-line-endings.tar.gz $FILES_WITH_CRLF
# Change line endings to LF in files with CRLF
sed -ri -e 's/\r$//' $FILES_WITH_CRLF
fi
# 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
tar -xzf debian/patched/patched-line-endings.tar.gz
# 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