Date: Thu, 13 Dec 2012 01:41:24 -0800 (PST) From: Joel Ray Holveck <joelh@piquan.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174410: [PATCH] mail/perdition: Update to 1.18-rc5 (current version is broken in ports) Message-ID: <201212130941.qBD9fNcf006954@thor.piquan.org> Resent-Message-ID: <201212130950.qBD9o0nn063125@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174410 >Category: ports >Synopsis: [PATCH] mail/perdition: Update to 1.18-rc5 (current version is broken in ports) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Dec 13 09:50:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Joel Ray Holveck >Release: FreeBSD 8.3-STABLE i386 >Organization: >Environment: System: FreeBSD thor.piquan.org 8.3-STABLE FreeBSD 8.3-STABLE #1: Mon May 7 13:22:03 PDT >Description: This is a patch to upgrade mail/perdition to 1.18. The version of mail/perdition in ports is 1.17.1, which was released in Oct 2007. Perdition 1.18 was released Nov 2009. (The most recent release of Perdition is 1.19-rc5, released Mar 2012, but should probably be put in a separate perdition-devel port.) The Perdition currently in ports is broken, if built using an up-to-date ports tree. In rev 308695, libvanessa_socket was upgraded to the latest version. This apparently causes Perdition 1.17.1 (the one currently in ports) to fail. (Oddly, the libvanessa_* ports are only used by Perdition; not sure why they weren't all upgraded together.) Regarding UPDATING: It looks like the change to libvanessa_socket seems to have caused Perdition to listen only on IPv6, if its bind_address configuration parameter specifies a hostname with both IPv6 and IPv4 addresses. A possible wording for UPDATING is as follows: AFFECTS: users of mail/perdition The latest update to libvanessa_socket (used by Perdition) adds IPv6 support. If the hostname in bind_address has both IPv4 and IPv6 addresses in DNS, then Perdition will ONLY listen on IPv6. If you prefer to continue to use IPv4, you need to change the bind_address in /usr/local/etc/perdition/perdition.conf to use an explicit IPv4 address. (This can be in addition to, or instead of, the current hostname, depending on whether you want to use IPv6 or not.) If your Perdition server does not have an IPv6 address listed in DNS, this change does not affect you. >How-To-Repeat: >Fix: --- perdition-1.18.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 308812) +++ Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= perdition -PORTVERSION= 1.17.1 -PORTREVISION= 7 +PORTVERSION= 1.18 CATEGORIES= mail net security -MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/ +MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/ MAINTAINER= thomas@bsdunix.ch COMMENT= POP3 & IMAP4 proxy that can map users to multiple backend servers Index: distinfo =================================================================== --- distinfo (revision 308812) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (perdition-1.17.1.tar.gz) = e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26 -SIZE (perdition-1.17.1.tar.gz) = 638162 +SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa +SIZE (perdition-1.18.tar.gz) = 602933 Index: files/patch-etc-perdition-Makefile.in =================================================================== --- files/patch-etc-perdition-Makefile.in (revision 308812) +++ files/patch-etc-perdition-Makefile.in (working copy) @@ -1,23 +1,23 @@ ---- etc/perdition/Makefile.in.orig 2007-11-02 15:40:32.000000000 +0100 -+++ etc/perdition/Makefile.in 2007-11-02 15:45:43.000000000 +0100 -@@ -259,16 +259,16 @@ - @list='$(perditionconf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f'"; \ -- $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f"; \ -+ echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \ -+ $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \ +--- etc/perdition/Makefile.in.orig 2012-03-20 05:07:55.000000000 -0700 ++++ etc/perdition/Makefile.in 2012-12-12 16:48:33.000000000 -0800 +@@ -303,14 +303,17 @@ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" || exit $$?; \ ++ for p in $$files; do \ ++ $(am__strip_dir) \ ++ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \ ++ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \ ++ done; \ done uninstall-perditionconfDATA: @$(NORMAL_UNINSTALL) - @list='$(perditionconf_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(perditionconfdir)/$$f"; \ -+ echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \ -+ rm -f "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \ - done - tags: TAGS - TAGS: + @list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files Index: files/patch-makebdb-Makefile.in =================================================================== --- files/patch-makebdb-Makefile.in (revision 308812) +++ files/patch-makebdb-Makefile.in (working copy) @@ -1,11 +1,11 @@ ---- makebdb/Makefile.in.orig 2007-11-02 15:47:34.000000000 +0100 -+++ makebdb/Makefile.in 2007-11-02 15:48:33.000000000 +0100 -@@ -231,7 +231,7 @@ +--- makebdb/Makefile.in.orig 2012-03-20 05:07:57.000000000 -0700 ++++ makebdb/Makefile.in 2012-12-12 16:03:10.000000000 -0800 +@@ -288,7 +288,7 @@ options.c \ options.h --makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt \ -+makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt \ +-makebdb_LDADD = -ldb -lpopt \ ++makebdb_LDADD = -ldb3 -lpopt \ @dmalloc_lib@ - INCLUDES = -I$(top_srcdir)/libjain + all: all-am Index: files/patch-perdition-db-bdb-Makefile.in =================================================================== --- files/patch-perdition-db-bdb-Makefile.in (revision 308812) +++ files/patch-perdition-db-bdb-Makefile.in (working copy) @@ -1,11 +1,11 @@ ---- perdition/db/bdb/Makefile.in.orig 2007-11-02 15:49:39.000000000 +0100 -+++ perdition/db/bdb/Makefile.in 2007-11-02 15:50:20.000000000 +0100 -@@ -235,7 +235,7 @@ +--- perdition/db/bdb/Makefile.in.orig 2012-03-20 05:08:00.000000000 -0700 ++++ perdition/db/bdb/Makefile.in 2012-12-12 16:04:40.000000000 -0800 +@@ -287,7 +287,7 @@ perditiondb_bdb.h libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0 --libperditiondb_bdb_la_LIBADD = -ldb -+libperditiondb_bdb_la_LIBADD = -ldb3 +-libperditiondb_bdb_la_LIBADD = -ldb -lvanessa_logger -lvanessa_adt ++libperditiondb_bdb_la_LIBADD = -ldb3 -lvanessa_logger -lvanessa_adt INCLUDES = \ -I$(top_srcdir)/ \ -I$(top_srcdir)/perdition \ Index: files/patch-perdition-db-ldap-Makefile.in =================================================================== --- files/patch-perdition-db-ldap-Makefile.in (revision 308812) +++ files/patch-perdition-db-ldap-Makefile.in (working copy) @@ -1,13 +1,11 @@ ---- perdition/db/ldap/Makefile.in.orig Tue Dec 6 15:59:30 2005 -+++ perdition/db/ldap/Makefile.in Tue Dec 6 16:04:27 2005 -@@ -545,8 +545,8 @@ - "$(DESTDIR)@ldap_schemadir@"; \ - fi; \ - if test -w "$(DESTDIR)@ldap_schemadir@"; then \ -- install -m644 $< \ -- "$(DESTDIR)@ldap_schemadir@/perdition.schema";\ -+ install -m644 $(schema_sources) \ -+ "$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\ - fi \ - fi +--- perdition/db/ldap/Makefile.in.orig 2012-03-20 05:08:04.000000000 -0700 ++++ perdition/db/ldap/Makefile.in 2012-12-12 16:50:02.000000000 -0800 +@@ -864,7 +864,7 @@ + @LDAP_SCHEMA_TRUE@ test -n "@ldap_schemadir@" + @LDAP_SCHEMA_TRUE@ mkdir -p "$(DESTDIR)@ldap_schemadir@" + @LDAP_SCHEMA_TRUE@ chmod 755 "$(DESTDIR)@ldap_schemadir@" +-@LDAP_SCHEMA_TRUE@ install -m 644 $< "$(DESTDIR)@ldap_schemadir@/" ++@LDAP_SCHEMA_TRUE@ for p in $< ; do $(am__strip_dir) install -m 644 $$p "$(DESTDIR)@ldap_schemadir@/$$f-dist" ; done + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Index: files/patch-perdition-db-posix_regex-Makefile.in =================================================================== --- files/patch-perdition-db-posix_regex-Makefile.in (revision 308812) +++ files/patch-perdition-db-posix_regex-Makefile.in (working copy) @@ -1,23 +1,23 @@ ---- perdition/db/posix_regex/Makefile.in.orig 2007-11-02 15:53:56.000000000 +0100 -+++ perdition/db/posix_regex/Makefile.in 2007-11-02 15:55:31.000000000 +0100 -@@ -355,16 +355,16 @@ - @list='$(conf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \ -- $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \ -+ echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f-dist'"; \ -+ $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f-dist"; \ +--- perdition/db/posix_regex/Makefile.in.orig 2012-03-20 05:08:06.000000000 -0700 ++++ perdition/db/posix_regex/Makefile.in 2012-12-12 16:47:41.000000000 -0800 +@@ -414,14 +414,17 @@ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \ ++ for p in $$files; do \ ++ $(am__strip_dir) \ ++ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \ ++ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \ ++ done ; \ done uninstall-confDATA: @$(NORMAL_UNINSTALL) - @list='$(conf_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(confdir)/$$f"; \ -+ echo " rm -f '$(DESTDIR)$(confdir)/$$f-dist'"; \ -+ rm -f "$(DESTDIR)$(confdir)/$$f-dist"; \ - done - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + @list='$(conf_DATA)'; test -n "$(confdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(confdir)" && rm -f $$files Index: pkg-plist =================================================================== --- pkg-plist (revision 308812) +++ pkg-plist (working copy) @@ -9,11 +9,6 @@ etc/perdition/popmap-dist etc/perdition/Makefile.popmap-dist etc/perdition/Makefile -include/jain.h -lib/libjain.so.0 -lib/libjain.so -lib/libjain.la -lib/libjain.a %%BDB%%lib/libperditiondb_bdb.so.0 %%BDB%%lib/libperditiondb_bdb.so %%BDB%%lib/libperditiondb_bdb.la --- perdition-1.18.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212130941.qBD9fNcf006954>