+++ /dev/null
-DIST libdkim-1.0.21.zip 55049 BLAKE2B f7481bc41a2f43357a67aa9f6e251634f1c2850fd1dfe3c4a4e0ea64341a3625ff0e393e039d679784c8c1ce349ee7063511f988ff6cf6d5b7acfc7c9633f9da SHA512 3996c64398151dc9c07d357e8f3ac9b94e3c8d06ce5d83ebbe546416f361349d869b0b73216f28d0b732319731f31e61afd9eab0f540471760b944a90130a094
+++ /dev/null
-# libdkim makefile for UNIX
-#
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-
-OBJEXT = @OBJEXT@
-LIBS = @LIBS@ @libcrypto_LIBS@
-
-CC = @CC@
-CXX = @CXX@
-
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCL =
-LDFLAGS = @LDFLAGS@
-
-libdkim_SOURCES = dkim.cpp dns.cpp dkimbase.cpp dkimsign.cpp dkimverify.cpp
-HEADERS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h
-
-libdkim_OBJS = $(libdkim_SOURCES:.cpp=.$(OBJEXT))
-libdkim_PURE_OBJS = $(libdkim_SOURCES:.cpp=.p$(OBJEXT))
-
-libdkimtest_SOURCES = libdkimtest.cpp
-libdkimtest_OBJS = libdkimtest.$(OBJEXT)
-
-SHLIBFORLINK = libdkim.so
-SHLIBSONAME = $(SHLIBFORLINK).$(SHLIBMAJOR)
-SHLIBTARGET = $(SHLIBFORLINK)
-SHLIBLINK = $(CXX) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -Wl,-version-script=libdkim.ver
-SHLIBMAJOR = 1d
-SHLIBMINOR = 1
-SHLIBFILE = $(SHLIBSONAME).$(SHLIBMINOR)
-SHLIBCFLAGS = -fPIC
-
-ARFLAGS = crs
-
-TARGETS = libdkim.a $(SHLIBTARGET) libdkimtest
-
-all: $(TARGETS)
-
-libdkim.a: $(libdkim_OBJS)
- -rm -f $@
- $(AR) $(ARFLAGS) $@ $(libdkim_OBJS)
-
-$(SHLIBFORLINK): $(libdkim_PURE_OBJS)
- $(SHLIBLINK) -o $@ $(libdkim_PURE_OBJS) $(LIBS)
- -mkdir .lib 2>/dev/null
- [ -z "$(SHLIBSONAME)" ] || (cd .lib \
- && ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME))
-
-libdkimtest: $(libdkimtest_OBJS) $(SHLIBFORLINK)
- $(CXX) ${LDFLAGS} -L. -o $@ libdkimtest.o -ldkim $(LIBS)
-
-libdkimtest.o: $(libdkimtest_SOURCES) $(HDRS)
- $(CXX) $(CXXFLAGS) -o $@ -c $<
-
-%.$(OBJEXT): %.cpp $(HDRS)
- $(CXX) $(CXXFLAGS) -o $@ -c $<
-
-%.p$(OBJEXT): %.cpp $(HDRS)
- $(CXX) $(SHLIBCFLAGS) $(CXXFLAGS) -o $@ -c $<
-
-clean:
- -rm -f *.$(OBJEXT) *.p$(OBJEXT) $(TARGETS)
- -rm -rf .lib
-
-distclean: clean
- -rm -f config.status config.log Makefile libdkim.pc
-
-install: all
- install -m 755 -d $(DESTDIR)$(libdir)
- install -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
- install -m 755 -d $(DESTDIR)$(includedir)
- install -m 644 libdkim.a $(DESTDIR)$(libdir)
- install -m 755 $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
- [ -z "$(SHLIBSONAME)" ] \
- || (cd $(DESTDIR)$(libdir) \
- && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
- && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
- install -m 644 $(srcdir)/dkim.h $(DESTDIR)$(includedir)
- install -m 644 libdkim.pc $(DESTDIR)$(libdir)/pkgconfig
- install -m 755 -d $(DESTDIR)$(bindir)
- install -m 755 libdkimtest $(DESTDIR)$(bindir)
-
-.PHONY: all install clean distclean
+++ /dev/null
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
- [$4])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
+++ /dev/null
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT(libdkim, 1.0.21)
-LT_INIT
-AC_CONFIG_SRCDIR([dkim.cpp])
-##AC_CONFIG_HEADER([config.h])
-
-# Checks for programs.
-AC_PROG_CXX
-PKG_PROG_PKG_CONFIG
-
-# Checks for libraries.
-#AC_CHECK_LIB([crypto], [PEM_read_PrivateKey])
-PKG_CHECK_MODULES([libcrypto], [libcrypto])
-AC_SEARCH_LIBS([res_query], [resolv c],,
- [AC_SEARCH_LIBS(__res_query,resolv bind)])
-
-# Checks for header files.
-AC_HEADER_RESOLV
-AC_HEADER_STDC
-AC_CHECK_HEADERS([netdb.h netinet/in.h inttypes.h stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_HEADER_TIME
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-
-# Checks for library functions.
-AC_FUNC_MEMCMP
-AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([select socket strchr])
-
-AC_CONFIG_FILES([Makefile libdkim.pc])
-AC_OUTPUT
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: @PACKAGE_NAME@
-Description: DomainKeys Identified Mail library from Alt-N Inc.
-Version: @PACKAGE_VERSION@
-Requires.private: libcrypto
-Libs: -L${libdir} -ldkim
-Libs.private: @LIBS@
-Cflags: -I${includedir}
+++ /dev/null
-{
- global: DKIM*;
- local: *;
-};
+++ /dev/null
---- src/dkimverify.cpp
-+++ src/dkimverify.cpp
-@@ -211,14 +211,14 @@
- unsigned DecodeBase64(char *ptr)\r
- {\r
- static const unsigned char base64_table[256] = {\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,\r
-- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,\r
-- -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,62,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,63,52,53,54,55,56,57,58,59,60,61,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,\r
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1};\r
- \r
- unsigned char *s = (unsigned char *)ptr;\r
- unsigned char *d = (unsigned char *)ptr;\r
+++ /dev/null
-diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
---- src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500
-+++ src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500
-@@ -55,8 +55,23 @@
- return 0;\r
- }\r
- \r
-+void usage()\r
-+{\r
- \r
--\r
-+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");\r
-+ printf( "-b<standard> 1=allman, 2=ietf or 3=both\n");\r
-+ printf( "-c<canonicalization> r=relaxed [DEFAULT], s=simple, t=relaxed/simple, u=simple/relaxed\n");\r
-+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");\r
-+ printf( "-l include body length tag\n");\r
-+ printf( "-h this help\n");\r
-+ printf( "-i<identity> the identity, if not provided it will not be included\n");\r
-+ printf( "-s sign the message\n");\r
-+ printf( "-t include a timestamp tag\n");\r
-+ printf( "-v verify the message\n");\r
-+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t\t if set to - then it will not be included\n");\r
-+ printf( "-z<hash> 1=sha1, 2=sha256, 3=both\n");\r
-+ printf( "-y<selector> selector tag DEFAULT=default\n");\r
-+}\r
- int main(int argc, char* argv[])\r
- {\r
- int n;\r
-@@ -77,7 +92,7 @@
- time(&t);\r
- \r
- opts.nCanon = DKIM_SIGN_RELAXED;\r
-- opts.nIncludeBodyLengthTag = 1;\r
-+ opts.nIncludeBodyLengthTag = 0;\r
- opts.nIncludeQueryMethod = 0;\r
- opts.nIncludeTimeStamp = 0;\r
- opts.expireTime = t + 604800; // expires in 1 week\r
-@@ -92,6 +107,11 @@
- int nArgParseState = 0;\r
- bool bSign = true;\r
- \r
-+ if(argc<2){\r
-+ usage();\r
-+ exit(1);\r
-+ }\r
-+\r
- for( n = 1; n < argc; n++ )\r
- {\r
- if( argv[n][0] == '-' && strlen(argv[n]) > 1 )\r
-@@ -121,14 +141,16 @@
- }\r
- break;\r
- \r
--\r
-+ case 'd': \r
-+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);\r
-+ break;\r
- case 'l': // body length tag\r
- opts.nIncludeBodyLengthTag = 1;\r
- break;\r
- \r
- \r
- case 'h':\r
-- printf( "usage: \n" );\r
-+ usage(); \r
- return 0;\r
- \r
- case 'i': // identity \r
-@@ -138,7 +160,7 @@
- }\r
- else\r
- {\r
-- strcpy( opts.szIdentity, argv[n] + 2 );\r
-+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );\r
- }\r
- break;\r
- \r
-@@ -169,6 +191,9 @@
- }\r
- break;\r
- \r
-+ case 'y':\r
-+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);\r
-+ break;\r
- \r
- case 'z': // sign w/ sha1, sha256 or both \r
- opts.nHash = atoi( &argv[n][2] );\r
+++ /dev/null
-diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
---- libdkim.orig/src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500
-+++ libdkim/src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500
-@@ -55,8 +55,23 @@
- return 0;\r
- }\r
- \r
-+void usage()\r
-+{\r
- \r
--\r
-+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");\r
-+ printf( "-b<standard> allman , ietf or both\n");\r
-+ printf( "-c<canonicalization> r for relaxed [DEFAULT], s - simple, t relaxed/simple, u - simple/relaxed\n");\r
-+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");\r
-+ printf( "-l include body length tag\n");\r
-+ printf( "-h this help\n");\r
-+ printf( "-i<identity> the identity, if not provided it will not be included\n");\r
-+ printf( "-s sign the message\n");\r
-+ printf( "-t include a timestamp tag\n");\r
-+ printf( "-v verify the message\n");\r
-+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t if set to - then it will not be included");\r
-+ printf( "-z<hash> 1 for sha1, 2 for sha256, 3 for both\n");\r
-+ printf( "-y<selector> the selector tag DEFAULT=MDaemon\n");\r
-+}\r
- int main(int argc, char* argv[])\r
- {\r
- int n;\r
-@@ -77,7 +92,7 @@
- time(&t);\r
- \r
- opts.nCanon = DKIM_SIGN_RELAXED;\r
-- opts.nIncludeBodyLengthTag = 1;\r
-+ opts.nIncludeBodyLengthTag = 0;\r
- opts.nIncludeQueryMethod = 0;\r
- opts.nIncludeTimeStamp = 0;\r
- opts.expireTime = t + 604800; // expires in 1 week\r
-@@ -92,6 +107,11 @@
- int nArgParseState = 0;\r
- bool bSign = true;\r
- \r
-+ if(argc<2){\r
-+ usage();\r
-+ exit(1);\r
-+ }\r
-+\r
- for( n = 1; n < argc; n++ )\r
- {\r
- if( argv[n][0] == '-' && strlen(argv[n]) > 1 )\r
-@@ -121,14 +141,16 @@
- }\r
- break;\r
- \r
--\r
-+ case 'd': \r
-+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);\r
-+ break;\r
- case 'l': // body length tag\r
- opts.nIncludeBodyLengthTag = 1;\r
- break;\r
- \r
- \r
- case 'h':\r
-- printf( "usage: \n" );\r
-+ usage(); \r
- return 0;\r
- \r
- case 'i': // identity \r
-@@ -138,7 +160,7 @@
- }\r
- else\r
- {\r
-- strcpy( opts.szIdentity, argv[n] + 2 );\r
-+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );\r
- }\r
- break;\r
- \r
-@@ -169,6 +191,9 @@
- }\r
- break;\r
- \r
-+ case 'y':\r
-+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);\r
-+ break;\r
- \r
- case 'z': // sign w/ sha1, sha256 or both \r
- opts.nHash = atoi( &argv[n][2] );\r
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_warnings.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: Get rid of warnings through the use of const and more correct types
-
-@DPATCH@
-
-diff -ru src/dkim.cpp src/dkim.cpp
---- src/dkim.cpp 2008-05-12 20:07:32.000000000 +1000
-+++ src/dkim.cpp 2009-04-15 19:38:08.000000000 +1000
-@@ -172,7 +172,7 @@
- }\r
- \r
- \r
--int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, char* szBuffer, int nBufLength )\r
-+int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, const char* const szBuffer, int nBufLength )\r
- {\r
- CDKIMVerify* pVerify = (CDKIMVerify*)ValidateContext( pVerifyContext, false );\r
- \r
-@@ -226,13 +226,13 @@
- }\r
- \r
- \r
--char* DKIM_CALL DKIMVersion()\r
-+const char* DKIM_CALL DKIMVersion()\r
- {\r
- return VERSION_STRING;\r
- }\r
- \r
- \r
--static char* DKIMErrorStrings[-1-DKIM_MAX_ERROR] = {\r
-+static const char* DKIMErrorStrings[-1-DKIM_MAX_ERROR] = {\r
- "DKIM_FAIL",\r
- "DKIM_BAD_SYNTAX",\r
- "DKIM_SIGNATURE_BAD",\r
-@@ -254,7 +254,7 @@
- };\r
- \r
- \r
--char* DKIM_CALL DKIMGetErrorString( int ErrorCode )\r
-+const char* DKIM_CALL DKIMGetErrorString( int ErrorCode )\r
- {\r
- if (ErrorCode >= 0 || ErrorCode <= DKIM_MAX_ERROR)\r
- return "Unknown";\r
-diff -ru src/dkim.h src/dkim.h
---- src/dkim.h 2009-04-15 19:37:48.000000000 +1000
-+++ src/dkim.h 2009-04-15 19:38:08.000000000 +1000
-@@ -155,14 +155,14 @@
- void DKIM_CALL DKIMSignFree( DKIMContext* pSignContext );\r
- \r
- int DKIM_CALL DKIMVerifyInit( DKIMContext* pVerifyContext, DKIMVerifyOptions* pOptions );\r
--int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, char* szBuffer, int nBufLength );\r
-+int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, const char* szBuffer, int nBufLength );\r
- int DKIM_CALL DKIMVerifyResults( DKIMContext* pVerifyContext );\r
- int DKIM_CALL DKIMVerifyGetDetails( DKIMContext* pVerifyContext, int* nSigCount, DKIMVerifyDetails** pDetails, char* szPractices );\r
- void DKIM_CALL DKIMVerifyFree( DKIMContext* pVerifyContext );\r
- \r
--char *DKIM_CALL DKIMVersion();\r
-+const char *DKIM_CALL DKIMVersion();\r
- \r
--char *DKIM_CALL DKIMGetErrorString( int ErrorCode );\r
-+const char *DKIM_CALL DKIMGetErrorString( int ErrorCode );\r
- \r
- #ifdef __cplusplus\r
- }\r
-diff -ru src/dkimbase.cpp src/dkimbase.cpp
---- src/dkimbase.cpp 2008-05-12 20:07:36.000000000 +1000
-+++ src/dkimbase.cpp 2009-04-15 19:49:32.000000000 +1000
-@@ -118,10 +118,10 @@
- // Process - split buffers into lines without any CRs or LFs at the end.\r
- //\r
- ////////////////////////////////////////////////////////////////////////////////\r
--int CDKIMBase::Process( char* szBuffer, int nBufLength, bool bEOF )\r
-+int CDKIMBase::Process( const char* szBuffer, int nBufLength, bool bEOF )\r
- {\r
-- char* p = szBuffer;\r
-- char* e = szBuffer + nBufLength;\r
-+ const char* p = szBuffer;\r
-+ const char* e = szBuffer + nBufLength;\r
- \r
- while( p < e )\r
- {\r
-@@ -208,7 +208,8 @@
- {\r
- m_InHeaders = false;\r
- ProcessHeaders();\r
-- ProcessBody("", 0, true);\r
-+ /* type conversion should be safe as length is zero */\r
-+ ProcessBody((char *)"", 0, true);\r
- }\r
- \r
- return DKIM_SUCCESS;\r
-@@ -338,9 +339,9 @@
- \r
- CompressSWSP(sTemp);\r
- \r
-- unsigned cpos = sTemp.find(':');\r
-+ string::size_type cpos = sTemp.find(':');\r
- \r
-- if (cpos == -1)\r
-+ if (cpos == string::npos)\r
- {\r
- // no colon?!\r
- }\r
-diff -ru src/dkimbase.h src/dkimbase.h
---- src/dkimbase.h 2008-05-12 20:07:24.000000000 +1000
-+++ src/dkimbase.h 2009-04-15 19:49:32.000000000 +1000
-@@ -41,7 +41,7 @@
- \r
- int Init(void);\r
- \r
-- int Process( char* szBuffer, int nBufLength, bool bEOF );\r
-+ int Process( const char* szBuffer, int nBufLength, bool bEOF );\r
- int ProcessFinal(void);\r
- \r
- int Alloc( char*& szBuffer, int nRequiredSize );\r
-diff -ru src/dkimsign.cpp src/dkimsign.cpp
---- src/dkimsign.cpp 2008-05-12 20:07:46.000000000 +1000
-+++ src/dkimsign.cpp 2009-04-15 19:49:32.000000000 +1000
-@@ -144,7 +144,7 @@
- \r
- fwrite( szBuffer, 1, nBufLength, fpdebug );\r
- \r
-- /** END DEBUG CODE **/\r
-+ ** END DEBUG CODE **/\r
- \r
- if( bAllmanOnly )\r
- {\r
-@@ -555,7 +555,7 @@
- // if bFold, fold at cbrk char\r
- //\r
- ////////////////////////////////////////////////////////////////////////////////\r
--void CDKIMSign::AddTagToSig( char* Tag, const string &sValue, char cbrk, bool bFold )\r
-+void CDKIMSign::AddTagToSig( const char* const Tag, const string &sValue, char cbrk, bool bFold )\r
- {\r
- int nTagLen = strlen(Tag);\r
- \r
-@@ -583,10 +583,10 @@
- // AddTagToSig - add tag and numeric value to signature folding if necessary\r
- //\r
- ////////////////////////////////////////////////////////////////////////////////\r
--void CDKIMSign::AddTagToSig( char* Tag, unsigned long nValue )\r
-+void CDKIMSign::AddTagToSig( const char* const Tag, unsigned long nValue )\r
- {\r
- char szValue[64];\r
-- sprintf( szValue, "%u", nValue );\r
-+ sprintf( szValue, "%lu", nValue );\r
- AddTagToSig( Tag, szValue, 0, false );\r
- }\r
- \r
-@@ -686,7 +686,7 @@
- // GetSig - compute hash and return signature header in szSignature\r
- //\r
- ////////////////////////////////////////////////////////////////////////////////\r
--int CDKIMSign::GetSig( char* szPrivKey, char* szSignature, int nSigLength )\r
-+int CDKIMSign::GetSig( char* szPrivKey, char* szSignature, unsigned nSigLength )\r
- {\r
- if( szPrivKey == NULL )\r
- {\r
-@@ -794,7 +794,6 @@
- int size;\r
- int len;\r
- char* buf;\r
-- int pos = 0;\r
- \r
- // construct the DKIM-Signature: header and add to hash\r
- InitSig();\r
-@@ -879,7 +878,7 @@
- }\r
- BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);\r
- BIO_push(b64, bio);\r
-- if (BIO_write(b64, Hash, nHashLen) < nHashLen) \r
-+ if (BIO_write(b64, Hash, nHashLen) < (int)nHashLen) \r
- {\r
- BIO_free_all(b64);\r
- return DKIM_OUT_OF_MEMORY;\r
-@@ -993,7 +992,7 @@
- }\r
- BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);\r
- BIO_push(b64, bio);\r
-- if (BIO_write(b64, sig, siglen) < siglen) \r
-+ if (BIO_write(b64, sig, siglen) < (int)siglen) \r
- {\r
- OPENSSL_free(sig);\r
- BIO_free_all(b64);\r
-diff -ru src/dkimsign.h src/dkimsign.h
---- src/dkimsign.h 2008-05-12 20:07:58.000000000 +1000
-+++ src/dkimsign.h 2009-04-15 19:49:32.000000000 +1000
-@@ -32,7 +32,7 @@
- \r
- int Init( DKIMSignOptions* pOptions );\r
- \r
-- int GetSig( char* szPrivKey, char* szSignature, int nSigLength );\r
-+ int GetSig( char* szPrivKey, char* szSignature, unsigned nSigLength );\r
- int GetSig2( char* szPrivKey, char** pszSignature );\r
- \r
- virtual int ProcessHeaders(void);\r
-@@ -50,8 +50,8 @@
- bool ParseFromAddress( void );\r
- \r
- void InitSig(void);\r
-- void AddTagToSig( char* Tag, const string &sValue, char cbrk, bool bFold );\r
-- void AddTagToSig( char* Tag, unsigned long nValue );\r
-+ void AddTagToSig( const char* const Tag, const string &sValue, char cbrk, bool bFold );\r
-+ void AddTagToSig( const char* const Tag, unsigned long nValue );\r
- void AddInterTagSpace( int nSizeOfNextTag );\r
- void AddFoldedValueToSig( const string &sValue, char cbrk );\r
- \r
-diff -ru src/dkimverify.cpp src/dkimverify.cpp
---- src/dkimverify.cpp 2009-04-15 19:37:48.000000000 +1000
-+++ src/dkimverify.cpp 2009-04-15 19:49:32.000000000 +1000
-@@ -440,7 +440,7 @@
- {\r
- ProcessFinal();\r
- \r
-- int SuccessCount=0;\r
-+ unsigned int SuccessCount=0;\r
- int TestingFailures=0;\r
- int RealFailures=0;\r
- \r
-@@ -646,7 +646,7 @@
- /** END DEBUG CODE **/\r
- #endif\r
- \r
-- if (IsBody && BodyLength != -1)\r
-+ if (IsBody && BodyLength != (unsigned)-1)\r
- {\r
- VerifiedBodyCount += nBufLength;\r
- if (VerifiedBodyCount > BodyLength)\r
-@@ -1019,7 +1019,7 @@
- // body count\r
- if (values[8] == NULL || !m_HonorBodyLengthTag)\r
- {\r
-- sig.BodyLength = -1;\r
-+ sig.BodyLength = (unsigned)-1;\r
- }\r
- else\r
- {\r
-@@ -1057,17 +1057,17 @@
- // expiration time\r
- if (values[11] == NULL)\r
- {\r
-- sig.ExpireTime = -1;\r
-+ sig.ExpireTime = (unsigned)-1;\r
- }\r
- else\r
- {\r
- if (!ParseUnsigned(values[11], &sig.ExpireTime))\r
- return DKIM_BAD_SYNTAX;\r
- \r
-- if (sig.ExpireTime != -1)\r
-+ if (sig.ExpireTime != (unsigned)-1)\r
- {\r
- // the value of x= MUST be greater than the value of t= if both are present\r
-- if (SignedTime != -1 && sig.ExpireTime <= SignedTime)\r
-+ if (SignedTime != (unsigned)-1 && sig.ExpireTime <= SignedTime)\r
- return DKIM_BAD_SYNTAX;\r
- \r
- // todo: if possible, use the received date/time instead of the current time\r
-@@ -1169,7 +1169,7 @@
- }\r
- \r
- \r
--SelectorInfo::SelectorInfo(const string &sSelector, const string &sDomain) : Selector(sSelector), Domain(sDomain)\r
-+SelectorInfo::SelectorInfo(const string &sSelector, const string &sDomain) : Domain(sDomain), Selector(sSelector)\r
- {\r
- AllowSHA1 = true;\r
- AllowSHA256 = true;\r
-@@ -1207,7 +1207,7 @@
- return DKIM_SELECTOR_INVALID; // todo: maybe create a new error code for unsupported selector version\r
- \r
- // make sure v= is the first tag in the response // todo: maybe don't enforce this, it seems unnecessary\r
-- for (int j=1; j<sizeof(values)/sizeof(values[0]); j++)\r
-+ for (unsigned j=1; j<sizeof(values)/sizeof(values[0]); j++)\r
- {\r
- if (values[j] != NULL && values[j] < values[0])\r
- {\r
-diff -ru src/libdkimtest.cpp src/libdkimtest.cpp
---- src/libdkimtest.cpp 2008-05-12 20:08:54.000000000 +1000
-+++ src/libdkimtest.cpp 2009-04-15 19:38:08.000000000 +1000
-@@ -60,9 +60,9 @@
- int main(int argc, char* argv[])\r
- {\r
- int n;\r
-- char* PrivKeyFile = "test.pem";\r
-- char* MsgFile = "test.msg";\r
-- char* OutFile = "signed.msg";\r
-+ const char* PrivKeyFile = "test.pem";\r
-+ const char* MsgFile = "test.msg";\r
-+ const char* OutFile = "signed.msg";\r
- int nPrivKeyLen;\r
- char PrivKey[2048];\r
- char Buffer[1024];\r
+++ /dev/null
-strtok_r.patch
-fix_warnings.patch
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_strtok_r.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: Use strtok_r() instead of strtok().
-
-@DPATCH@
-
-diff -ru libdkim-1.0.19/src/dkimverify.cpp libdkim-1.0.19-new/src/dkimverify.cpp
---- src/dkimverify.cpp 2008-05-12 20:08:06.000000000 +1000
-+++ src/dkimverify.cpp 2009-06-11 18:28:10.000000000 +1000
-@@ -855,6 +855,9 @@
- ////////////////////////////////////////////////////////////////////////////////\r
- int CDKIMVerify::ParseDKIMSignature( const string& sHeader, SignatureInfo &sig )\r
- {\r
-+ // for strtok_r()\r
-+ char *saveptr;\r
-+\r
- // save header for later\r
- sig.Header = sHeader;\r
- \r
-@@ -1032,7 +1035,7 @@
- {\r
- // make sure "dns" is in the list\r
- bool HasDNS = false;\r
-- char *s = strtok(values[9], ":");\r
-+ char *s = strtok_r(values[9], ":", &saveptr);\r
- while (s != NULL)\r
- {\r
- if (strncmp(s, "dns", 3) == 0 && (s[3] == '\0' || s[3] == '/'))\r
-@@ -1040,7 +1043,7 @@
- HasDNS = true;\r
- break;\r
- }\r
-- s = strtok(NULL, ": \t");\r
-+ s = strtok_r(NULL, ": \t", &saveptr);\r
- }\r
- if (!HasDNS)\r
- return DKIM_BAD_SYNTAX; // todo: maybe create a new error code for unknown query method\r
-@@ -1080,7 +1083,7 @@
- // parse the signed headers list\r
- bool HasFrom = false, HasSubject = false;\r
- RemoveSWSP(values[4]); // header names shouldn't have spaces in them so this should be ok...\r
-- char *s = strtok(values[4], ":");\r
-+ char *s = strtok_r(values[4], ":", &saveptr);\r
- while (s != NULL)\r
- {\r
- if (_stricmp(s, "From") == 0)\r
-@@ -1090,7 +1093,7 @@
- \r
- sig.SignedHeaders.push_back(s);\r
- \r
-- s = strtok(NULL, ":");\r
-+ s = strtok_r(NULL, ":", &saveptr);\r
- }\r
- \r
- if (!HasFrom)\r
-@@ -1194,6 +1197,9 @@
- ////////////////////////////////////////////////////////////////////////////////\r
- int SelectorInfo::Parse( char* Buffer )\r
- {\r
-+ // for strtok_r()\r
-+ char *saveptr;\r
-+\r
- static const char *tags[] = {"v","g","h","k","p","s","t","n",NULL};\r
- char *values[sizeof(tags)/sizeof(tags[0])] = {NULL};\r
- \r
-@@ -1235,14 +1241,14 @@
- else\r
- {\r
- // MUST include "sha1" or "sha256"\r
-- char *s = strtok(values[2], ":");\r
-+ char *s = strtok_r(values[2], ":", &saveptr);\r
- while (s != NULL)\r
- {\r
- if (strcmp(s, "sha1") == 0)\r
- AllowSHA1 = true;\r
- else if (strcmp(s, "sha256") == 0)\r
- AllowSHA256 = true;\r
-- s = strtok(NULL, ":");\r
-+ s = strtok_r(NULL, ":", &saveptr);\r
- }\r
- if ( !(AllowSHA1 || AllowSHA256) )\r
- return DKIM_SELECTOR_INVALID; // todo: maybe create a new error code for unsupported hash algorithm\r
-@@ -1261,7 +1267,7 @@
- {\r
- // make sure "*" or "email" is in the list\r
- bool ServiceTypeMatch = false;\r
-- char *s = strtok(values[5], ":");\r
-+ char *s = strtok_r(values[5], ":", &saveptr);\r
- while (s != NULL)\r
- {\r
- if (strcmp(s, "*") == 0 || strcmp(s, "email") == 0)\r
-@@ -1269,7 +1275,7 @@
- ServiceTypeMatch = true;\r
- break;\r
- }\r
-- s = strtok(NULL, ":");\r
-+ s = strtok_r(NULL, ":", &saveptr);\r
- }\r
- if (!ServiceTypeMatch)\r
- return DKIM_SELECTOR_INVALID;\r
-@@ -1278,7 +1284,7 @@
- // flags\r
- if (values[6] != NULL)\r
- {\r
-- char *s = strtok(values[6], ":");\r
-+ char *s = strtok_r(values[6], ":", &saveptr);\r
- while (s != NULL)\r
- {\r
- if (strcmp(s, "y") == 0)\r
-@@ -1289,7 +1295,7 @@
- {\r
- SameDomain = true;\r
- }\r
-- s = strtok(NULL, ":");\r
-+ s = strtok_r(NULL, ":", &saveptr);\r
- }\r
- }\r
- \r
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils toolchain-funcs
-
-DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc"
-HOMEPAGE="http://libdkim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="Apache-2.0 yahoo-patent-license-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl static-libs"
-
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- app-arch/unzip"
-RDEPEND="
- !mail-filter/libdkim-exim
- dev-libs/openssl"
-
-S="${WORKDIR}/${PN}/src"
-
-src_prepare() {
- ecvs_clean
- cp "${FILESDIR}"/debianize/* "${S}" || die
- epatch "${FILESDIR}"/patches/*.patch
- epatch "${FILESDIR}"/libdkim-extra-options.patch
- epatch "${FILESDIR}"/${P}-gcc6.patch
-
- # Bug 476772
- if ! use static-libs; then
- sed -i \
- -e '/^TARGETS/s/libdkim.a//' \
- -e '/install -m 644 libdkim.a/d' \
- Makefile.in || die 'sed on Makefile.in failed'
- fi
-
- # Bug 476770
- tc-export AR
-
- autotools-utils_src_prepare
-}
-
-src_install() {
- autotools-utils_src_install
- dodoc ../README
-}
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs vcs-clean
-
-DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc"
-HOMEPAGE="http://libdkim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="Apache-2.0 yahoo-patent-license-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl static-libs"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- !mail-filter/libdkim-exim
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
-"
-
-S="${WORKDIR}/${PN}/src"
-
-src_prepare() {
- default
-
- ecvs_clean
- cp "${FILESDIR}"/debianize/* "${S}" || die
- eapply "${FILESDIR}"/patches/*.patch
- eapply "${FILESDIR}"/libdkim-extra-options-r1.patch
- eapply "${FILESDIR}"/${P}-gcc6.patch
-
- # Bug 476772
- if ! use static-libs; then
- sed -i \
- -e '/^TARGETS/s/libdkim.a//' \
- -e '/install -m 644 libdkim.a/d' \
- Makefile.in || die 'sed on Makefile.in failed'
- fi
-
- # Bug 476770
- tc-export AR
-
- eautoreconf
-}
-
-src_install() {
- default
- dodoc ../README
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">libdkim</remote-id>
- </upstream>
-</pkgmetadata>
# games-util/gtkevemon: #675988, upstream API shut down
# mail-client/nail: #676008, last commit in 2010, also #508480
# mail-client/nmh: #676938, needs bump, 2014, also #676938, #680596
-# mail-filter/libdkim: #674892, no revdeps, last release in 2010
#
# Removal in 30 days.
app-crypt/keynote
games-util/gtkevemon
mail-client/nail
mail-client/nmh
-mail-filter/libdkim
# Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
# Depends on >=virtual/{jdk,jre}-11 which is masked
projects / gentoo.git / commitdiff