diff options
Diffstat (limited to 'mail/perdition/files')
7 files changed, 67 insertions, 86 deletions
diff --git a/mail/perdition/files/patch-etc-Makefile.in b/mail/perdition/files/patch-etc-Makefile.in index e648e4e103de..7f5b47c5e7da 100644 --- a/mail/perdition/files/patch-etc-Makefile.in +++ b/mail/perdition/files/patch-etc-Makefile.in @@ -1,11 +1,11 @@ ---- etc/Makefile.in.orig Wed Jun 22 06:32:39 2005 -+++ etc/Makefile.in Mon Dec 19 09:31:41 2005 -@@ -137,7 +137,7 @@ - - @PAM_BUILD_TRUE@PAM_DIR = pam.d - --SUBDIRS = perdition $(PAM_DIR) rc.d sysconfig -+SUBDIRS = perdition - - EXTRA_DIST = - +--- etc/Makefile.in.orig 2007-11-02 15:37:51.000000000 +0100 ++++ etc/Makefile.in 2007-11-02 15:38:45.000000000 +0100 +@@ -78,7 +78,7 @@ + distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = perdition pam.d rc.d sysconfig ++DIST_SUBDIRS = perdition + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ diff --git a/mail/perdition/files/patch-etc-perdition-Makefile.in b/mail/perdition/files/patch-etc-perdition-Makefile.in index d46c01ec9e5b..c655aa0612d3 100644 --- a/mail/perdition/files/patch-etc-perdition-Makefile.in +++ b/mail/perdition/files/patch-etc-perdition-Makefile.in @@ -1,18 +1,23 @@ ---- etc/perdition/Makefile.in.orig Sun Jun 15 19:07:06 2003 -+++ etc/perdition/Makefile.in Sun Jun 15 19:07:13 2003 -@@ -169,11 +169,11 @@ - $(mkinstalldirs) $(DESTDIR)$(perditionconfdir) +--- 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 $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p-dist"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p-dist; \ - fi; fi; \ + 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"; \ 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: diff --git a/mail/perdition/files/patch-makebdb-Makefile.in b/mail/perdition/files/patch-makebdb-Makefile.in index 72a418893844..082c9b7d57d5 100644 --- a/mail/perdition/files/patch-makebdb-Makefile.in +++ b/mail/perdition/files/patch-makebdb-Makefile.in @@ -1,11 +1,11 @@ ---- makebdb/Makefile.in.orig Sun Jun 15 18:30:18 2003 -+++ makebdb/Makefile.in Sun Jun 15 18:30:35 2003 -@@ -145,7 +145,7 @@ - makebdb_SOURCES = makebdb.c options.c options.h - - --makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt @dmalloc_lib@ -+makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt @dmalloc_lib@ - +--- 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 @@ + options.c \ + options.h + +-makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt \ ++makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt \ + @dmalloc_lib@ INCLUDES = -I$(top_srcdir)/libjain diff --git a/mail/perdition/files/patch-perdition-db-bdb-Makefile.in b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in index 55679148906e..669d77dbf1a2 100644 --- a/mail/perdition/files/patch-perdition-db-bdb-Makefile.in +++ b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in @@ -1,11 +1,11 @@ ---- perdition/db/bdb/Makefile.in.orig Tue Dec 6 15:56:55 2005 -+++ perdition/db/bdb/Makefile.in Tue Dec 6 15:57:17 2005 -@@ -142,7 +142,7 @@ +--- 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 @@ + perditiondb_bdb.h libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0 - -libperditiondb_bdb_la_LIBADD = -ldb +libperditiondb_bdb_la_LIBADD = -ldb3 - - INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/perdition -I$(top_srcdir)/libjain -DPERDITIONDB_BDB_SYSCONFDIR=\"$(sysconfdir)/perdition\" @ssl_includes@ - + INCLUDES = \ + -I$(top_srcdir)/ \ + -I$(top_srcdir)/perdition \ diff --git a/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap b/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap deleted file mode 100644 index 6da3393089bc..000000000000 --- a/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap +++ /dev/null @@ -1,18 +0,0 @@ ---- perdition/db/ldap/perditiondb_ldap.c.orig Tue Dec 6 22:32:57 2005 -+++ perdition/db/ldap/perditiondb_ldap.c Tue Dec 6 22:38:31 2005 -@@ -334,9 +334,12 @@ - } - - /* Open LDAP connection */ --#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000) -- if (ldap_initialize(&connection, pldap_filter) != LDAP_SUCCESS) { -- VANESSA_LOGGER_DEBUG_ERRNO("ldap_initialize"); -+#if 0 -+//#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000) -+ err = ldap_initialize(&connection, pldap_filter); -+ if (err != LDAP_SUCCESS) { -+ VANESSA_LOGGER_DEBUG_UNSAFE("ldap_initialize: %s", -+ ldap_err2string(err)); - goto leave; - } - #else diff --git a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in index 1672be3d1e38..eee89ef3705f 100644 --- a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in +++ b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in @@ -1,18 +1,23 @@ ---- perdition/db/posix_regex/Makefile.in.orig Tue Dec 6 16:05:43 2005 -+++ perdition/db/posix_regex/Makefile.in Tue Dec 6 16:08:04 2005 -@@ -269,11 +269,11 @@ - $(mkinstalldirs) $(DESTDIR)$(confdir) +--- 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 $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p-dist"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p-dist; \ - fi; fi; \ + 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"; \ 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) diff --git a/mail/perdition/files/patch-perdition::db::daemon::Makefile.in b/mail/perdition/files/patch-perdition::db::daemon::Makefile.in deleted file mode 100644 index f7ea51995bfc..000000000000 --- a/mail/perdition/files/patch-perdition::db::daemon::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- perdition/db/daemon/Makefile.in.orig Tue Dec 6 16:10:19 2005 -+++ perdition/db/daemon/Makefile.in Tue Dec 6 16:11:15 2005 -@@ -144,7 +144,7 @@ - libperditiondb_daemon_la_SOURCES = perditiondb_daemon.c perditiondb_daemon.h unix_socket.c unix_socket.h - - libperditiondb_daemon_la_LDFLAGS = -version-info 0:0:0 --libperditiondb_daemon_la_LIBADD = -ldb -L. -lperditiondb_daemon_packet -+libperditiondb_daemon_la_LIBADD = -lgdbm -L. -lperditiondb_daemon_packet - - noinst_PROGRAMS = client server - |