pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/dirmngr (pkgsrc)
details: https://anonhg.NetBSD.org/pkgsrc/rev/5dd4f39bbb35
branches: trunk
changeset: 648086:5dd4f39bbb35
user: mef <mef%pkgsrc.org@localhost>
date: Wed Mar 11 01:31:02 2015 +0000
description:
(pkgsrc)
- Drop patch-ah, seems to have included
- License from gnu-gpl-v2 to gnu-gpl-v3
(upstream)
- Update 1.1.0 to 1.1.1
---------------------
2013-04-26 Werner Koch <wk%gnupg.org@localhost>
Release 1.1.1.
2013-04-26 Andre Heinecke <aheinecke%intevation.de@localhost> (wk)
* configure.ac (strcasecmp): Check otherwise jnlib would defines it.
* configure.ac (sigset_t): Add check.
* configure.ac (LBER_LIBS): Add check.
2010-11-16 Werner Koch <wk%g10code.com@localhost>
Change the license to GPLv3+.
* COPYING: Replace by GPLv3 version.
diffstat:
security/dirmngr/Makefile | 7 +-
security/dirmngr/distinfo | 11 ++--
security/dirmngr/patches/patch-aa | 14 +++---
security/dirmngr/patches/patch-ah | 83 ---------------------------------------
4 files changed, 15 insertions(+), 100 deletions(-)
diffs (163 lines):
diff -r 0bd19d11bde5 -r 5dd4f39bbb35 security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Wed Mar 11 00:51:17 2015 +0000
+++ b/security/dirmngr/Makefile Wed Mar 11 01:31:02 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2015/01/09 16:30:57 rumko Exp $
+# $NetBSD: Makefile,v 1.52 2015/03/11 01:31:02 mef Exp $
-DISTNAME= dirmngr-1.1.0
-PKGREVISION= 9
+DISTNAME= dirmngr-1.1.1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/dirmngr/
EXTRACT_SUFX= .tar.bz2
@@ -9,7 +8,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.gnupg.org/aegypten2/
COMMENT= X509 certificate and CRL downloader
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v3
DIRMNGR_USER?= dirmngr
DIRMNGR_GROUP?= dirmngr
diff -r 0bd19d11bde5 -r 5dd4f39bbb35 security/dirmngr/distinfo
--- a/security/dirmngr/distinfo Wed Mar 11 00:51:17 2015 +0000
+++ b/security/dirmngr/distinfo Wed Mar 11 01:31:02 2015 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.20 2015/01/09 16:30:57 rumko Exp $
+$NetBSD: distinfo,v 1.21 2015/03/11 01:31:02 mef Exp $
-SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165
-RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65
-Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes
-SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0
+SHA1 (dirmngr-1.1.1.tar.bz2) = e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
+RMD160 (dirmngr-1.1.1.tar.bz2) = f376b6cc874e275a11093dac0db6f9dc1c78d548
+Size (dirmngr-1.1.1.tar.bz2) = 566929 bytes
+SHA1 (patch-aa) = c25289d53509761c2ca86951c33ff6f70c5696b1
SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0
SHA1 (patch-ac) = 625ba1050021e6cb17af76a4301cdcf6f5aaa92d
SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
SHA1 (patch-ag) = a08f7c82ed32e72f52a69baa64e97a86cbe8fa70
-SHA1 (patch-ah) = 676ce6ee92db06225f3da7cf27d51a7e3a2c9f59
SHA1 (patch-doc_Makefile.in) = 61f166b39ca7365e02b9d6510487c5c2d9e61f08
diff -r 0bd19d11bde5 -r 5dd4f39bbb35 security/dirmngr/patches/patch-aa
--- a/security/dirmngr/patches/patch-aa Wed Mar 11 00:51:17 2015 +0000
+++ b/security/dirmngr/patches/patch-aa Wed Mar 11 01:31:02 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2009/12/15 19:43:16 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2015/03/11 01:31:02 mef Exp $
---- src/Makefile.am.orig 2008-06-12 15:23:02.000000000 +0000
-+++ src/Makefile.am
+--- src/Makefile.am.orig 2013-04-26 17:04:59.000000000 +0900
++++ src/Makefile.am 2015-03-11 10:19:38.000000000 +0900
@@ -20,7 +20,7 @@
## Process this file with automake to produce Makefile.in
@@ -11,12 +11,12 @@
EXTRA_DIST = Manifest
-@@ -31,7 +31,7 @@ libexec_PROGRAMS = dirmngr_ldap
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
- AM_CPPFLAGS += -DDIRMNGR_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\""
+@@ -31,7 +31,7 @@
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+ AM_CPPFLAGS += -DDIRMNGR_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\""
AM_CPPFLAGS += -DDIRMNGR_LIBEXECDIR="\"$(libexecdir)\""
-AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(localstatedir)/lib/@PACKAGE@\""
-+AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(datadir)/@PACKAGE@\""
++AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(datadir)/lib/@PACKAGE@\""
AM_CPPFLAGS += -DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
AM_CPPFLAGS += -DDIRMNGR_SOCKETDIR="\"$(localstatedir)/run/@PACKAGE@\""
diff -r 0bd19d11bde5 -r 5dd4f39bbb35 security/dirmngr/patches/patch-ah
--- a/security/dirmngr/patches/patch-ah Wed Mar 11 00:51:17 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/05/25 09:29:05 drochner Exp $
-
---- src/http.c.orig 2009-08-07 14:23:33.000000000 +0000
-+++ src/http.c
-@@ -98,6 +98,16 @@ struct srventry
- };
- #endif/*!USE_DNS_SRV*/
-
-+#ifdef HAVE_PTH
-+# define my_select(a,b,c,d,e) pth_select ((a), (b), (c), (d), (e))
-+# define my_connect(a,b,c) pth_connect ((a), (b), (c))
-+# define my_accept(a,b,c) pth_accept ((a), (b), (c))
-+#else
-+# define my_select(a,b,c,d,e) select ((a), (b), (c), (d), (e))
-+# define my_connect(a,b,c) connect ((a), (b), (c))
-+# define my_accept(a,b,c) accept ((a), (b), (c))
-+#endif
-+
-
- #ifdef HAVE_W32_SYSTEM
- #define sock_close(a) closesocket(a)
-@@ -1333,14 +1343,14 @@ start_server ()
- FD_ZERO (&rfds);
- FD_SET (fd, &rfds);
-
-- if (select (fd + 1, &rfds, NULL, NULL, NULL) <= 0)
-+ if (my_select (fd + 1, &rfds, NULL, NULL, NULL) <= 0)
- continue; /* ignore any errors */
-
- if (!FD_ISSET (fd, &rfds))
- continue;
-
- addrlen = sizeof peer;
-- client = accept (fd, (struct sockaddr *) &peer, &addrlen);
-+ client = my_accept (fd, (struct sockaddr *) &peer, &addrlen);
- if (client == -1)
- continue; /* oops */
-
-@@ -1406,7 +1416,7 @@ connect_server (const char *server, unsi
- addr.sin_port = htons(port);
- memcpy (&addr.sin_addr,&inaddr,sizeof(inaddr));
-
-- if (!connect (sock,(struct sockaddr *)&addr,sizeof(addr)) )
-+ if (!my_connect (sock,(struct sockaddr *)&addr,sizeof(addr)) )
- return sock;
- sock_close(sock);
- return -1;
-@@ -1474,7 +1484,7 @@ connect_server (const char *server, unsi
- return -1;
- }
-
-- if (connect (sock, ai->ai_addr, ai->ai_addrlen))
-+ if (my_connect (sock, ai->ai_addr, ai->ai_addrlen))
- last_errno = errno;
- else
- connected = 1;
-@@ -1528,7 +1538,7 @@ connect_server (const char *server, unsi
- for (i = 0; host->h_addr_list[i] && !connected; i++)
- {
- memcpy (&addr.sin_addr, host->h_addr_list[i], host->h_length);
-- if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
-+ if (my_connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
- last_errno = errno;
- else
- {
-@@ -1594,7 +1604,7 @@ cookie_read (void *cookie, void *buffer,
-
- tv.tv_sec = 0;
- tv.tv_usec = 50000;
-- select (0, NULL, NULL, NULL, &tv);
-+ my_select (0, NULL, NULL, NULL, &tv);
- goto again;
- }
- if (nread == GNUTLS_E_REHANDSHAKE)
-@@ -1649,7 +1659,7 @@ cookie_write (void *cookie, const void *
-
- tv.tv_sec = 0;
- tv.tv_usec = 50000;
-- select (0, NULL, NULL, NULL, &tv);
-+ my_select (0, NULL, NULL, NULL, &tv);
- continue;
- }
- log_info ("TLS network write failed: %s\n",
Home |
Main Index |
Thread Index |
Old Index