/branches/exp-tk/debian/yahoo-patent-license-1.2.txt |
---|
File deleted |
/branches/exp-tk/debian/docs |
---|
File deleted |
/branches/exp-tk/debian/install |
---|
File deleted |
/branches/exp-tk/debian/Makefile.in |
---|
12,9 → 12,6 |
OBJEXT = @OBJEXT@ |
LIBS = @LIBS@ @libcrypto_LIBS@ |
CC = @CC@ |
CXX = @CXX@ |
CFLAGS = @CFLAGS@ |
CXXFLAGS = @CXXFLAGS@ |
CPPFLAGS = @CPPFLAGS@ |
32,10 → 29,11 |
libdkimtest_OBJS = libdkimtest.$(OBJEXT) |
SHLIBFORLINK = libdkim.so |
SHLIBVERSCRIPT = debian/libdkim.ver |
SHLIBSONAME = $(SHLIBFORLINK).$(SHLIBMAJOR) |
SHLIBTARGET = $(SHLIBFORLINK) |
SHLIBLINK = $(CXX) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) |
SHLIBMAJOR = 1 |
SHLIBLINK = $(CXX) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -Wl,-version-script=$(SHLIBVERSCRIPT) |
SHLIBMAJOR = 0 |
SHLIBMINOR = 1 |
SHLIBFILE = $(SHLIBSONAME).$(SHLIBMINOR) |
SHLIBCFLAGS = -fPIC |
50,7 → 48,7 |
-rm -f $@ |
$(AR) $(ARFLAGS) $@ $(libdkim_OBJS) |
$(SHLIBFORLINK): $(libdkim_PURE_OBJS) |
$(SHLIBFORLINK): $(libdkim_PURE_OBJS) $(SHLIBVERSCRIPT) |
$(SHLIBLINK) -o $@ $(LIBS) $(libdkim_PURE_OBJS) |
-mkdir .lib 2>/dev/null |
[ -z "$(SHLIBSONAME)" ] || (cd .lib \ |
/branches/exp-tk/debian/patches/00list |
---|
1,0 → 0,0 |
20_winmacros |
30_extra_fields |
/branches/exp-tk/debian/patches/30_extra_fields.dpatch |
---|
9,10 → 9,10 |
diff -w -xdebian -ur libdkim-1.0.14/src/dkim.h libdkim-1.0.15-tk/src/dkim.h |
--- libdkim-1.0.14/src/dkim.h 2007-05-03 17:53:09.000000000 +0200 |
+++ libdkim-1.0.15-tk/src/dkim.h 2007-09-28 13:08:04.000000000 +0200 |
@@ -138,6 +138,8 @@ |
@@ -137,6 +137,8 @@ |
{ |
char *szSignature; |
char *DNS; |
char *szCanonicalizedData; |
+ char *Domain; |
+ char *IdentityDomain; |
int nResult; |
21,10 → 21,10 |
diff -w -xdebian -ur libdkim-1.0.14/src/dkimverify.cpp libdkim-1.0.15-tk/src/dkimverify.cpp |
--- libdkim-1.0.14/src/dkimverify.cpp 2007-04-24 11:01:58.000000000 +0200 |
+++ libdkim-1.0.15-tk/src/dkimverify.cpp 2007-09-28 08:05:01.000000000 +0200 |
@@ -1508,6 +1508,10 @@ |
@@ -1428,6 +1386,10 @@ |
DKIMVerifyDetails d; |
d.szSignature = (char*)i->Header.c_str(); |
d.nResult = i->Status; |
d.szCanonicalizedData = (char*)i->CanonicalizedData.c_str(); |
+ |
+ d.Domain = (char*)i->Domain.c_str(); |
+ d.IdentityDomain = i->IdentityDomain.empty()?(char*)i->IdentityDomain.c_str():(char*)i->Domain.c_str(); |
/branches/exp-tk/debian/patches/20_winmacros.dpatch |
---|
0,0 → 1,22 |
#! /bin/sh /usr/share/dpatch/dpatch-run |
## 20_winmacros.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
## |
## DP: Define some macros that are used despite being Windows-specific |
@DPATCH@ |
--- libdkim-1.0.14.orig/src/dkim.h |
+++ libdkim-1.0.14/src/dkim.h |
@@ -18,7 +18,12 @@ |
#ifdef WIN32 |
#define DKIM_CALL WINAPI |
#else |
+#include <inttypes.h> |
#define DKIM_CALL |
+#define MAKELONG(low,high) \ |
+ ((uint32_t)(((uint16_t)(low))|((uint32_t)(((uint16_t)(high))<<16)))) |
+#define HIWORD(l) ((uint16_t) (((uint32_t) (l) >> 16) & 0xFFFF)) |
+#define LOWORD(l) ((uint16_t) (l)) |
#endif |
Property changes: |
Added: svn:executable |
## -0,0 +1 ## |
+* |
\ No newline at end of property |
Index: exp-tk/debian/changelog |
=================================================================== |
--- exp-tk/debian/changelog (revision 28) |
+++ exp-tk/debian/changelog (revision 22) |
@@ -1,4 +1,4 @@ |
-libdkim (1:1.0.19-1exp1+eximdkim) experimental; urgency=low |
+libdkim (1.0.14-1exp1+eximdkim) experimental; urgency=low |
* Experimental version made specifically to work with potential DKIM |
support in Exim. |
@@ -5,33 +5,8 @@ |
* 30_extra_fields.dpatch (new): Add Domain and IdentityDomain fields to |
struct DKIMVerifyDetails (this is Tom Kistner's plan). |
- -- Magnus Holmgren <holmgren@debian.org> Sat, 17 May 2008 23:53:39 +0200 |
+ -- Magnus Holmgren <magnus@kibibyte.se> Sun, 30 Sep 2007 12:36:43 +0200 |
-libdkim (1:1.0.19-1) unstable; urgency=low |
- |
- * New upstream release. |
- - Drop remaining patches; issues fixed upstream. |
- * New maintainer email address. |
- * Include Yahoo! patent license as plain text. |
- |
- -- Magnus Holmgren <holmgren@debian.org> Sat, 17 May 2008 23:13:03 +0200 |
- |
-libdkim (1:1.0.17-1) unstable; urgency=low |
- |
- * New upstream release. |
- * Drop 20_winmacros.dpatch; fixed upstream. |
- * Bump soname to libdkim1 because of incompatible struct changes. |
- * 20_strict_includes.dpatch (new): Add "#include <string.h>" as necessary |
- to fix FTBFS with GCC 4.3 (Closes: #455145). |
- * Add an epoch to reclaim binary packages "stolen" by dkim-milter. |
- * Dump the linker version script - changing the soname when necessary is |
- going to be hard enough. |
- * Move homepage URL from description to control field. |
- * Increase Standards-Version to 3.7.3 without changes. |
- * Don't ignore distclean errors. |
- |
- -- Magnus Holmgren <magnus@kibibyte.se> Fri, 15 Feb 2008 23:04:42 +0100 |
- |
libdkim (1.0.14-1) unstable; urgency=low |
* New upstream release. |
/branches/exp-tk/debian/rules |
---|
40,7 → 40,7 |
dh_testroot |
rm -f build-stamp configure-stamp |
[ ! -f Makefile ] || $(MAKE) distclean |
-$(MAKE) distclean |
rm -f src/*.in debian/configure |
rm -rf debian/autom4te.cache |
64,19 → 64,19 |
binary-arch: build install |
dh_testdir |
dh_testroot |
dh_installchangelogs -plibdkim0 -k README |
dh_installdocs -plibdkim0 |
dh_installexamples |
dh_install --sourcedir=debian/tmp |
dh_link |
dh_installchangelogs -k README |
dh_installdocs |
dh_installexamples |
# dh_installinfo |
# dh_installman |
dh_link |
dh_strip |
dh_compress |
dh_fixperms |
# The shlibs dependency is intentionally made tight, because we have an |
# experimental extension that may not be there in the next official release. |
dh_makeshlibs -V "libdkim1 (= `dpkg-parsechangelog | sed -ne 's/Version: *//p'`)" |
dh_makeshlibs -V "libdkim0 (= `dpkg-parsechangelog | sed -ne 's/Version: *//p'`)" |
dh_installdeb |
dh_shlibdeps |
dh_gencontrol |
/branches/exp-tk/debian/control |
---|
1,12 → 1,11 |
Source: libdkim |
Priority: optional |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Maintainer: Magnus Holmgren <magnus@kibibyte.se> |
Build-Depends: debhelper (>= 5), autoconf, libssl-dev, pkg-config, dpatch |
Standards-Version: 3.7.3 |
Standards-Version: 3.7.2 |
Section: libs |
Homepage: http://libdkim.sourceforge.net |
Package: libdkim1 |
Package: libdkim0 |
Section: libs |
Architecture: any |
Depends: ${shlibs:Depends}, ${misc:Depends} |
21,11 → 20,13 |
incorporating DKIM into an existing MTA or other application. It |
provides full support for signing, verifying, and SSP. See the |
changelogs for information on compliance with specifications. |
. |
Homepage: http://libdkim.sourceforge.net |
Package: libdkim-dev |
Section: libdevel |
Architecture: any |
Depends: libdkim1 (= ${binary:Version}), libssl-dev |
Depends: libdkim0 (= ${binary:Version}), libssl-dev |
Description: cryptographically identify the sender of email |
DomainKeys Identified Mail (DKIM) defines a domain-level |
authentication framework for email using public-key cryptography and |
38,5 → 39,7 |
provides full support for signing, verifying, and SSP. See the |
changelogs for information on compliance with specifications. |
. |
Homepage: http://libdkim.sourceforge.net |
. |
This package contains the development files needed to compile and link |
programs with libdkim. |
/branches/exp-tk/debian/libdkim0.install |
---|
0,0 → 1,0 |
usr/lib/lib*.so.* |
/branches/exp-tk/debian/configure.ac |
---|
2,7 → 2,7 |
# Process this file with autoconf to produce a configure script. |
AC_PREREQ(2.61) |
AC_INIT(libdkim, 1.0.19) |
AC_INIT(libdkim, 1.0.13) |
AC_CONFIG_SRCDIR([dkim.cpp]) |
##AC_CONFIG_HEADER([config.h]) |
/branches/exp-tk/debian/libdkim-dev.links |
---|
1,0 → 0,0 |
usr/share/doc/libdkim1 usr/share/doc/libdkim-dev |
usr/share/doc/libdkim0 usr/share/doc/libdkim-dev |
/branches/exp-tk |
---|
Property changes: |
Deleted: svnmerge-integrated |
## -1 +0,0 ## |
-/trunk:1-27 |
\ No newline at end of property |