mail-filter/libdkim: Update Ebuild for bug 262919; thanks to pva

svn path=/sunrise/; revision=12367

4 files changed, 58 insertions, 67 deletions

diff --git a/mail-filter/libdkim/ChangeLog b/mail-filter/libdkim/ChangeLog
index f2482b586..aa8138dbc 100644
--- a/mail-filter/libdkim/ChangeLog
+++ b/mail-filter/libdkim/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for mail-filter/libdkim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2011; Andreis Vinogradovs <spamslepnoga@inbox.ru>
+  +libdkim-1.0.21.ebuild, files/libdkim-gentoo.patch:
+  Update Ebuild for bug 262919; thanks to pva
+
   19 Mar 2009; Brandon Turner (bltcoder) <bturner@bltweb.net>
   +libdkim-1.0.19.ebuild, +files/libdkim-extra-options.patch,
   +files/libdkim-gentoo.patch, +metadata.xml:
diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest
index f9e6212c4..e2c788841 100644
--- a/mail-filter/libdkim/Manifest
+++ b/mail-filter/libdkim/Manifest
@@ -1,6 +1,8 @@
 AUX libdkim-extra-options.patch 2614 RMD160 e17fc80897d3918b306b63761b2b59296f71c8ba SHA1 42fe6b1ff66fad250abdd5c9ae0d57a91eff00b0 SHA256 4cc9eed6273fab56b29aede8235ead9a9441e9b2d0309a08e412d79ff9bfdc9f
-AUX libdkim-gentoo.patch 3172 RMD160 cad99f5e7ba6b607376d1836c1d961c3d7b869bf SHA1 3777a5d105a755e3bde9723e79dcaeb2a435c91f SHA256 6e456e58b8c6ea30330508e72b5a1e01260839d05dc7008f397297e75407ac30
+AUX libdkim-gentoo.patch 1506 RMD160 9b9b5f9be34f175d94c9af6e2673a82ec0d36f90 SHA1 5c674a0963c4fd7a0ab00e36086ede4d152bdba2 SHA256 fbe04a72e74e4c91e7101a86cd53f8323f7f3ec23e09909439e3eb29216cfa39
 DIST libdkim-1.0.19.zip 55566 RMD160 33ef76ccfb7ef1cb682e2abdf1423beecf8bf180 SHA1 8704ea1b62d7dd61c4d8e96e03a7f05aa34fe675 SHA256 1935c88ea3d053ec2039114d900ac9eb5962adee10e0ec163777dfa5f3bd4eed
+DIST libdkim-1.0.21.zip 55049 RMD160 e69691003de9312533e696fee03463aac8606a0c SHA1 8a672e85ac5b3678bde454f19315ca7679bdef9a SHA256 dc685c8c47384c5d0379a1bcc0c96c8b7877a01e0c3bfedd6a54ae4ebdfa0323
 EBUILD libdkim-1.0.19.ebuild 779 RMD160 fe58d1a54fae315dd96772df5bf8e6172d38ebba SHA1 0198b332a906183adec8694269168a0a893a9ec6 SHA256 77cbf9a3e364260c8bc96380834512dcac3b15ca8a23ff690e61d5dd24dc3607
-MISC ChangeLog 348 RMD160 dc811132d46370a0b8093cdae5c0c8100583a5d4 SHA1 f1de24bda34bb6bae7909dddc519697b016eb037 SHA256 b1c15326e6a386469f27302307583018d82f7148fb4faa1c40b885ca92eaff68
+EBUILD libdkim-1.0.21.ebuild 817 RMD160 daf775ba949d7a44b89800d664151cbf5434588e SHA1 96682b6c9cfbba8a94d641f36c58138656eae1b1 SHA256 811b87d5554aa375962c4415de716d301fdc423f40c2fd5fa0963f581114e33d
+MISC ChangeLog 508 RMD160 655adc2d020afb5d4aecc246063f5eed8c6d8495 SHA1 bd778b11cfa71f40010012b87532f5c92f1e6149 SHA256 7557b7888b7fbf6da821eb67a5cd4d8c7670e7d7b59f249a7e58444585167401
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/mail-filter/libdkim/files/libdkim-gentoo.patch b/mail-filter/libdkim/files/libdkim-gentoo.patch
index a4437b6d0..f71cc623b 100644
--- a/mail-filter/libdkim/files/libdkim-gentoo.patch
+++ b/mail-filter/libdkim/files/libdkim-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naur libdkim.orig/src/Makefile libdkim/src/Makefile
---- libdkim.orig/src/Makefile	2009-03-17 17:06:24.000000000 -0500
-+++ libdkim/src/Makefile	2009-03-17 17:07:12.000000000 -0500
+diff --git a/src/Makefile b/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -1,15 +1,10 @@
  # libdkim makefile for UNIX

  #

@@ -9,7 +9,7 @@ diff -Naur libdkim.orig/src/Makefile libdkim/src/Makefile
 -CFLAGS  = -c

 -LFLAGS  = 

 +DESTDIR ?= /

-+

++LIBDIR ?= lib64

 +CFLAGS  += -fPIC

  LIBS    = -lcrypto -lresolv

 -#else

@@ -20,7 +20,7 @@ diff -Naur libdkim.orig/src/Makefile libdkim/src/Makefile
  

  INCL	=  -I /usr/include/openssl/

  

-@@ -19,23 +14,34 @@
+@@ -19,23 +14,35 @@
  

  HDRS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h

  

@@ -54,67 +54,12 @@ diff -Naur libdkim.orig/src/Makefile libdkim/src/Makefile
  clean:

 -	rm  *.o libdkim.lib libdkimtest

 +	rm -f *.o libdkim.{a,so,so.1} libdkimtest

-+

+ 

 +install: all

-+	install -D -m 0755 libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so.1

-+	ln -s libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so

++	install -D -m 0755 libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so.1

++	ln -s libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so

++	ln -s libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so.1.1

 +	install -D -m 0644 dkim.h $(DESTDIR)/usr/include/dkim.h

 +	install -D -m 0755 libdkimtest $(DESTDIR)/usr/bin/libdkimtest

  

- 

-diff -Naur libdkim.orig/src/dkim.h libdkim/src/dkim.h
---- libdkim.orig/src/dkim.h	2009-03-17 17:06:24.000000000 -0500
-+++ libdkim/src/dkim.h	2009-03-17 17:06:53.000000000 -0500
-@@ -22,7 +22,6 @@
- #define DKIM_CALL	WINAPI

- #else

- #define DKIM_CALL

--#define MAKELONG(a,b) ((long)(((unsigned)(a) & 0xffff) | (((unsigned)(b) & 0xffff) << 16)))

- #endif

- 

- 

-@@ -162,6 +161,32 @@
- 

- char *DKIM_CALL DKIMGetErrorString( int ErrorCode );

- 

-+#ifndef _WIN32

-+/*

-+ * macros.h:  Useful macros

-+ *

-+ * Author:

-+ *	Dick Porter (dick@ximian.com)

-+ *

-+ * (C) 2002 Ximian, Inc.

-+ */

-+#ifndef _WAPI_MACROS_H_

-+#define _WAPI_MACROS_H_

-+

-+#include <sys/types.h>

 +

-+#define MAKEWORD(low, high) ((__uint16_t)(((__uint8_t)(low)) | \

-+				       ((__uint16_t)((__uint8_t)(high))) << 8))

-+#define MAKELONG(low, high) ((__uint32_t)(((__uint16_t)(low)) | \

-+				       ((__uint32_t)((__uint16_t)(high))) << 16))

-+#define LOWORD(i32) ((__uint16_t)((i32) & 0xFFFF))

-+#define HIWORD(i32) ((__uint16_t)(((__uint32_t)(i32) >> 16) & 0xFFFF))

-+#define LOBYTE(i16) ((__uint8_t)((i16) & 0xFF))

-+#define HIBYTE(i16) ((__uint8_t)(((__uint16_t)(i16) >> 8) & 0xFF))

-+

-+#endif /* _WAPI_MACROS_H_ */

-+#endif

-+

- #ifdef __cplusplus

- }

- #endif

-diff -Naur libdkim.orig/src/dkimsign.cpp libdkim/src/dkimsign.cpp
---- libdkim.orig/src/dkimsign.cpp	2009-03-17 17:06:24.000000000 -0500
-+++ libdkim/src/dkimsign.cpp	2009-03-17 17:06:53.000000000 -0500
-@@ -25,8 +25,6 @@
- #else

- #define _strnicmp strncasecmp 

- #define _stricmp strcasecmp 

--#define LOWORD(l) ((unsigned)(l) & 0xffff)

--#define HIWORD(l) ((unsigned)(l) >> 16)

- #endif

- 

- #include <string.h>

diff --git a/mail-filter/libdkim/libdkim-1.0.21.ebuild b/mail-filter/libdkim/libdkim-1.0.21.ebuild
new file mode 100644
index 000000000..830a4b1ec
--- /dev/null
+++ b/mail-filter/libdkim/libdkim-1.0.21.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A library to verify and create signatures of e-mail headers."
+HOMEPAGE="http://libdkim.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	app-arch/unzip"
+RDEPEND="!mail-filter/libdkim-exim
+	dev-libs/openssl"
+
+S=${WORKDIR}/${PN}/src
+
+src_prepare() {
+	ecvs_clean
+	# upstream claims to be portable, but isn't very
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-extra-options.patch"
+}
+
+src_compile() {
+	tc-export CXX
+	emake LIBDIR=$(get_libdir)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc ../README
+}