pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2015Q1]: pkgsrc/mail/dovecot2 Pullup ticket #4714 - requested ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b05f83f5bc87
branches:  pkgsrc-2015Q1
changeset: 649239:b05f83f5bc87
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Fri May 15 12:40:49 2015 +0000

description:
Pullup ticket #4714 - requested by taca
mail/dovecot2: security fix

Revisions pulled up:
- mail/dovecot2/Makefile                                        1.73-1.75
- mail/dovecot2/distinfo                                        1.54
- mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c 1.1

---
   Module Name: pkgsrc
   Committed By:        adam
   Date:                Mon Apr  6 08:17:41 UTC 2015

   Modified Files:
        pkgsrc/audio/amarok-kde3: Makefile
        pkgsrc/audio/ario: Makefile
        pkgsrc/audio/bmpx: Makefile
        pkgsrc/audio/cddb-bundle: Makefile
        pkgsrc/audio/cdplayer: Makefile
        pkgsrc/audio/glyr: Makefile
        pkgsrc/audio/gmpc: Makefile
        pkgsrc/audio/gmpc-jamendo: Makefile
        pkgsrc/audio/gmpc-magnatune: Makefile
        pkgsrc/audio/gmpc-wikipedia: Makefile
        pkgsrc/audio/kid3: Makefile
        pkgsrc/audio/libgpod: Makefile
        pkgsrc/audio/musicpd: Makefile
        pkgsrc/audio/rhythmbox: Makefile
        pkgsrc/audio/rhythmbox-gtk3: Makefile
        pkgsrc/audio/sound-juicer: Makefile
        pkgsrc/chat/empathy: Makefile buildlink3.mk
        pkgsrc/chat/gnomeicu: Makefile
        pkgsrc/chat/hexchat: Makefile
        pkgsrc/chat/inspircd: Makefile
        pkgsrc/chat/inspircd12: Makefile
        pkgsrc/chat/jabberd2: Makefile
        pkgsrc/chat/spectrum: Makefile
        pkgsrc/chat/telepathy-gabble: Makefile
        pkgsrc/chat/telepathy-logger: Makefile buildlink3.mk
        pkgsrc/comms/asterisk: Makefile
        pkgsrc/comms/asterisk10: Makefile
        pkgsrc/comms/asterisk18: Makefile
        pkgsrc/comms/gnome-pilot: Makefile buildlink3.mk
        pkgsrc/comms/libopensync: Makefile buildlink3.mk
        pkgsrc/comms/libopensync-plugin-evolution2: Makefile
        pkgsrc/comms/libopensync-plugin-file: Makefile
        pkgsrc/comms/libopensync-plugin-kdepim: Makefile
        pkgsrc/comms/libopensync-plugin-syncml: Makefile
        pkgsrc/comms/msynctool: Makefile
        pkgsrc/comms/multisync-gui: Makefile
        pkgsrc/converters/libcdr: Makefile buildlink3.mk
        pkgsrc/converters/libe-book: Makefile
        pkgsrc/converters/libmspub: Makefile
        pkgsrc/converters/libvisio: Makefile buildlink3.mk
        pkgsrc/converters/pyzy: Makefile buildlink3.mk
        pkgsrc/databases/couchdb: Makefile
        pkgsrc/databases/deforaos-libdatabase: Makefile
        pkgsrc/databases/idzebra: Makefile buildlink3.mk
        pkgsrc/databases/krecipes: Makefile
        pkgsrc/databases/libdbi-driver-sqlite3: Makefile
        pkgsrc/databases/lua-sqlite3: Makefile
        pkgsrc/databases/mysql-workbench: Makefile
        pkgsrc/databases/ocaml-sqlite3: Makefile
        pkgsrc/databases/p5-DBD-SQLite: Makefile
        pkgsrc/databases/php-pdo_sqlite: Makefile
        pkgsrc/databases/poco-data-sqlite: Makefile buildlink3.mk
        pkgsrc/databases/py-apsw: Makefile
        pkgsrc/databases/py-sqlite2: Makefile
        pkgsrc/databases/py-sqlite3: Makefile
        pkgsrc/databases/qore-sqlite3-module: Makefile
        pkgsrc/databases/ruby-do_sqlite3: Makefile
        pkgsrc/databases/ruby-sqlite3: Makefile
        pkgsrc/databases/soci: Makefile
        pkgsrc/databases/sqlite3: Makefile buildlink3.mk
        pkgsrc/databases/sqlite3-tcl: Makefile
        pkgsrc/databases/sqlrelay-sqlite: Makefile
        pkgsrc/databases/vsqlite++: Makefile buildlink3.mk
        pkgsrc/devel/Gorm: Makefile
        pkgsrc/devel/ObjectiveLib: Makefile
        pkgsrc/devel/ProjectCenter: Makefile
        pkgsrc/devel/Renaissance: Makefile buildlink3.mk
        pkgsrc/devel/SOPE: Makefile
        pkgsrc/devel/appdata-tools: Makefile
        pkgsrc/devel/apr-util: Makefile
        pkgsrc/devel/compizconfig-backend-gconf: Makefile
        pkgsrc/devel/cutter: Makefile
        pkgsrc/devel/devhelp: Makefile
        pkgsrc/devel/edcommon: Makefile
        pkgsrc/devel/frama-c: Makefile
        pkgsrc/devel/gearmand: Makefile
        pkgsrc/devel/global: Makefile
        pkgsrc/devel/gnustep-base: Makefile buildlink3.mk
        pkgsrc/devel/gnustep-examples: Makefile
        pkgsrc/devel/java-subversion: Makefile
        pkgsrc/devel/kdesdk-kioslaves: Makefile
        pkgsrc/devel/kdesdk3: Makefile
        pkgsrc/devel/kdevelop-base: Makefile
        pkgsrc/devel/kdevelop4: Makefile
        pkgsrc/devel/kdevplatform: Makefile
        pkgsrc/devel/kyua: Makefile
        pkgsrc/devel/libcompizconfig: Makefile
        pkgsrc/devel/libgail-gnome: Makefile buildlink3.mk
        pkgsrc/devel/libgweather: Makefile buildlink3.mk
        pkgsrc/devel/libthrift: Makefile
        pkgsrc/devel/mono-addins: Makefile buildlink3.mk
        pkgsrc/devel/mono-tools: Makefile
        pkgsrc/devel/monodevelop: Makefile buildlink3.mk
        pkgsrc/devel/monodevelop-database: Makefile
        pkgsrc/devel/monotone: Makefile
        pkgsrc/devel/monotone-viz: Makefile
        pkgsrc/devel/nant: Makefile
        pkgsrc/devel/nss: Makefile
        pkgsrc/devel/ocamlgraph: Makefile
        pkgsrc/devel/opengrok: Makefile
        pkgsrc/devel/p5-subversion: Makefile
        pkgsrc/devel/py-compizconfig: Makefile
        pkgsrc/devel/py-pysvn: Makefile
        pkgsrc/devel/py-subversion: Makefile
        pkgsrc/devel/py-subvertpy: Makefile
        pkgsrc/devel/rapidsvn: Makefile
        pkgsrc/devel/redmine: Makefile
        pkgsrc/devel/ruby-subversion: Makefile
        pkgsrc/devel/startbug1: Makefile
        pkgsrc/devel/subversion-base: Makefile buildlink3.mk
        pkgsrc/devel/xulrunner10: Makefile
        pkgsrc/devel/xulrunner17: Makefile
        pkgsrc/devel/xulrunner192: Makefile
        pkgsrc/devel/xulrunner31: Makefile
        pkgsrc/editors/Sigil: Makefile
        pkgsrc/editors/emacs-snapshot: Makefile
        pkgsrc/editors/emacs23: Makefile
        pkgsrc/editors/emacs24: Makefile
        pkgsrc/editors/texmaker: Makefile
        pkgsrc/editors/tomboy: Makefile
        pkgsrc/emulators/ckmame: Makefile
        pkgsrc/emulators/mame: Makefile
        pkgsrc/emulators/mess: Makefile
        pkgsrc/filesystems/fuse-svnfs: Makefile
        pkgsrc/finance/gnucash: Makefile
        pkgsrc/finance/kmymoney2: Makefile
        pkgsrc/fonts/harfbuzz: Makefile
        pkgsrc/games/gbrainy: Makefile
        pkgsrc/games/gcompris: Makefile
        pkgsrc/games/kajongg: Makefile
        pkgsrc/games/openttd: Makefile
        pkgsrc/geography/emerillon: Makefile
        pkgsrc/geography/gama: Makefile
        pkgsrc/geography/gdal-lib: Makefile
        pkgsrc/geography/libchamplain04: Makefile buildlink3.mk
        pkgsrc/geography/libchamplain06: Makefile buildlink3.mk
        pkgsrc/geography/libchamplain08: Makefile buildlink3.mk
        pkgsrc/graphics/Cenon: Makefile
        pkgsrc/graphics/ImageViewer: Makefile
        pkgsrc/graphics/camlimages: Makefile
        pkgsrc/graphics/cheese: Makefile
        pkgsrc/graphics/darktable: Makefile
        pkgsrc/graphics/digikam-kde3: Makefile
        pkgsrc/graphics/eog-plugins-map: Makefile
        pkgsrc/graphics/f-spot: Makefile
        pkgsrc/graphics/geeqie: Makefile
        pkgsrc/graphics/inkscape: Makefile
        pkgsrc/graphics/shotwell: Makefile
        pkgsrc/inputmethod/ibus-array: Makefile
        pkgsrc/inputmethod/ibus-chewing: Makefile
        pkgsrc/inputmethod/ibus-libpinyin: Makefile
        pkgsrc/inputmethod/ibus-pinyin: Makefile
        pkgsrc/inputmethod/ibus-qt: Makefile
        pkgsrc/inputmethod/im-ja: Makefile
        pkgsrc/inputmethod/imhangul_status_applet: Makefile
        pkgsrc/inputmethod/libchewing: Makefile buildlink3.mk
        pkgsrc/inputmethod/qt5-uim: Makefile
        pkgsrc/inputmethod/scim-chewing: Makefile
        pkgsrc/inputmethod/uim: Makefile
        pkgsrc/inputmethod/uim-chewing: Makefile
        pkgsrc/lang/basic256: Makefile
        pkgsrc/lang/coq: Makefile
        pkgsrc/lang/konoha: Makefile
        pkgsrc/lang/mono: Makefile buildlink3.mk
        pkgsrc/lang/mono-basic: Makefile
        pkgsrc/lang/mono2: Makefile buildlink3.mk
        pkgsrc/lang/nqp: Makefile buildlink3.mk
        pkgsrc/lang/parrot: Makefile buildlink3.mk
        pkgsrc/lang/racket: Makefile
        pkgsrc/lang/rakudo-star: Makefile buildlink3.mk
        pkgsrc/lang/smalltalk: Makefile
        pkgsrc/lang/spl: Makefile
        pkgsrc/mail/GNUMail: Makefile
        pkgsrc/mail/Pantomime: Makefile buildlink3.mk
        pkgsrc/mail/akonadi: Makefile
        pkgsrc/mail/balsa: Makefile
        pkgsrc/mail/bogofilter: Makefile
        pkgsrc/mail/cyrus-imapd23: Makefile
        pkgsrc/mail/cyrus-imapd24: Makefile
        pkgsrc/mail/dbmail: Makefile
        pkgsrc/mail/dovecot: Makefile
        pkgsrc/mail/dovecot2: Makefile
        pkgsrc/mail/dspam: Makefile
        pkgsrc/mail/evolution: Makefile buildlink3.mk
        pkgsrc/mail/evolution-data-server: Makefile buildlink3.mk
        pkgsrc/mail/evolution-exchange: Makefile
        pkgsrc/mail/exim: Makefile
        pkgsrc/mail/postfix: Makefile
        pkgsrc/mail/rspamd: Makefile
        pkgsrc/mail/thunderbird: Makefile
        pkgsrc/meta-pkgs/boost: Makefile
        pkgsrc/meta-pkgs/gnustep: Makefile
        pkgsrc/misc/Addresses: Makefile buildlink3.mk
        pkgsrc/misc/bibletime: Makefile
        pkgsrc/misc/calibre: Makefile
        pkgsrc/misc/calibre1: Makefile
        pkgsrc/misc/deskbar-applet: Makefile
        pkgsrc/misc/gnome-utils: Makefile
        pkgsrc/misc/kchmviewer: Makefile
        pkgsrc/misc/kdepim3: Makefile
        pkgsrc/misc/libreoffice4: Makefile
        pkgsrc/misc/mousetweaks: Makefile
        pkgsrc/misc/openoffice3: Makefile
        pkgsrc/misc/sword: Makefile buildlink3.mk
        pkgsrc/misc/tellico: Makefile
        pkgsrc/misc/tellico-kde3: Makefile
        pkgsrc/misc/yelp3: Makefile
        pkgsrc/multimedia/farsight2: Makefile
        pkgsrc/multimedia/fuppes: Makefile
        pkgsrc/multimedia/mediatomb: Makefile
        pkgsrc/multimedia/minidlna: Makefile
        pkgsrc/multimedia/mlt: Makefile
        pkgsrc/multimedia/swfdec: Makefile buildlink3.mk
        pkgsrc/multimedia/swfdec-gnome: Makefile
        pkgsrc/multimedia/swfdec-mozilla: Makefile
        pkgsrc/multimedia/totem: Makefile
        pkgsrc/multimedia/totem-browser-plugin: Makefile
        pkgsrc/multimedia/totem-nautilus: Makefile
        pkgsrc/multimedia/totem-pl-parser: Makefile buildlink3.mk
        pkgsrc/net/aria2: Makefile
        pkgsrc/net/avahi: Makefile
        pkgsrc/net/bug-buddy: Makefile
        pkgsrc/net/corebird: Makefile
        pkgsrc/net/dcsharp: Makefile
        pkgsrc/net/ekiga: Makefile
        pkgsrc/net/filezilla: Makefile
        pkgsrc/net/gnome-netstatus: Makefile
        pkgsrc/net/grilo: Makefile buildlink3.mk
        pkgsrc/net/grilo-plugins: Makefile
        pkgsrc/net/grilo-testui: Makefile
        pkgsrc/net/gssdp: Makefile buildlink3.mk
        pkgsrc/net/gst-plugins0.10-soup: Makefile
        pkgsrc/net/gst-plugins1-libnice: Makefile
        pkgsrc/net/gst-plugins1-soup: Makefile
        pkgsrc/net/gupnp: Makefile buildlink3.mk
        pkgsrc/net/gupnp-av: Makefile buildlink3.mk
        pkgsrc/net/gupnp-dlna: Makefile buildlink3.mk
        pkgsrc/net/gupnp-igd: Makefile buildlink3.mk
        pkgsrc/net/gupnp-tools: Makefile
        pkgsrc/net/kget: Makefile
        pkgsrc/net/kopete: Makefile
        pkgsrc/net/libdmapsharing: Makefile
        pkgsrc/net/libdmapsharing3: Makefile buildlink3.mk
        pkgsrc/net/libgdata: Makefile buildlink3.mk
        pkgsrc/net/libnice: Makefile buildlink3.mk
        pkgsrc/net/libsoup24: Makefile buildlink3.mk
        pkgsrc/net/logjam: Makefile
        pkgsrc/net/mldonkey-gui: Makefile
        pkgsrc/net/mono-nat: Makefile buildlink3.mk
        pkgsrc/net/monotorrent: Makefile buildlink3.mk
        pkgsrc/net/monsoon: Makefile
        pkgsrc/net/ocamlnet: Makefile
        pkgsrc/net/ocsync: Makefile buildlink3.mk
        pkgsrc/net/owncloudclient: Makefile
        pkgsrc/net/p5-Net-Z3950-ZOOM: Makefile
        pkgsrc/net/php-yaz: Makefile
        pkgsrc/net/powerdns: Makefile
        pkgsrc/net/transmission-qt: Makefile
        pkgsrc/net/tsclient: Makefile
        pkgsrc/net/twitux: Makefile
        pkgsrc/net/unison: Makefile
        pkgsrc/net/unison2.32: Makefile
        pkgsrc/net/unison2.40: Makefile
        pkgsrc/net/vinagre: Makefile
        pkgsrc/net/vino: Makefile
        pkgsrc/net/yaz: Makefile buildlink3.mk
        pkgsrc/news/tin: Makefile
        pkgsrc/pkgtools/gnome-packagekit: Makefile
        pkgsrc/pkgtools/packagekit: Makefile buildlink3.mk
        pkgsrc/pkgtools/pkgin: Makefile
        pkgsrc/print/advi: Makefile
        pkgsrc/print/glabels: Makefile
        pkgsrc/print/pdfmod: Makefile
        pkgsrc/print/poppler-qt5: Makefile
        pkgsrc/print/xetex: Makefile
        pkgsrc/security/cy2-sql: Makefile
        pkgsrc/security/gnome-keyring-sharp: Makefile
        pkgsrc/security/heimdal: Makefile buildlink3.mk
        pkgsrc/security/hydra: Makefile
        pkgsrc/security/libpreludedb-sqlite3: Makefile
        pkgsrc/security/opendnssec: Makefile
        pkgsrc/security/seahorse: Makefile
        pkgsrc/security/seahorse-plugins: Makefile
        pkgsrc/security/softhsm: Makefile buildlink3.mk
        pkgsrc/sysutils/bacula: Makefile
        pkgsrc/sysutils/brasero: Makefile buildlink3.mk
        pkgsrc/sysutils/brasero-nautilus: Makefile
        pkgsrc/sysutils/burn: Makefile
        pkgsrc/sysutils/dbus-sharp: Makefile buildlink3.mk
        pkgsrc/sysutils/dbus-sharp-glib: Makefile buildlink3.mk
        pkgsrc/sysutils/gnome-power-manager: Makefile
        pkgsrc/sysutils/gvfs: Makefile
        pkgsrc/sysutils/gworkspace: Makefile
        pkgsrc/sysutils/nautilus-sendto: Makefile
        pkgsrc/sysutils/ndesk-dbus: Makefile
        pkgsrc/sysutils/ndesk-dbus-glib: Makefile buildlink3.mk
        pkgsrc/sysutils/open-vm-tools: Makefile
        pkgsrc/textproc/OdfConverter: Makefile
        pkgsrc/textproc/gnome-subtitles: Makefile
        pkgsrc/textproc/mdocml: Makefile
        pkgsrc/textproc/php-intl: Makefile
        pkgsrc/textproc/sublib: Makefile buildlink3.mk
        pkgsrc/time/evolution-webcal: Makefile
        pkgsrc/time/fet: Makefile
        pkgsrc/time/gtodo-applet: Makefile
        pkgsrc/wm/compiz: Makefile buildlink3.mk
        pkgsrc/wm/compiz-fusion-plugins-extra: Makefile
        pkgsrc/wm/compiz-fusion-plugins-main: Makefile
        pkgsrc/www/SOGo: Makefile
        pkgsrc/www/ap-mono: Makefile
        pkgsrc/www/ap2-subversion: Makefile
        pkgsrc/www/cppcms: Makefile
        pkgsrc/www/deforaos-surfer: Makefile
        pkgsrc/www/epiphany: Makefile buildlink3.mk
        pkgsrc/www/epiphany-extensions: Makefile
        pkgsrc/www/firefox: Makefile
        pkgsrc/www/firefox10: Makefile
        pkgsrc/www/firefox17: Makefile
        pkgsrc/www/firefox24: Makefile
        pkgsrc/www/firefox31: Makefile
        pkgsrc/www/firefox36: Makefile
        pkgsrc/www/gtkhtml314: Makefile
        pkgsrc/www/kazehakase: Makefile
        pkgsrc/www/librest: Makefile buildlink3.mk
        pkgsrc/www/librest07: Makefile buildlink3.mk
        pkgsrc/www/liferea: Makefile
        pkgsrc/www/midori: Makefile
        pkgsrc/www/mono-xsp: Makefile buildlink3.mk
        pkgsrc/www/seamonkey: Makefile
        pkgsrc/www/webkit-gtk: Makefile buildlink3.mk
        pkgsrc/www/webkit1-gtk: Makefile buildlink3.mk
        pkgsrc/www/webkit1-gtk3: Makefile buildlink3.mk
        pkgsrc/x11/fast-user-switch-applet: Makefile
        pkgsrc/x11/gnome-applets: Makefile
        pkgsrc/x11/gnome-control-center: Makefile buildlink3.mk
        pkgsrc/x11/gnome-desktop-sharp: Makefile buildlink3.mk
        pkgsrc/x11/gnome-panel: Makefile buildlink3.mk
        pkgsrc/x11/gnome-session: Makefile
        pkgsrc/x11/gnome-sharp: Makefile buildlink3.mk
        pkgsrc/x11/gnustep-back: Makefile buildlink3.mk
        pkgsrc/x11/gnustep-gui: Makefile buildlink3.mk
        pkgsrc/x11/gnustep-preferences: Makefile
        pkgsrc/x11/grandr_applet: Makefile
        pkgsrc/x11/gtk-sharp: Makefile
        pkgsrc/x11/gtksourceview-sharp2: Makefile
        pkgsrc/x11/hyena: Makefile
        pkgsrc/x11/ocaml-lablgtk: Makefile buildlink3.mk
        pkgsrc/x11/py-gnome2-desktop: Makefile
        pkgsrc/x11/py-qt5: Makefile
        pkgsrc/x11/qt4-sqlite3: Makefile
        pkgsrc/x11/qt5-dbus: Makefile buildlink3.mk
        pkgsrc/x11/qt5-mysql: Makefile buildlink3.mk
        pkgsrc/x11/qt5-odbc: Makefile buildlink3.mk
        pkgsrc/x11/qt5-psql: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtbase: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtdeclarative: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtdoc: Makefile
        pkgsrc/x11/qt5-qtgraphicaleffects: Makefile
        pkgsrc/x11/qt5-qtimageformats: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtlocation: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtmacextras: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtmultimedia: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtquick1: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtquickcontrols: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtscript: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtsensors: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtserialport: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtsvg: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qttools: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qttranslations: Makefile
        pkgsrc/x11/qt5-qtwebchannel: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtwebkit: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtwebsockets: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtx11extras: Makefile buildlink3.mk
        pkgsrc/x11/qt5-qtxmlpatterns: Makefile buildlink3.mk
        pkgsrc/x11/qt5-sqlite3: Makefile buildlink3.mk

   Log Message:
   Revbump after updating textproc/icu

---
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Thu Apr 23 09:27:31 UTC 2015

   Modified Files:
        pkgsrc/mail/dovecot2: Makefile

   Log Message:
   Explicitly disable inotify on illumos, it is provided for Linux compat only.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun May 10 07:33:49 UTC 2015

   Modified Files:
        pkgsrc/mail/dovecot2: Makefile distinfo
   Added Files:
        pkgsrc/mail/dovecot2/patches:
            patch-src_login-common_ssl-proxy-openssl.c

   Log Message:
   Add fix for CVE-2015-3420.

   Bump PKGREVISION.

diffstat:

 mail/dovecot2/Makefile                                           |   8 +-
 mail/dovecot2/distinfo                                           |   3 +-
 mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c |  55 ++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)

diffs (102 lines):

diff -r fde11fd9ed36 -r b05f83f5bc87 mail/dovecot2/Makefile
--- a/mail/dovecot2/Makefile    Fri May 15 00:17:18 2015 +0000
+++ b/mail/dovecot2/Makefile    Fri May 15 12:40:49 2015 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.72 2015/03/14 10:52:09 adam Exp $
+# $NetBSD: Makefile,v 1.72.2.1 2015/05/15 12:40:49 bsiegert Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).
 
 DISTNAME=      dovecot-2.2.16
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
 
@@ -20,6 +21,11 @@
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-ssldir=${SSLDIR}
 
+OPSYSVARS+=    CONFIGURE_ENV
+
+# Explicitly disable inotify on illumos, it is provided for Linux compat only.
+CONFIGURE_ENV.SunOS+=  ac_cv_func_inotify_init=no
+
 .include "../../mk/bsd.prefs.mk"
 
 RCD_SCRIPTS=           dovecot
diff -r fde11fd9ed36 -r b05f83f5bc87 mail/dovecot2/distinfo
--- a/mail/dovecot2/distinfo    Fri May 15 00:17:18 2015 +0000
+++ b/mail/dovecot2/distinfo    Fri May 15 12:40:49 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2015/03/15 09:19:23 tron Exp $
+$NetBSD: distinfo,v 1.53.2.1 2015/05/15 12:40:49 bsiegert Exp $
 
 SHA1 (dovecot-2.2.16.tar.gz) = 7b267ee939b790ee42809efebc96d6ae78a49432
 RMD160 (dovecot-2.2.16.tar.gz) = 79768b2077137d255a3cfbc492de6d979e594e31
@@ -7,4 +7,5 @@
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
+SHA1 (patch-src_login-common_ssl-proxy-openssl.c) = ae2929851b36a0ac230cbad602851d6d021f0e71
 SHA1 (patch-src_stats_mail-stats.h) = 90645c2aab956a0119630da4b71905db704bffda
diff -r fde11fd9ed36 -r b05f83f5bc87 mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2/patches/patch-src_login-common_ssl-proxy-openssl.c  Fri May 15 12:40:49 2015 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-src_login-common_ssl-proxy-openssl.c,v 1.1.2.2 2015/05/15 12:40:49 bsiegert Exp $
+
+* Fix CVE-2015-3420 from revision 86f535375750 of dovecot-2.2.
+
+--- src/login-common/ssl-proxy-openssl.c.orig  2015-01-29 16:01:15.000000000 +0000
++++ src/login-common/ssl-proxy-openssl.c
+@@ -80,6 +80,7 @@ struct ssl_proxy {
+       unsigned int cert_broken:1;
+       unsigned int client_proxy:1;
+       unsigned int flushing:1;
++      unsigned int failed:1;
+ };
+ 
+ struct ssl_parameters {
+@@ -131,6 +132,12 @@ static void ssl_proxy_ctx_set_crypto_par
+ static int ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set);
+ #endif
+ 
++static void ssl_proxy_destroy_failed(struct ssl_proxy *proxy)
++{
++      proxy->failed = TRUE;
++      ssl_proxy_destroy(proxy);
++}
++
+ static unsigned int ssl_server_context_hash(const struct ssl_server_context *ctx)
+ {
+       unsigned int i, g, h = 0;
+@@ -462,7 +469,7 @@ static void ssl_handle_error(struct ssl_
+ 
+       if (errstr != NULL) {
+               proxy->last_error = i_strdup(errstr);
+-              ssl_proxy_destroy(proxy);
++              ssl_proxy_destroy_failed(proxy);
+       }
+       ssl_proxy_unref(proxy);
+ }
+@@ -492,7 +499,7 @@ static void ssl_handshake(struct ssl_pro
+ 
+       if (proxy->handshake_callback != NULL) {
+               if (proxy->handshake_callback(proxy->handshake_context) < 0)
+-                      ssl_proxy_destroy(proxy);
++                      ssl_proxy_destroy_failed(proxy);
+       }
+ }
+ 
+@@ -822,7 +829,8 @@ void ssl_proxy_destroy(struct ssl_proxy 
+       if (proxy->destroyed || proxy->flushing)
+               return;
+       proxy->flushing = TRUE;
+-      ssl_proxy_flush(proxy);
++      if (!proxy->failed && proxy->handshaked)
++              ssl_proxy_flush(proxy);
+       proxy->destroyed = TRUE;
+ 
+       ssl_proxy_count--;



Home | Main Index | Thread Index | Old Index