pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/avenger (pkgsrc)
details: https://anonhg.NetBSD.org/pkgsrc/rev/e6c54678cdfa
branches: trunk
changeset: 641961:e6c54678cdfa
user: mef <mef%pkgsrc.org@localhost>
date: Sat Nov 22 03:01:33 2014 +0000
description:
(pkgsrc)
- Add comment for patch-util_avutil.h (from commit log)
- Remove patches, found the same change incorporated:
patches/patch-libasync_itree.h
patches/patch-libasync_qhash.h
patches/patch-libasync_vec.h
(upstream)
- update 0.8.2 to 0.8.4
* Changes in release 0.8.4
- Switch to new resolver library interface, as previous way of
reloading resolv.conf is no longer compatible with glibc.
- Set IP_FREEBIND option if available.
- Added systemd avenger.service file.
* Changes in release 0.8.3
- Updated to work with gcc 4.7.
diffstat:
mail/avenger/Makefile | 5 +--
mail/avenger/distinfo | 15 +++++--------
mail/avenger/patches/patch-libasync_ihash.h | 31 ++++++++++++++--------------
mail/avenger/patches/patch-libasync_itree.h | 15 --------------
mail/avenger/patches/patch-libasync_qhash.h | 24 ----------------------
mail/avenger/patches/patch-libasync_vec.h | 24 ----------------------
mail/avenger/patches/patch-util_avutil.h | 4 ++-
7 files changed, 27 insertions(+), 91 deletions(-)
diffs (177 lines):
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/Makefile
--- a/mail/avenger/Makefile Sat Nov 22 01:36:52 2014 +0000
+++ b/mail/avenger/Makefile Sat Nov 22 03:01:33 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/11/22 03:01:33 mef Exp $
-DISTNAME= avenger-0.8.2
-PKGREVISION= 5
+DISTNAME= avenger-0.8.4
CATEGORIES= mail
MASTER_SITES= http://www.mailavenger.org/dist/
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/distinfo
--- a/mail/avenger/distinfo Sat Nov 22 01:36:52 2014 +0000
+++ b/mail/avenger/distinfo Sat Nov 22 03:01:33 2014 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.6 2012/02/16 19:00:14 hans Exp $
+$NetBSD: distinfo,v 1.7 2014/11/22 03:01:33 mef Exp $
-SHA1 (avenger-0.8.2.tar.gz) = bd645143289d28fac54eb1943b3f114ea396e205
-RMD160 (avenger-0.8.2.tar.gz) = 539b1163fd805e34a432d988c255c92c0fee8963
-Size (avenger-0.8.2.tar.gz) = 874426 bytes
+SHA1 (avenger-0.8.4.tar.gz) = 109d17e2be2fa5f93e4302fefe5b1847458d33bb
+RMD160 (avenger-0.8.4.tar.gz) = 762f3f260d2be8466109d24d59b196b14adc04d4
+Size (avenger-0.8.4.tar.gz) = 890192 bytes
SHA1 (patch-aa) = c7ae855eab4995164de44c861480f263adbb4bc9
SHA1 (patch-ab) = 831944e8447433b2697db2b3a58650aab19f4a19
SHA1 (patch-ac) = 9b3625a090e0f9091468b86a99d0bea6535ac371
-SHA1 (patch-libasync_ihash.h) = 745cadbcd9778182e0a17afbbd5e84d91572468e
-SHA1 (patch-libasync_itree.h) = 52fdac5183e5be5406c1b67c0f97c5552a18a1ec
-SHA1 (patch-libasync_qhash.h) = 8bc832dee629cc8e0f7efc25e9011d9883f08e92
-SHA1 (patch-libasync_vec.h) = 91a4db8114a6ae8915f29610ab11fafdf4427cde
-SHA1 (patch-util_avutil.h) = e7799fc638e9b5e7a888f7108785a3e54ed52540
+SHA1 (patch-libasync_ihash.h) = 45cfb9081f3a4176e32668dd80bd09fb4ba97e27
+SHA1 (patch-util_avutil.h) = 66d99fcb4bae3e2477089222cdc8dea6fa030d42
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/patches/patch-libasync_ihash.h
--- a/mail/avenger/patches/patch-libasync_ihash.h Sat Nov 22 01:36:52 2014 +0000
+++ b/mail/avenger/patches/patch-libasync_ihash.h Sat Nov 22 03:01:33 2014 +0000
@@ -1,35 +1,36 @@
-$NetBSD: patch-libasync_ihash.h,v 1.1 2012/01/18 14:32:10 adam Exp $
+$NetBSD: patch-libasync_ihash.h,v 1.2 2014/11/22 03:01:33 mef Exp $
Fix C++ errors
---- libasync/ihash.h.orig 2012-01-18 14:07:53.000000000 +0000
-+++ libasync/ihash.h
+--- libasync/ihash.h.orig 2013-01-21 20:01:04.000000000 +0900
++++ libasync/ihash.h 2014-11-22 11:47:06.000000000 +0900
@@ -235,7 +235,7 @@ public:
ihash () : eq (E ()), hash (H ()) {}
ihash (const E &e, const H &h) : eq (e), hash (h) {}
-- void insert (V *elm) { insert_val (elm, hash (elm->*key)); }
-+ void insert (V *elm) { this->insert_val (elm, hash (elm->*key)); }
+- void insert (V *elm) { ihash::insert_val (elm, hash (elm->*key)); }
++ void insert (V *elm) { this->ihash::insert_val (elm, hash (elm->*key)); }
#if 0
template<class T> V *operator[] (const T &k) const {
-@@ -243,16 +243,16 @@ public:
- V *operator[] (const K &k) const {
- #endif
+@@ -278,9 +278,9 @@ public:
+
+ V *operator() (const K1 &k1, const K2 &k2) const {
V *v;
-- for (v = lookup_val (hash (k));
-+ for (v = this->lookup_val (hash (k));
- v && !eq (k, v->*key);
+- for (v = lookup_val (hash (k1, k2));
++ for (v = this->lookup_val (hash (k1, k2));
+ v && !(eq1 (k1, v->*key1) && eq2 (k2, v->*key2));
- v = next_val (v))
+ v = this->next_val (v))
;
return v;
}
+@@ -320,7 +320,7 @@ public:
V *nextkeq (V *v) {
- const K &k = v->*key;
-- while ((v = next_val (v)) && !eq (k, v->*key))
-+ while ((v = this->next_val (v)) && !eq (k, v->*key))
+ const V &k = *v;
+- while ((v = next_val (v)) && !eq (k, *v))
++ while ((v = this->next_val (v)) && !eq (k, *v))
;
return v;
- };
+ }
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/patches/patch-libasync_itree.h
--- a/mail/avenger/patches/patch-libasync_itree.h Sat Nov 22 01:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-libasync_itree.h,v 1.1 2012/01/18 14:32:10 adam Exp $
-
-Fix C++ errors
-
---- libasync/itree.h.orig 2012-01-18 14:08:55.000000000 +0000
-+++ libasync/itree.h
-@@ -250,7 +250,7 @@ public:
- #else
- V *operator[] (const K &k) {
- // return search (wrap (this, &kvcmp, &k));
-- return search (skvcmp, &kcmp, &k);
-+ return this->search (skvcmp, &kcmp, &k);
- }
- #endif
- };
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/patches/patch-libasync_qhash.h
--- a/mail/avenger/patches/patch-libasync_qhash.h Sat Nov 22 01:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-libasync_qhash.h,v 1.1 2012/01/18 14:32:10 adam Exp $
-
-Fix C++ errors
-
---- libasync/qhash.h.orig 2012-01-18 14:17:45.000000000 +0000
-+++ libasync/qhash.h
-@@ -71,7 +71,7 @@ private:
-
- slot *getslot (const K &k) const {
- slot *s;
-- for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
-+ for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
- ;
- return s;
- }
-@@ -156,7 +156,7 @@ private:
-
- slot *getslot (const K &k) const {
- slot *s;
-- for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
-+ for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
- ;
- return s;
- }
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/patches/patch-libasync_vec.h
--- a/mail/avenger/patches/patch-libasync_vec.h Sat Nov 22 01:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-libasync_vec.h,v 1.1 2012/01/18 14:32:10 adam Exp $
-
-Fix C++ errors
-
---- libasync/vec.h.orig 2012-01-18 14:06:37.000000000 +0000
-+++ libasync/vec.h
-@@ -102,7 +102,7 @@ protected:
- static void destroy (elm_t &e) { e.~elm_t (); }
-
- void init () { lastp = firstp = basep = def_basep (); limp = def_limp (); }
-- void del () { while (firstp < lastp) firstp++->~elm_t (); bfree (basep); }
-+ void del () { while (firstp < lastp) firstp++->~elm_t (); this->bfree (basep); }
-
- #define append(v) \
- do { \
-@@ -143,7 +143,7 @@ public:
- elm_t *obasep = basep;
- move (static_cast<elm_t *> (txmalloc (nalloc * sizeof (elm_t))));
- limp = basep + nalloc;
-- bfree (obasep);
-+ this->bfree (obasep);
- }
- else
- move (basep);
diff -r c738ad42af55 -r e6c54678cdfa mail/avenger/patches/patch-util_avutil.h
--- a/mail/avenger/patches/patch-util_avutil.h Sat Nov 22 01:36:52 2014 +0000
+++ b/mail/avenger/patches/patch-util_avutil.h Sat Nov 22 03:01:33 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-util_avutil.h,v 1.1 2012/02/16 19:00:14 hans Exp $
+$NetBSD: patch-util_avutil.h,v 1.2 2014/11/22 03:01:33 mef Exp $
+
+Fix build on SunOS.
--- util/avutil.h.orig 2008-05-20 20:48:23.000000000 +0200
+++ util/avutil.h 2012-01-27 11:02:13.469861902 +0100
Home |
Main Index |
Thread Index |
Old Index