diff options
author | lofi <lofi@FreeBSD.org> | 2007-07-31 05:53:10 +0800 |
---|---|---|
committer | lofi <lofi@FreeBSD.org> | 2007-07-31 05:53:10 +0800 |
commit | ce63eafe1e493850dfc6e2e4cac9c8ab0ca90864 (patch) | |
tree | 9698baa7a807c0adca8db2e689761ccbbdbe00a7 /devel/qt4-qtestlib | |
parent | d64e61779e5c89be31f24a605ba762899ebd5b9b (diff) | |
download | freebsd-ports-gnome-ce63eafe1e493850dfc6e2e4cac9c8ab0ca90864.tar.gz freebsd-ports-gnome-ce63eafe1e493850dfc6e2e4cac9c8ab0ca90864.tar.zst freebsd-ports-gnome-ce63eafe1e493850dfc6e2e4cac9c8ab0ca90864.zip |
Fix various format string vulnerabilities in Qt3 and Qt4.
Security: http://trolltech.com/company/newsroom/announcements/press.2007-07-27.750375
Security: CVE-2007-3388
Diffstat (limited to 'devel/qt4-qtestlib')
-rw-r--r-- | devel/qt4-qtestlib/Makefile | 3 | ||||
-rw-r--r-- | devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index cb7dd4b4b535..ee5d65d6c9fe 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= qtestlib PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -43,6 +43,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ --exclude '${DISTNAME}/tools/qtconfig' --exclude '${DISTNAME}/tools/qvfb' WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ +PATCH_WRKSRC=${CONFIGURE_WRKSRC} .include <bsd.port.pre.mk> diff --git a/devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff b/devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff new file mode 100644 index 000000000000..efe6e3caad19 --- /dev/null +++ b/devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff @@ -0,0 +1,15 @@ +--- tools/qtestlib/src/qtest_global.h ++++ tools/qtestlib/src/qtest_global.h +@@ -59,7 +59,11 @@ namespace QTest + enum SkipMode { SkipSingle = 1, SkipAll = 2 }; + enum TestFailMode { Abort = 1, Continue = 2 }; + +- int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...); ++ int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 3, 4))) ++#endif ++ ; + } + + QT_END_HEADER
\ No newline at end of file |