X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=blobdiff_plain;f=debian%2Fpatches%2Ffix_header_char_cast;fp=debian%2Fpatches%2Ffix_header_char_cast;h=0000000000000000000000000000000000000000;hp=b43e9d3a0e4121a75164d324597bf1861871675e;hb=ae3144f104c73cb7ba16ffb783902753ce70821a;hpb=1249da7b667bcb97affb345fa9a093a5bb747250

diff --git a/debian/patches/fix_header_char_cast b/debian/patches/fix_header_char_cast
deleted file mode 100644
index b43e9d3..0000000
--- a/debian/patches/fix_header_char_cast
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix a const cast in the header
-Author: Don Armstrong <don@donarmstrong.com>
-Forwarded: no
-Index: spamass-milter/spamass-milter.cpp
-===================================================================
---- spamass-milter.orig/spamass-milter.cpp	2012-06-21 13:02:08.000000000 -0700
-+++ spamass-milter/spamass-milter.cpp	2012-06-21 13:02:15.000000000 -0700
-@@ -363,7 +363,7 @@
- // }}}
- 
- /* Update a header if SA changes it, or add it if it is new. */
--void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, char *header )
-+void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, const char *header )
- {
- 	string::size_type eoh1 = assassin->d().find("\n\n");
- 	string::size_type eoh2 = assassin->d().find("\n\r\n");
-@@ -386,15 +386,16 @@
- 		{
- 			/* change if old one was present, append if non-null */
- 			char* cstr = const_cast<char*>(newstring.c_str());
-+			char* hstr = const_cast<char*>(header);
- 			if (oldsize > 0)
- 			{
- 				debug(D_UORI, "u_or_i: changing");
--				smfi_chgheader(ctx, header, 1, newstring.size() > 0 ? 
-+				smfi_chgheader(ctx, hstr, 1, newstring.size() > 0 ? 
- 					cstr : NULL );
- 			} else if (newstring.size() > 0)
- 			{
- 				debug(D_UORI, "u_or_i: inserting");
--				smfi_addheader(ctx, header, cstr);
-+				smfi_addheader(ctx, hstr, cstr);
- 			}
- 		} else
- 		{