aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2008-04-02 23:20:38 +0800
committerdinoex <dinoex@FreeBSD.org>2008-04-02 23:20:38 +0800
commitc470ab4d5a21feafa2ce5211d5879e69fd12c4a4 (patch)
treec1d8b049dbcd187ffb01f78674348a5b558e24f2
parent9e6310724fb4166a58b158b3470ddb12f059bd7a (diff)
downloadfreebsd-ports-gnome-c470ab4d5a21feafa2ce5211d5879e69fd12c4a4.tar.gz
freebsd-ports-gnome-c470ab4d5a21feafa2ce5211d5879e69fd12c4a4.tar.zst
freebsd-ports-gnome-c470ab4d5a21feafa2ce5211d5879e69fd12c4a4.zip
- Security update to 1.3.7
- fix dbus link problem Security: CVE-2008-0047 Security: CVE-2008-1373
-rw-r--r--print/cups-base/Makefile3
-rw-r--r--print/cups-base/distinfo6
-rw-r--r--print/cups-base/files/patch-auth.c12
-rw-r--r--print/cups-base/files/patch-configure17
-rw-r--r--print/cups-base/pkg-plist1
5 files changed, 17 insertions, 22 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 27945b647aea..0cec9561aee8 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= cups
-PORTVERSION= 1.3.6
-PORTREVISION= 1
+PORTVERSION= 1.3.7
DISTVERSIONSUFFIX= -source
CATEGORIES= print
MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION}
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index d01722430133..0c00df6a4462 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.3.6-source.tar.bz2) = 642f9f6d879999bff1b51aeee57a3ce1
-SHA256 (cups-1.3.6-source.tar.bz2) = b4003862daffd6887a52cf66a67a21854c1ecda15698bf44b2fe1fc12a833695
-SIZE (cups-1.3.6-source.tar.bz2) = 4079258
+MD5 (cups-1.3.7-source.tar.bz2) = db4a45a17104f10f3ee599d88267c9e5
+SHA256 (cups-1.3.7-source.tar.bz2) = 1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
+SIZE (cups-1.3.7-source.tar.bz2) = 3895825
diff --git a/print/cups-base/files/patch-auth.c b/print/cups-base/files/patch-auth.c
deleted file mode 100644
index 1324eb958f75..000000000000
--- a/print/cups-base/files/patch-auth.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- scheduler/auth.c.orig 2008-03-03 20:49:42.000000000 +0300
-+++ scheduler/auth.c 2008-03-03 20:53:19.000000000 +0300
-@@ -652,8 +652,7 @@
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "cupsdAuthorize: pam_start() returned %d (%s)!\n",
-- pamerr, pam_strerror(pamh, pamerr));
-- pam_end(pamh, 0);
-+ pamerr, pam_strerror(NULL, pamerr));
- return;
- }
-
diff --git a/print/cups-base/files/patch-configure b/print/cups-base/files/patch-configure
index accd1c369787..1206ccb67246 100644
--- a/print/cups-base/files/patch-configure
+++ b/print/cups-base/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Aug 13 22:35:13 2007
-+++ configure Thu Aug 16 20:43:41 2007
-@@ -6152,6 +6152,7 @@
+--- configure.orig 2008-04-01 23:59:43.000000000 +0200
++++ configure 2008-04-02 15:36:59.000000000 +0200
+@@ -6281,6 +6281,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -8,7 +8,16 @@
#include <sys/ucred.h>
_ACEOF
rm -f conftest.$ac_objext
-@@ -16048,7 +16049,7 @@
+@@ -7637,7 +7638,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldbus-1 `$PKGCONFIG --libs dbus-1` $LIBS"
++LIBS="-ldbus-1 `$PKGCONFIG --libs dbus-1` $LIBS -pthread"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -16361,7 +16362,7 @@
if test x$ac_cv_header_pthread_h = xyes; then
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 6ff1b2312695..b12774e82153 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -53,7 +53,6 @@ include/cups/cups.h
include/cups/dir.h
include/cups/file.h
include/cups/http.h
-include/cups/i18n.h
include/cups/image.h
include/cups/ipp.h
include/cups/language.h