- Security update to 1.17.1

PR:		ports/117796
Submitted by:	Thomas Vogt <thomas@bsdunix.ch> (maintainer)
Approved by:	portmgr (pav), linimon (mentor)
Security:	http://www.sec-consult.com/300.html
This commit is contained in:
Beech Rintoul 2007-11-06 11:08:18 +00:00
parent 02580b2f51
commit e647e3e6c2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202542
10 changed files with 75 additions and 91 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= perdition PORTNAME= perdition
PORTVERSION= 1.17 PORTVERSION= 1.17.1
CATEGORIES= mail net security CATEGORIES= mail net security
MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/ MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
@ -31,7 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR} MAKE_ENV+= DOCSDIR=${DOCSDIR}
CONFIGURE_ARGS+= --disable-daemon-map CONFIGURE_ARGS+= --disable-daemon-map
INSTALLS_SHLIB= yes USE_LDCONFIG= yes
## ##
## Available knobs: ## Available knobs:
@ -122,7 +122,9 @@ PLIST_SUB+= PGSQL="@comment "
.if defined(WITH_OPENLDAP) .if defined(WITH_OPENLDAP)
USE_OPENLDAP= YES USE_OPENLDAP= YES
CONFIGURE_ARGS+= --enable-ldap --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ CONFIGURE_ARGS+= --enable-ldap \
--with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \
--disable-ldap-doc
PLIST_SUB+= OPENLDAP="" PLIST_SUB+= OPENLDAP=""
MAN8+= perditiondb_ldap_makedb.8 MAN8+= perditiondb_ldap_makedb.8
.else .else

View file

@ -1,3 +1,3 @@
MD5 (perdition-1.17.tar.gz) = 6cef90e55bde9eb2d0a17acccb3516f3 MD5 (perdition-1.17.1.tar.gz) = 5464c517f8be810519b6187b694c9d98
SHA256 (perdition-1.17.tar.gz) = 38f1bfe1cb7db8b16fc6a3febc293460b6a5ae49312c6a08b757c89b1ae73879 SHA256 (perdition-1.17.1.tar.gz) = e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26
SIZE (perdition-1.17.tar.gz) = 552149 SIZE (perdition-1.17.1.tar.gz) = 638162

View file

@ -1,11 +1,11 @@
--- etc/Makefile.in.orig Wed Jun 22 06:32:39 2005 --- etc/Makefile.in.orig 2007-11-02 15:37:51.000000000 +0100
+++ etc/Makefile.in Mon Dec 19 09:31:41 2005 +++ etc/Makefile.in 2007-11-02 15:38:45.000000000 +0100
@@ -137,7 +137,7 @@ @@ -78,7 +78,7 @@
distclean-recursive maintainer-clean-recursive
@PAM_BUILD_TRUE@PAM_DIR = pam.d ETAGS = etags
CTAGS = ctags
-SUBDIRS = perdition $(PAM_DIR) rc.d sysconfig -DIST_SUBDIRS = perdition pam.d rc.d sysconfig
+SUBDIRS = perdition +DIST_SUBDIRS = perdition
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
EXTRA_DIST = ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@

View file

@ -1,18 +1,23 @@
--- etc/perdition/Makefile.in.orig Sun Jun 15 19:07:06 2003 --- etc/perdition/Makefile.in.orig 2007-11-02 15:40:32.000000000 +0100
+++ etc/perdition/Makefile.in Sun Jun 15 19:07:13 2003 +++ etc/perdition/Makefile.in 2007-11-02 15:45:43.000000000 +0100
@@ -169,11 +169,11 @@ @@ -259,16 +259,16 @@
$(mkinstalldirs) $(DESTDIR)$(perditionconfdir)
@list='$(perditionconf_DATA)'; for p in $$list; do \ @list='$(perditionconf_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p"; \ f=$(am__strip_dir) \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p; \ - echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f'"; \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist"; \ - $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist; \ + echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
else if test -f $$p; then \ + $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \
- 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; \
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:

View file

@ -1,11 +1,11 @@
--- makebdb/Makefile.in.orig Sun Jun 15 18:30:18 2003 --- makebdb/Makefile.in.orig 2007-11-02 15:47:34.000000000 +0100
+++ makebdb/Makefile.in Sun Jun 15 18:30:35 2003 +++ makebdb/Makefile.in 2007-11-02 15:48:33.000000000 +0100
@@ -145,7 +145,7 @@ @@ -231,7 +231,7 @@
makebdb_SOURCES = makebdb.c options.c options.h 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_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 INCLUDES = -I$(top_srcdir)/libjain

View file

@ -1,11 +1,11 @@
--- perdition/db/bdb/Makefile.in.orig Tue Dec 6 15:56:55 2005 --- perdition/db/bdb/Makefile.in.orig 2007-11-02 15:49:39.000000000 +0100
+++ perdition/db/bdb/Makefile.in Tue Dec 6 15:57:17 2005 +++ perdition/db/bdb/Makefile.in 2007-11-02 15:50:20.000000000 +0100
@@ -142,7 +142,7 @@ @@ -235,7 +235,7 @@
perditiondb_bdb.h
libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0 libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
-libperditiondb_bdb_la_LIBADD = -ldb -libperditiondb_bdb_la_LIBADD = -ldb
+libperditiondb_bdb_la_LIBADD = -ldb3 +libperditiondb_bdb_la_LIBADD = -ldb3
INCLUDES = \
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/perdition -I$(top_srcdir)/libjain -DPERDITIONDB_BDB_SYSCONFDIR=\"$(sysconfdir)/perdition\" @ssl_includes@ -I$(top_srcdir)/ \
-I$(top_srcdir)/perdition \

View file

@ -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

View file

@ -1,18 +1,23 @@
--- perdition/db/posix_regex/Makefile.in.orig Tue Dec 6 16:05:43 2005 --- perdition/db/posix_regex/Makefile.in.orig 2007-11-02 15:53:56.000000000 +0100
+++ perdition/db/posix_regex/Makefile.in Tue Dec 6 16:08:04 2005 +++ perdition/db/posix_regex/Makefile.in 2007-11-02 15:55:31.000000000 +0100
@@ -269,11 +269,11 @@ @@ -355,16 +355,16 @@
$(mkinstalldirs) $(DESTDIR)$(confdir)
@list='$(conf_DATA)'; for p in $$list; do \ @list='$(conf_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p"; \ f=$(am__strip_dir) \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p; \ - echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist"; \ - $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist; \ + echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f-dist'"; \
else if test -f $$p; then \ + $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f-dist"; \
- 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; \
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)

View file

@ -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

View file

@ -9,6 +9,7 @@ etc/perdition/perdition.conf-dist
etc/perdition/popmap-dist etc/perdition/popmap-dist
etc/perdition/Makefile.popmap-dist etc/perdition/Makefile.popmap-dist
etc/perdition/Makefile etc/perdition/Makefile
etc/pam.d/perdition
include/jain.h include/jain.h
lib/libjain.so.0 lib/libjain.so.0
lib/libjain.so lib/libjain.so