[135238] trunk/dports/security/stunnel

ionic at macports.org ionic at macports.org
Sun Apr 19 21:02:55 PDT 2015


Revision: 135238
          https://trac.macports.org/changeset/135238
Author:   ionic at macports.org
Date:     2015-04-19 21:02:55 -0700 (Sun, 19 Apr 2015)
Log Message:
-----------
stunnel: update to 5.16. Remove patch-src-client.c.diff and patch-src-log.c.diff. Patch provided by maintainer. Fixes: #47505.

Modified Paths:
--------------
    trunk/dports/security/stunnel/Portfile

Removed Paths:
-------------
    trunk/dports/security/stunnel/files/patch-src-client.c.diff
    trunk/dports/security/stunnel/files/patch-src-log.c.diff

Modified: trunk/dports/security/stunnel/Portfile
===================================================================
--- trunk/dports/security/stunnel/Portfile	2015-04-20 04:02:33 UTC (rev 135237)
+++ trunk/dports/security/stunnel/Portfile	2015-04-20 04:02:55 UTC (rev 135238)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                stunnel
-version             5.15
+version             5.16
 set major           [lindex [split ${version} .] 0]
 categories          security net
 platforms           darwin
@@ -25,8 +25,8 @@
                     http://mirrors.zerg.biz/stunnel/archive/${major}.x/ \
                     ftp://ftp.stunnel.org/stunnel/
 
-checksums           rmd160  640bf3f80975befcfb9b3d8d39f0d9100c937bc2 \
-                    sha256  58ff4645eb5d6bd64e6ddedaa683534302f75625c531e8a6364badcac0541cba
+checksums           rmd160  d91434ffc279180925b4b07e2656d2a18f3871e6 \
+                    sha256  b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d
 
 depends_lib         port:openssl
 
@@ -50,18 +50,6 @@
 
 default_variants    +libwrap
 
-platform darwin 9 {
-    # 10.5 has issues building with gcc 4.2 https://trac.macports.org/ticket/47481
-    patchfiles-append   patch-src-client.c.diff \
-    patch-src-log.c.diff
-}
-
-platform darwin 10 {
-    # 10.6 has issues building with gcc 4.2 https://trac.macports.org/ticket/47481
-    patchfiles-append   patch-src-client.c.diff \
-    patch-src-log.c.diff
-}
- 		 
 # Tell the user about the stupid fake certificate that we provide.
 notes "
 A fake certificate has been installed as ${prefix}/etc/stunnel/stunnel.pem

Deleted: trunk/dports/security/stunnel/files/patch-src-client.c.diff
===================================================================
--- trunk/dports/security/stunnel/files/patch-src-client.c.diff	2015-04-20 04:02:33 UTC (rev 135237)
+++ trunk/dports/security/stunnel/files/patch-src-client.c.diff	2015-04-20 04:02:55 UTC (rev 135238)
@@ -1,21 +0,0 @@
---- src/client.c.orig	2015-04-11 15:08:14.000000000 -0500
-+++ src/client.c	2015-04-16 19:39:11.000000000 -0500
-@@ -167,18 +167,10 @@
-     if(!err)
-         client_try(c);
-     rst=err==1 && c->opt->option.reset;
--#ifdef __GNUC__
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wformat"
--#pragma GCC diagnostic ignored "-Wformat-extra-args"
--#endif /* __GNUC__ */
-     s_log(LOG_NOTICE,
-         "Connection %s: %llu byte(s) sent to SSL, %llu byte(s) sent to socket",
-         rst ? "reset" : "closed",
-         (unsigned long long)c->ssl_bytes, (unsigned long long)c->sock_bytes);
--#ifdef __GNUC__
--#pragma GCC diagnostic pop
--#endif /* __GNUC__ */
- 
-         /* cleanup temporary (e.g. IDENT) socket */
-     if(c->fd!=INVALID_SOCKET)

Deleted: trunk/dports/security/stunnel/files/patch-src-log.c.diff
===================================================================
--- trunk/dports/security/stunnel/files/patch-src-log.c.diff	2015-04-20 04:02:33 UTC (rev 135237)
+++ trunk/dports/security/stunnel/files/patch-src-log.c.diff	2015-04-20 04:02:55 UTC (rev 135238)
@@ -1,29 +0,0 @@
---- src/log.c.orig	2015-04-11 15:08:14.000000000 -0500
-+++ src/log.c	2015-04-16 19:41:58.000000000 -0500
-@@ -266,15 +266,7 @@
-         enter_critical_section(CRIT_ID);
-         my_seq=seq++;
-         leave_critical_section(CRIT_ID);
--#ifdef __GNUC__
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wformat"
--#pragma GCC diagnostic ignored "-Wformat-extra-args"
--#endif /* __GNUC__ */
-         return str_printf("%llu", my_seq);
--#ifdef __GNUC__
--#pragma GCC diagnostic pop
--#endif /* __GNUC__ */
-     case LOG_ID_UNIQUE:
-         if(RAND_bytes(rnd, sizeof rnd)<=0) /* log2(62^22)=130.99 */
-             return str_dup("error");
-@@ -302,10 +294,6 @@
- 
- /* critical problem handling */
- /* str.c functions are not safe to use here */
--#ifdef __GNUC__
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wunused-result"
--#endif /* __GNUC__ */
- void fatal_debug(char *txt, const char *file, int line) {
-     char msg[80];
- #ifdef USE_WIN32
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150419/b64f02e7/attachment.html>


More information about the macports-changes mailing list