[gentoo-commits] repo/gentoo:master commit in: net-analyzer/postal/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/postal/files/

[David Seifert]

commit:     1b90a5d74cef51dd7e2f499361254f576ae8c01a
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 09:17:01 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 09:49:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b90a5d7

net-analyzer/postal: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3488

 .../postal/files/02_postal-0.70-nossl.patch        | 72 ----------------------
 1 file changed, 72 deletions(-)

diff --git a/net-analyzer/postal/files/02_postal-0.70-nossl.patch b/net-analyzer/postal/files/02_postal-0.70-nossl.patch
deleted file mode 100644
index 9b4166d..00000000
--- a/net-analyzer/postal/files/02_postal-0.70-nossl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
---- postal-0.69.orig/configure.in	2008-04-09 03:08:28.000000000 +0200
-+++ postal-0.69/configure.in	2008-04-23 22:37:41.000000000 +0200
-@@ -13,15 +13,28 @@
- else
-   stripping="-s"
- fi
- 
- AC_ARG_ENABLE(openssl,
--      [  --disable-openssl  disables openssl support],
--      DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
-+	[  --disable-openssl	disable openssl support],
-+	[ if test $enableval = yes; then
-+		DISABLEOPENSSL=no
-+	else
-+		DISABLEOPENSSL=yes
-+	fi ]
-+	,
-+	[ DISABLEOPENSSL=no ])
-+
- AC_ARG_ENABLE(gnutls,
--      [  --disable-gnutls  disables gnutls support],
--      DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
-+	[  --disable-gnutls  disables gnutls support],
-+	[if test $enableval = yes; then
-+		DISABLEGNUTLS=no
-+	else
-+		DISABLEGNUTLS=yes
-+	fi]	
-+	,
-+	[ DISABLEGNUTLS=no ])
- 
- dnl Checks for programs.
- AC_LANG_CPLUSPLUS
- AC_PROG_CC
- AC_PROG_CXX
-@@ -118,17 +131,17 @@
- crypt_ldflags=
- if [[ "$GNUTLS" = "no" ]]; then
-   gnutls=""
- else
-   gnutls="#define USE_GNUTLS"
--  crypt_ldflags="$extra_ldflags -lgnutls"
-+  crypt_ldflags=" -lgnutls"
- fi
- if [[ "$OPENSSL" = "no" ]]; then
-   openssl=""
- else
-   openssl="#define USE_OPENSSL"
--  crypt_ldflags="$extra_ldflags -lssl -lcrypto"
-+  crypt_ldflags=" -lssl -lcrypto"
- fi
- 
- AC_SUBST(large_file)
- large_file=""
- 
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
---- postal-0.69.orig/Makefile.in	2008-04-10 03:19:34.000000000 +0200
-+++ postal-0.69/Makefile.in	2008-04-23 22:37:13.000000000 +0200
-@@ -16,11 +16,11 @@
- INSTALL=@INSTALL@
- 
- TESTEXE=ex-test
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
- LFLAGS=-lstdc++ @extra_ldflags@
--CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
-+CRYPTLFLAGS=-lstdc++ @extra_ldflags@  @crypt_ldflags@ 
- 
- 
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
- 
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/postal/files/

[Patrice Clement]

commit:     3ad75b7f6b6dd1d577919e16e5a5ed2c97486b60
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 02:28:23 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 15:40:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad75b7f

net-analyzer/postal: fix building with GCC-6.

Closes: https://bugs.gentoo.org/595084
Closes: https://github.com/gentoo/gentoo/pull/5912
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
index 9ad6a036dcd..448af31a896 100644
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
+++ b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
@@ -36,7 +36,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
  #include <string>
  #include "conf.h"
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#include <tr1/functional_hash.h>
 +#else
@@ -58,7 +58,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
    int sync_time;
  } BHM_DATA;
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
 +#else
  namespace __gnu_cxx
@@ -237,7 +237,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
  #include <cstring>
  #include <time.h>
  #include "conf.h"
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#else
  #ifdef HAVE_EXT_HASH_MAP
@@ -258,7 +258,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
    }
  };
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
 +#else
  typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;