From d9f789256c08fc4de035fbfe985dafcdafa730de Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 31 May 2010 12:43:29 -0700 Subject: [PATCH] update Mon May 31 12:37:00 PDT 2010 --- devel/glib2/Makefile | 3 +- devel/glib2/Makefile.common | 8 +- devel/glib2/PLIST | 101 +++-- devel/glib2/distinfo | 15 +- devel/glib2/patches/patch-aa | 33 +- devel/glib2/patches/patch-ak | 33 +- devel/glib2/patches/patch-an | 27 -- devel/glib2/patches/patch-cd | 24 +- devel/pango/Makefile | 7 +- devel/pango/PLIST | 3 +- devel/pango/distinfo | 10 +- devel/pango/patches/patch-ae | 18 - devel/pango/patches/patch-am | 24 -- doc/CHANGES-2010 | 5 +- doc/TODO | 24 +- security/lasso/Makefile.common | 6 +- security/lasso/PLIST | 574 +++++++++++++++++++-------- security/lasso/distinfo | 17 +- security/lasso/patches/patch-aa | 22 - security/lasso/patches/patch-ba | 14 - security/lasso/patches/patch-bb | 70 ---- security/lasso/patches/patch-bc | 13 - security/lasso/patches/patch-bd | 25 -- security/lasso/patches/patch-ca | 133 ------- security/lasso/patches/patch-cb | 74 ---- security/lasso/patches/patch-cc | 77 ---- security/lasso/patches/patch-cd | 9 - www/ap2-auth-mellon/Makefile | 5 +- www/ap2-auth-mellon/distinfo | 9 +- www/ap2-auth-mellon/patches/patch-aa | 14 - x11/gtk2/Makefile | 10 +- x11/gtk2/PLIST | 24 +- x11/gtk2/distinfo | 12 +- x11/gtk2/patches/patch-ab | 8 +- x11/gtk2/patches/patch-gb | 15 - x11/gtk2/patches/patch-ob | 34 -- 36 files changed, 589 insertions(+), 911 deletions(-) delete mode 100644 devel/glib2/patches/patch-an delete mode 100644 devel/pango/patches/patch-ae delete mode 100644 devel/pango/patches/patch-am delete mode 100644 security/lasso/patches/patch-aa delete mode 100644 security/lasso/patches/patch-ba delete mode 100644 security/lasso/patches/patch-bb delete mode 100644 security/lasso/patches/patch-bc delete mode 100644 security/lasso/patches/patch-bd delete mode 100644 security/lasso/patches/patch-ca delete mode 100644 security/lasso/patches/patch-cb delete mode 100644 security/lasso/patches/patch-cc delete mode 100644 security/lasso/patches/patch-cd delete mode 100644 www/ap2-auth-mellon/patches/patch-aa delete mode 100644 x11/gtk2/patches/patch-gb delete mode 100644 x11/gtk2/patches/patch-ob diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index abc00619502c..9434cf98b1b0 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.173 2010/04/20 17:43:50 jmmv Exp $ +# $NetBSD: Makefile,v 1.174 2010/05/31 17:30:36 drochner Exp $ .include "Makefile.common" -PKGREVISION= 1 CATEGORIES= devel COMMENT= Some useful routines for C programming (glib2) diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common index 79d23c085bed..524bda41dd44 100644 --- a/devel/glib2/Makefile.common +++ b/devel/glib2/Makefile.common @@ -1,15 +1,15 @@ -# $NetBSD: Makefile.common,v 1.1 2010/04/20 17:43:50 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2010/05/31 17:30:36 drochner Exp $ # # used by devel/glib2/Makefile # used by sysutils/gio-fam/Makefile # When updating this package, please apply patch-ak to configure.in and # then run a matching version of autoconf to regen patch-aa. -DISTNAME= glib-2.22.5 +DISTNAME= glib-2.24.1 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= # empty; redefined in Makefile -MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.22/ \ - ${MASTER_SITE_GNOME:=sources/glib/2.22/} +MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.24/ \ + ${MASTER_SITE_GNOME:=sources/glib/2.24/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 16db274d9089..75571dc13a52 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.52 2010/04/20 17:43:50 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.53 2010/05/31 17:30:36 drochner Exp $ +bin/gio-querymodules bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -6,7 +7,9 @@ bin/gobject-query bin/gtester bin/gtester-report include/glib/gio-unix-2.0/gio/gdesktopappinfo.h +include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h include/glib/gio-unix-2.0/gio/gunixconnection.h +include/glib/gio-unix-2.0/gio/gunixfdlist.h include/glib/gio-unix-2.0/gio/gunixfdmessage.h include/glib/gio-unix-2.0/gio/gunixinputstream.h include/glib/gio-unix-2.0/gio/gunixmounts.h @@ -18,7 +21,11 @@ include/glib/glib-2.0/gio/gasyncresult.h include/glib/glib-2.0/gio/gbufferedinputstream.h include/glib/glib-2.0/gio/gbufferedoutputstream.h include/glib/glib-2.0/gio/gcancellable.h +include/glib/glib-2.0/gio/gcharsetconverter.h include/glib/glib-2.0/gio/gcontenttype.h +include/glib/glib-2.0/gio/gconverter.h +include/glib/glib-2.0/gio/gconverterinputstream.h +include/glib/glib-2.0/gio/gconverteroutputstream.h include/glib/glib-2.0/gio/gdatainputstream.h include/glib/glib-2.0/gio/gdataoutputstream.h include/glib/glib-2.0/gio/gdrive.h @@ -77,6 +84,8 @@ include/glib/glib-2.0/gio/gthreadedsocketservice.h include/glib/glib-2.0/gio/gvfs.h include/glib/glib-2.0/gio/gvolume.h include/glib/glib-2.0/gio/gvolumemonitor.h +include/glib/glib-2.0/gio/gzlibcompressor.h +include/glib/glib-2.0/gio/gzlibdecompressor.h include/glib/glib-2.0/glib-object.h include/glib/glib-2.0/glib.h include/glib/glib-2.0/glib/galloca.h @@ -85,6 +94,7 @@ include/glib/glib-2.0/glib/gasyncqueue.h include/glib/glib-2.0/glib/gatomic.h include/glib/glib-2.0/glib/gbacktrace.h include/glib/glib-2.0/glib/gbase64.h +include/glib/glib-2.0/glib/gbitlock.h include/glib/glib-2.0/glib/gbookmarkfile.h include/glib/glib-2.0/glib/gcache.h include/glib/glib-2.0/glib/gchecksum.h @@ -139,6 +149,8 @@ include/glib/glib-2.0/glib/gtypes.h include/glib/glib-2.0/glib/gunicode.h include/glib/glib-2.0/glib/gurifuncs.h include/glib/glib-2.0/glib/gutils.h +include/glib/glib-2.0/glib/gvariant.h +include/glib/glib-2.0/glib/gvarianttype.h include/glib/glib-2.0/glib/gwin32.h include/glib/glib-2.0/gmodule.h include/glib/glib-2.0/gobject/gboxed.h @@ -180,8 +192,8 @@ man/man1/gtester-report.1 man/man1/gtester.1 share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 -share/gdb/auto-load/libglib-2.0.so.0.2200.5-gdb.py -share/gdb/auto-load/libgobject-2.0.so.0.2200.5-gdb.py +share/gdb/auto-load/libglib-2.0.so.0.2400.1-gdb.py +share/gdb/auto-load/libgobject-2.0.so.0.2400.1-gdb.py share/glib-2.0/gdb/glib.py share/glib-2.0/gdb/gobject.py share/glib-2.0/gettext/mkinstalldirs @@ -192,12 +204,15 @@ share/gtk-doc/html/gio/GAsyncResult.html share/gtk-doc/html/gio/GBufferedInputStream.html share/gtk-doc/html/gio/GBufferedOutputStream.html share/gtk-doc/html/gio/GCancellable.html +share/gtk-doc/html/gio/GCharsetConverter.html +share/gtk-doc/html/gio/GConverter.html share/gtk-doc/html/gio/GDataInputStream.html share/gtk-doc/html/gio/GDataOutputStream.html share/gtk-doc/html/gio/GDrive.html share/gtk-doc/html/gio/GEmblem.html share/gtk-doc/html/gio/GEmblemedIcon.html share/gtk-doc/html/gio/GFile.html +share/gtk-doc/html/gio/GFileDescriptorBased.html share/gtk-doc/html/gio/GFileEnumerator.html share/gtk-doc/html/gio/GFileIOStream.html share/gtk-doc/html/gio/GFileIcon.html @@ -236,6 +251,7 @@ share/gtk-doc/html/gio/GSocketListener.html share/gtk-doc/html/gio/GSocketService.html share/gtk-doc/html/gio/GThemedIcon.html share/gtk-doc/html/gio/GThreadedSocketService.html +share/gtk-doc/html/gio/GUnixFDList.html share/gtk-doc/html/gio/GUnixFDMessage.html share/gtk-doc/html/gio/GUnixInputStream.html share/gtk-doc/html/gio/GUnixOutputStream.html @@ -243,14 +259,23 @@ share/gtk-doc/html/gio/GUnixSocketAddress.html share/gtk-doc/html/gio/GVfs.html share/gtk-doc/html/gio/GVolume.html share/gtk-doc/html/gio/GVolumeMonitor.html +share/gtk-doc/html/gio/GZlibCompressor.html +share/gtk-doc/html/gio/GZlibDecompressor.html +share/gtk-doc/html/gio/api-index-2-18.html +share/gtk-doc/html/gio/api-index-2-20.html +share/gtk-doc/html/gio/api-index-2-22.html +share/gtk-doc/html/gio/api-index-2-24.html +share/gtk-doc/html/gio/api-index-deprecated.html +share/gtk-doc/html/gio/api-index-full.html share/gtk-doc/html/gio/async.html share/gtk-doc/html/gio/ch01.html share/gtk-doc/html/gio/ch02.html share/gtk-doc/html/gio/ch03.html -share/gtk-doc/html/gio/ch18.html share/gtk-doc/html/gio/ch19.html -share/gtk-doc/html/gio/ch19s02.html -share/gtk-doc/html/gio/ch19s03.html +share/gtk-doc/html/gio/ch20.html +share/gtk-doc/html/gio/ch20s02.html +share/gtk-doc/html/gio/ch20s03.html +share/gtk-doc/html/gio/conversion.html share/gtk-doc/html/gio/extending-gio.html share/gtk-doc/html/gio/extending.html share/gtk-doc/html/gio/failable_initialization.html @@ -259,6 +284,8 @@ share/gtk-doc/html/gio/file_ops.html share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html share/gtk-doc/html/gio/gio-Extension-Points.html share/gtk-doc/html/gio/gio-GContentType.html +share/gtk-doc/html/gio/gio-GConverterInputstream.html +share/gtk-doc/html/gio/gio-GConverterOutputstream.html share/gtk-doc/html/gio/gio-GFileAttribute.html share/gtk-doc/html/gio/gio-GIOError.html share/gtk-doc/html/gio/gio-GIOScheduler.html @@ -273,11 +300,6 @@ share/gtk-doc/html/gio/home.png share/gtk-doc/html/gio/icons.html share/gtk-doc/html/gio/index.html share/gtk-doc/html/gio/index.sgml -share/gtk-doc/html/gio/ix01.html -share/gtk-doc/html/gio/ix02.html -share/gtk-doc/html/gio/ix03.html -share/gtk-doc/html/gio/ix04.html -share/gtk-doc/html/gio/ix05.html share/gtk-doc/html/gio/left.png share/gtk-doc/html/gio/migrating.html share/gtk-doc/html/gio/networking.html @@ -291,6 +313,20 @@ share/gtk-doc/html/gio/types.html share/gtk-doc/html/gio/up.png share/gtk-doc/html/gio/utils.html share/gtk-doc/html/gio/volume_mon.html +share/gtk-doc/html/glib/api-index-2-10.html +share/gtk-doc/html/glib/api-index-2-12.html +share/gtk-doc/html/glib/api-index-2-14.html +share/gtk-doc/html/glib/api-index-2-16.html +share/gtk-doc/html/glib/api-index-2-18.html +share/gtk-doc/html/glib/api-index-2-2.html +share/gtk-doc/html/glib/api-index-2-20.html +share/gtk-doc/html/glib/api-index-2-22.html +share/gtk-doc/html/glib/api-index-2-24.html +share/gtk-doc/html/glib/api-index-2-4.html +share/gtk-doc/html/glib/api-index-2-6.html +share/gtk-doc/html/glib/api-index-2-8.html +share/gtk-doc/html/glib/api-index-deprecated.html +share/gtk-doc/html/glib/api-index-full.html share/gtk-doc/html/glib/file-name-encodings.png share/gtk-doc/html/glib/glib-Arrays.html share/gtk-doc/html/glib/glib-Asynchronous-Queues.html @@ -313,6 +349,8 @@ share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html share/gtk-doc/html/glib/glib-Error-Reporting.html share/gtk-doc/html/glib/glib-File-Utilities.html +share/gtk-doc/html/glib/glib-GVariant.html +share/gtk-doc/html/glib/glib-GVariantType.html share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html share/gtk-doc/html/glib/glib-Hash-Tables.html share/gtk-doc/html/glib/glib-Hook-Functions.html @@ -375,22 +413,10 @@ share/gtk-doc/html/glib/glib.devhelp2 share/gtk-doc/html/glib/glib.html share/gtk-doc/html/glib/gtester-report.html share/gtk-doc/html/glib/gtester.html +share/gtk-doc/html/glib/gvariant-format-strings.html share/gtk-doc/html/glib/home.png share/gtk-doc/html/glib/index.html share/gtk-doc/html/glib/index.sgml -share/gtk-doc/html/glib/ix01.html -share/gtk-doc/html/glib/ix02.html -share/gtk-doc/html/glib/ix03.html -share/gtk-doc/html/glib/ix04.html -share/gtk-doc/html/glib/ix05.html -share/gtk-doc/html/glib/ix06.html -share/gtk-doc/html/glib/ix07.html -share/gtk-doc/html/glib/ix08.html -share/gtk-doc/html/glib/ix09.html -share/gtk-doc/html/glib/ix10.html -share/gtk-doc/html/glib/ix11.html -share/gtk-doc/html/glib/ix12.html -share/gtk-doc/html/glib/ix13.html share/gtk-doc/html/glib/left.png share/gtk-doc/html/glib/mainloop-states.gif share/gtk-doc/html/glib/right.png @@ -399,6 +425,18 @@ share/gtk-doc/html/glib/tools.html share/gtk-doc/html/glib/up.png share/gtk-doc/html/gobject/GTypeModule.html share/gtk-doc/html/gobject/GTypePlugin.html +share/gtk-doc/html/gobject/api-index-2-10.html +share/gtk-doc/html/gobject/api-index-2-12.html +share/gtk-doc/html/gobject/api-index-2-14.html +share/gtk-doc/html/gobject/api-index-2-18.html +share/gtk-doc/html/gobject/api-index-2-2.html +share/gtk-doc/html/gobject/api-index-2-22.html +share/gtk-doc/html/gobject/api-index-2-24.html +share/gtk-doc/html/gobject/api-index-2-4.html +share/gtk-doc/html/gobject/api-index-2-6.html +share/gtk-doc/html/gobject/api-index-2-8.html +share/gtk-doc/html/gobject/api-index-deprecated.html +share/gtk-doc/html/gobject/api-index-full.html share/gtk-doc/html/gobject/ch01s02.html share/gtk-doc/html/gobject/ch06s03.html share/gtk-doc/html/gobject/chapter-gobject.html @@ -441,17 +479,6 @@ share/gtk-doc/html/gobject/howto-interface.html share/gtk-doc/html/gobject/howto-signals.html share/gtk-doc/html/gobject/index.html share/gtk-doc/html/gobject/index.sgml -share/gtk-doc/html/gobject/ix01.html -share/gtk-doc/html/gobject/ix02.html -share/gtk-doc/html/gobject/ix03.html -share/gtk-doc/html/gobject/ix04.html -share/gtk-doc/html/gobject/ix05.html -share/gtk-doc/html/gobject/ix06.html -share/gtk-doc/html/gobject/ix07.html -share/gtk-doc/html/gobject/ix08.html -share/gtk-doc/html/gobject/ix09.html -share/gtk-doc/html/gobject/ix10.html -share/gtk-doc/html/gobject/ix11.html share/gtk-doc/html/gobject/left.png share/gtk-doc/html/gobject/pr01.html share/gtk-doc/html/gobject/pt01.html @@ -468,9 +495,11 @@ share/gtk-doc/html/gobject/tools-gtkdoc.html share/gtk-doc/html/gobject/tools-refdb.html share/gtk-doc/html/gobject/tools-vala.html share/gtk-doc/html/gobject/up.png +share/locale/af/LC_MESSAGES/glib20.mo share/locale/am/LC_MESSAGES/glib20.mo share/locale/ar/LC_MESSAGES/glib20.mo share/locale/as/LC_MESSAGES/glib20.mo +share/locale/ast/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/be@latin/LC_MESSAGES/glib20.mo @@ -486,6 +515,7 @@ share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo share/locale/dz/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo +share/locale/en@shaw/LC_MESSAGES/glib20.mo share/locale/en_CA/LC_MESSAGES/glib20.mo share/locale/en_GB/LC_MESSAGES/glib20.mo share/locale/eo/LC_MESSAGES/glib20.mo @@ -521,6 +551,7 @@ share/locale/mn/LC_MESSAGES/glib20.mo share/locale/mr/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nb/LC_MESSAGES/glib20.mo +share/locale/nds/LC_MESSAGES/glib20.mo share/locale/ne/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 05f828d337f5..4db29a1eb74f 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.133 2010/04/20 22:39:55 wiz Exp $ +$NetBSD: distinfo,v 1.135 2010/05/31 18:30:06 wiz Exp $ -SHA1 (glib-2.22.5.tar.bz2) = a35acb06c3155937651aaffc1f1895c6e19a91a4 -RMD160 (glib-2.22.5.tar.bz2) = 2e2f06f956f63a75121b335e4150edc44f5e04f2 -Size (glib-2.22.5.tar.bz2) = 4988402 bytes -SHA1 (patch-aa) = c88b260236d4cfdf4b621ed29bc6292456b3e38d +SHA1 (glib-2.24.1.tar.bz2) = d4835bb1618fc1e1dfe88ef8443c12fcae69f90e +RMD160 (glib-2.24.1.tar.bz2) = c6ce09654c1bd28b8844435d150fcb51e6f4e872 +Size (glib-2.24.1.tar.bz2) = 5332511 bytes +SHA1 (patch-aa) = 3cff899701032b955ce8737830ed41d0cbf1f236 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 @@ -13,10 +13,9 @@ SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c -SHA1 (patch-ak) = 04e3d1eb9648186776dee81d2db9507c0df0c62e +SHA1 (patch-ak) = 97e3f6ef5f3b0d1bf56ccd5cd3d977337c53fd30 SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e -SHA1 (patch-an) = e4a4b88a029c534f5be552eb301607ac57961915 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 -SHA1 (patch-cd) = ce935240b5517acc4514992167d2112305063b5d +SHA1 (patch-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39 diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 2a63cdaa733a..e4f07f80a221 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ +$NetBSD: patch-aa,v 1.49 2010/05/31 17:30:36 drochner Exp $ ---- configure.orig 2010-03-16 02:52:21.000000000 +0000 +--- configure.orig 2010-05-03 00:59:28.000000000 +0000 +++ configure -@@ -803,6 +803,7 @@ GIO +@@ -807,6 +807,7 @@ GIO GSPAWN GLIB_DEBUG_FLAGS G_MODULE_NEED_USCORE @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_HAVE_DLERROR G_MODULE_LDFLAGS -@@ -22163,8 +22164,8 @@ else +@@ -22220,8 +22221,8 @@ else fi @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550) -@@ -23434,16 +23435,48 @@ fi +@@ -23455,16 +23456,48 @@ fi case $host in *-*-solaris* ) @@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ esac if test "$ac_cv_func_statfs" = yes ; then -@@ -24449,10 +24482,11 @@ if test x"$glib_native_win32" = xyes; th +@@ -24470,10 +24503,11 @@ if test x"$glib_native_win32" = xyes; th G_MODULE_LDFLAGS= else export SED @@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -24659,7 +24693,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP +@@ -24680,7 +24714,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP LIBS="$G_MODULE_LIBS $LIBS" LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" echo "void glib_plugin_test(void) { }" > plugin.c @@ -93,7 +93,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5 $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; } -@@ -24769,6 +24803,56 @@ fi +@@ -24790,6 +24824,56 @@ fi LIBS="$LIBS_orig" fi @@ -150,7 +150,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ if test -z "$G_MODULE_IMPL"; then G_MODULE_IMPL=0 G_MODULE_SUPPORTED=false -@@ -24779,7 +24863,7 @@ fi +@@ -24800,7 +24884,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5 $as_echo_n "checking for the suffix of module shared libraries... " >&6; } export SED @@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ eval $shrext_cmds module=yes eval std_shrext=$shrext_cmds # chop the initial dot -@@ -24803,6 +24887,8 @@ fi +@@ -24824,6 +24908,8 @@ fi @@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5 $as_echo_n "checking for gspawn implementation... " >&6; } case "$host" in -@@ -25551,62 +25637,8 @@ if test x"$have_threads" != xno; then +@@ -25572,62 +25658,8 @@ if test x"$have_threads" != xno; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -233,14 +233,3 @@ $NetBSD: patch-aa,v 1.48 2010/03/16 13:41:15 wiz Exp $ ;; esac fi -@@ -26388,6 +26420,10 @@ case $host in - *) - G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" - ;; -+ *-*-netbsd*) -+ # On NetBSD, pkgsrc's libtool does the right thing. -+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" -+ ;; - esac - - diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak index 7516e4fb6de4..925a268d746b 100644 --- a/devel/glib2/patches/patch-ak +++ b/devel/glib2/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ +$NetBSD: patch-ak,v 1.6 2010/05/31 17:30:36 drochner Exp $ ---- configure.in.orig 2009-10-07 15:29:47.000000000 +0200 -+++ configure.in 2009-11-22 15:18:00.124347084 +0100 -@@ -835,7 +835,7 @@ +--- configure.in.orig 2010-05-02 23:58:58.000000000 +0000 ++++ configure.in +@@ -846,7 +846,7 @@ int main (int argc, char **argv) AC_MSG_RESULT($g_have_gnuc_visibility) AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes]) @@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550) #else # include "error: this is not Sun Studio." -@@ -1023,10 +1023,22 @@ +@@ -1043,10 +1043,22 @@ fi case $host in *-*-solaris* ) @@ -38,7 +38,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ esac dnl -@@ -1379,11 +1391,12 @@ +@@ -1399,11 +1411,12 @@ if test x"$glib_native_win32" = xyes; th G_MODULE_LDFLAGS= else export SED @@ -52,7 +52,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ G_MODULE_HAVE_DLERROR=0 dnl *** force native WIN32 shared lib loader if test -z "$G_MODULE_IMPL"; then -@@ -1444,7 +1457,7 @@ +@@ -1464,7 +1477,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c @@ -61,7 +61,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], glib_cv_rtldglobal_broken,[ -@@ -1508,6 +1521,38 @@ +@@ -1528,6 +1541,38 @@ dnl *** check for having dlerror() [G_MODULE_HAVE_DLERROR=0]) LIBS="$LIBS_orig" fi @@ -100,7 +100,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ dnl *** done, have we got an implementation? if test -z "$G_MODULE_IMPL"; then G_MODULE_IMPL=0 -@@ -1518,7 +1563,7 @@ +@@ -1538,7 +1583,7 @@ fi AC_MSG_CHECKING(for the suffix of module shared libraries) export SED @@ -109,7 +109,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ eval $shrext_cmds module=yes eval std_shrext=$shrext_cmds # chop the initial dot -@@ -1537,6 +1582,8 @@ +@@ -1557,6 +1602,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS) AC_SUBST(G_MODULE_LDFLAGS) AC_SUBST(G_MODULE_HAVE_DLERROR) AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) @@ -118,7 +118,7 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ AC_SUBST(G_MODULE_NEED_USCORE) AC_SUBST(GLIB_DEBUG_FLAGS) -@@ -1925,22 +1972,8 @@ +@@ -1945,22 +1992,8 @@ if test x"$have_threads" != xno; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -143,14 +143,3 @@ $NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $ ;; esac fi -@@ -2336,6 +2369,10 @@ - *) - G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" - ;; -+ *-*-netbsd*) -+ # On NetBSD, pkgsrc's libtool does the right thing. -+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" -+ ;; - esac - - AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c", diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an deleted file mode 100644 index 24c2d62d6da2..000000000000 --- a/devel/glib2/patches/patch-an +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-an,v 1.2 2010/02/19 19:46:53 roy Exp $ - -Use RTLD_DEFAULT if the platform defines it. - -Upstream URL -https://bugzilla.gnome.org/show_bug.cgi?id=610490 - ---- gmodule/gmodule-dl.c 2009-04-01 00:04:20.000000000 +0100 -+++ gmodule/gmodule-dl.c 2010-02-19 07:13:26.000000000 +0000 -@@ -107,6 +107,9 @@ - static gpointer - _g_module_self (void) - { -+#ifdef RTLD_DEFAULT -+ return RTLD_DEFAULT; -+#else - gpointer handle; - - /* to query symbols from the program itself, special link options -@@ -118,6 +121,7 @@ - g_module_set_error (fetch_dlerror (TRUE)); - - return handle; -+#endif - } - - static void diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd index dd5860bbdc5b..d326b611db88 100644 --- a/devel/glib2/patches/patch-cd +++ b/devel/glib2/patches/patch-cd @@ -1,10 +1,10 @@ -$NetBSD: patch-cd,v 1.2 2010/04/20 22:39:55 wiz Exp $ +$NetBSD: patch-cd,v 1.4 2010/05/31 18:30:06 wiz Exp $ sysutils/gio-fam builds the gio/fam backend as a separate module. Force it to link against the installed version of glib2, as it is not rebuilt by the package. ---- gio/fam/Makefile.in.orig 2010-03-16 02:52:15.000000000 +0000 +--- gio/fam/Makefile.in.orig 2010-05-03 00:59:22.000000000 +0000 +++ gio/fam/Makefile.in @@ -76,10 +76,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(giomoduledir)" @@ -18,16 +18,7 @@ package. am__objects_1 = am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ libgiofam_la-fam-module.lo \ -@@ -311,7 +308,7 @@ infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ --localedir = @localedir@ -+localedir = /usr/pkg/share/locale - localstatedir = @localstatedir@ - lt_ECHO = @lt_ECHO@ - mandir = @mandir@ -@@ -369,9 +366,7 @@ libgiofam_la_CFLAGS = \ +@@ -370,9 +367,7 @@ libgiofam_la_CFLAGS = \ libgiofam_la_LDFLAGS = $(module_flags) libgiofam_la_LIBADD = \ @@ -38,3 +29,12 @@ package. $(GLIB_LIBS) \ $(FAM_LIBS) \ $(NULL) +@@ -777,7 +772,7 @@ check-local: test + + install-data-hook: + if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ +- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ ++ ${LOCALBASE}/bin/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ + fi + + uninstall-local: diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 732011efd6d8..7d6453ee124e 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.141 2010/03/27 15:59:33 taca Exp $ +# $NetBSD: Makefile,v 1.142 2010/05/31 17:57:37 drochner Exp $ -DISTNAME= pango-1.26.2 -PKGREVISION= 2 +DISTNAME= pango-1.28.0 CATEGORIES= devel fonts -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.26/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.28/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/pango/PLIST b/devel/pango/PLIST index 711a6d417821..87226512685c 100644 --- a/devel/pango/PLIST +++ b/devel/pango/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.48 2009/10/21 15:42:18 drochner Exp $ +@comment $NetBSD: PLIST,v 1.49 2010/05/31 17:57:37 drochner Exp $ bin/pango-querymodules bin/pango-view include/pango-1.0/pango/pango-attributes.h @@ -80,6 +80,7 @@ share/gtk-doc/html/pango/index-1.20.html share/gtk-doc/html/pango/index-1.22.html share/gtk-doc/html/pango/index-1.24.html share/gtk-doc/html/pango/index-1.26.html +share/gtk-doc/html/pango/index-1.28.html share/gtk-doc/html/pango/index-1.4.html share/gtk-doc/html/pango/index-1.6.html share/gtk-doc/html/pango/index-1.8.html diff --git a/devel/pango/distinfo b/devel/pango/distinfo index 541e197ba590..1a2e4c746a1f 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.83 2010/03/27 15:59:33 taca Exp $ +$NetBSD: distinfo,v 1.84 2010/05/31 17:57:37 drochner Exp $ -SHA1 (pango-1.26.2.tar.bz2) = 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 -RMD160 (pango-1.26.2.tar.bz2) = 6613bddf643d5c912e6656d84c6671aa6ce88a9d -Size (pango-1.26.2.tar.bz2) = 1536011 bytes +SHA1 (pango-1.28.0.tar.bz2) = b77fd452a59e4e11ee8b97193344c945250d5d37 +RMD160 (pango-1.28.0.tar.bz2) = f5fb75ad47f20569081e95441d226f1570725ad9 +Size (pango-1.28.0.tar.bz2) = 1500538 bytes SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59 SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8 -SHA1 (patch-ae) = 9eb458be84f6dfce27fb469d45cc78e34acd9c36 -SHA1 (patch-am) = dc7387b4da24356a56ab8d07ef0462b6f4b3b209 diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae deleted file mode 100644 index 42c3aa8c2ef5..000000000000 --- a/devel/pango/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2010/02/21 23:51:26 tron Exp $ - -Avoid high CPU usage under Mac OS X caused by questionable C++ code. - -Please look here for details: -https://bugzilla.gnome.org/show_bug.cgi?id=593240 - ---- pango/opentype/hb-open-type-private.hh.orig 2009-11-26 00:44:17.000000000 +0000 -+++ pango/opentype/hb-open-type-private.hh 2010-02-21 23:41:06.000000000 +0000 -@@ -61,7 +61,7 @@ - /* Null objects */ - - /* Global nul-content Null pool. Enlarge as necessary. */ --static const char NullPool[32] = ""; -+static const void *NullPool[32]; - - /* Generic template for nul-content sizeof-sized Null objects. */ - template diff --git a/devel/pango/patches/patch-am b/devel/pango/patches/patch-am deleted file mode 100644 index dd03db1b9e07..000000000000 --- a/devel/pango/patches/patch-am +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-am,v 1.1 2010/03/27 15:59:34 taca Exp $ - -Fix for CVE-2010-0421. - ---- pango/opentype/hb-ot-layout.cc.orig 2009-11-26 00:44:17.000000000 +0000 -+++ pango/opentype/hb-ot-layout.cc -@@ -44,6 +44,8 @@ _hb_ot_layout_init (hb_face_t *face) - { - hb_ot_layout_t *layout = &face->ot_layout; - -+ memset (layout, 0, sizeof (*layout)); -+ - layout->gdef_blob = Sanitizer::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF)); - layout->gdef = &Sanitizer::lock_instance (layout->gdef_blob); - -@@ -293,7 +295,7 @@ hb_ot_layout_build_glyph_classes (hb_fac - return; - - if (layout->new_gdef.len == 0) { -- layout->new_gdef.klasses = (unsigned char *) calloc (num_total_glyphs, sizeof (unsigned char)); -+ layout->new_gdef.klasses = (unsigned char *) calloc (count, sizeof (unsigned char)); - layout->new_gdef.len = count; - } - diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index d35d7534f3a1..b5b7f9ff22d7 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.2065 2010/05/30 19:57:23 seb Exp $ +$NetBSD: CHANGES-2010,v 1.2067 2010/05/31 18:53:15 drochner Exp $ Changes to the packages collection and infrastructure in 2010: @@ -2711,3 +2711,6 @@ Changes to the packages collection and infrastructure in 2010: Updated time/ruby-tzinfo to 0.3.22 [taca 2010-05-29] Updated chat/bitlbee to 1.2.7 [tonio 2010-05-30] Updated devel/p5-version to 0.8200 [seb 2010-05-30] + Updated security/lasso to 2.2.91 [manu 2010-05-30] + Updated www/ap2-auth-mellon to 0.2.7 [manu 2010-05-30] + Updated x11/gtk2 to 2.20.1 [drochner 2010-05-31] diff --git a/doc/TODO b/doc/TODO index c6a46f08ebde..0ce84aed2e19 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.9332 2010/05/30 19:57:23 seb Exp $ +$NetBSD: TODO,v 1.9333 2010/05/31 19:10:40 wiz Exp $ Suggested new packages ====================== @@ -373,6 +373,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o advi-1.8 o aewm++-1.0.27 o afterstep-2.2.9 + o akonadi-1.3.80 o album-4.06 o alee-ttf-11.2 o aliados-0.2.0 @@ -462,7 +463,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o cadaver-0.23.0 o cal3d-0.11.0 o calamaris-2.59 - o calibre-0.6.54 + o calibre-0.6.55 o camlimages-3.0.2 o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/] o cddbd-1.5.2 @@ -539,7 +540,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o dspam-3.9.0 o dvdrip-0.98.11 o dvipng-1.13 - o dwm-5.8 + o dwm-5.8.1 o easymenu-0.7.2p1 o ec-fonts-mftraced-1.0.12 o echinus-0.4.3.2 @@ -549,6 +550,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o edonkeyclc-1.0.2 [replaces net/edonkey2k] o efax-gtk-3.2.2 o egtk-0.3.6.2 + o ekiga-3.2.7 o electric-8.11 o electricfence-2.4.16 o elf-0.5.4p1 @@ -730,10 +732,10 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gnomeicu-0.99.14 o gnopernicus-1.1.2 o gnu-crypto-2.1.0 - o gnumeric110-1.10.4 + o gnumeric110-1.10.5 o gnupg2-2.0.15 o gob2-2.0.17 - o goffice0.8-0.8.4 + o goffice0.8-0.8.5 o gogo-3.11p1 o gok-2.30.0 [GNOME 2.30] o golem-0.0.6 @@ -845,12 +847,12 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o kmess-1.5.1 o kmp-0.5 o kodos-2.4.5 - o koffice-2.1.91 + o koffice-2.2.0 o koffice-l10n-de-2.0.2 o kphotobook-0.0.7 o kronolith-2.3.4 o krusader-2.0 - o ktorrent-3.3.4 + o ktorrent-4.0 o ktorrent3-3.3.4 o lablgtk-2.14.1 o lapack-3.2.1 @@ -980,6 +982,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o modular-xorg-server-1.8.0 o molden-4.8 [after which PR 40252 can be closed] o monit-5.1.1 + o mono-addins-0.5 o moserial-2.30.0 [GNOME 2.30] o mousetweaks-2.30.1 [GNOME 2.30] o mp3blaster-3.2.3 @@ -1060,6 +1063,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o p5-ExtUtils-CBuilder-0.2703 o p5-Geo-IPfree-1.100470 [pkg/42833] o p5-IO-Compress-2.027 + o p5-IO-Socket-INET6-2.63 o p5-JSON-2.21 o p5-MIME-tools-5.428 o p5-Module-Build-0.36090 @@ -1114,6 +1118,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o pioneers-0.12.2 o pircbot-1.4.6 o pixman-0.18.2 + o pkg-config-0.25 o pks-0.9.6 o plone-3.2.3 [should make plone-32?] o plone3-3.3.4 @@ -1140,7 +1145,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o puppet-0.25.5 o pure-ftpd-1.0.29 o puzzle-5.2 - o puzzles-8965 + o puzzles-8966 o pv-1.1.4 o pwlib-1.11.1 o py-FourSuite-1.0.2 @@ -1419,7 +1424,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o wxMaxima-0.8.5 [pkg/43265] o wxRemind-101 o wyrd-1.4.4 - o x264-devel-20100515 + o x264-devel-20100529 o xanalyser-1.30 o xapian-1.0.20 o xapian-omega-1.0.20 @@ -1524,6 +1529,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o xvidtune-1.0.2 o xview-3.2.1.4.24.12 o xwpe-1.5.30a + o xz-4.999.9124 o xzip-182 o yafc-1.1 o yasm-1.0.1 diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common index 41ad07d105e2..6bb189ec5a6a 100644 --- a/security/lasso/Makefile.common +++ b/security/lasso/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.3 2009/09/23 09:54:46 tron Exp $ +# $NetBSD: Makefile.common,v 1.4 2010/05/31 16:44:28 manu Exp $ # # used by security/lasso/Makefile # used by security/py-lasso/Makefile -DISTNAME= lasso-2.2.2 +DISTNAME= lasso-2.2.91 CATEGORIES= security -MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/735/ +MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/765/ MAINTAINER= manu@NetBSD.org HOMEPAGE= http://lasso.entrouvert.org/ diff --git a/security/lasso/PLIST b/security/lasso/PLIST index 5a74ff2bca39..9a0eb274ff68 100644 --- a/security/lasso/PLIST +++ b/security/lasso/PLIST @@ -1,18 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:31 joerg Exp $ -share/doc/lasso/writing-a-c-sp.txt -share/doc/lasso/writing-a-php-sp.txt -share/doc/lasso/writing-a-java-sp.txt -share/doc/lasso/writing-a-saml2-php-sp.txt -share/doc/lasso/book.rst -share/doc/lasso/common-knowledge.rst -share/doc/lasso/getting-lasso.rst -share/doc/lasso/integration.rst -share/doc/lasso/language-bindings.rst -share/doc/lasso/lasso-architecture.rst -share/doc/lasso/liberty-architecture.rst -share/doc/lasso/other-profiles.rst -share/doc/lasso/preface.rst -share/doc/lasso/single-sign-on.rst +@comment $NetBSD: PLIST,v 1.4 2010/05/31 16:44:28 manu Exp $ lib/pkgconfig/lasso.pc lib/liblasso.la include/lasso/xml/saml-2.0/saml2_action.h @@ -66,158 +52,14 @@ include/lasso/xml/saml-2.0/samlp2_status.h include/lasso/xml/saml-2.0/samlp2_status_response.h include/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h include/lasso/xml/saml-2.0/samlp2_terminate.h -include/lasso/xml/id-wsf-2.0/disco_abstract.h -include/lasso/xml/id-wsf-2.0/disco_endpoint_context.h -include/lasso/xml/id-wsf-2.0/disco_keys.h -include/lasso/xml/id-wsf-2.0/disco_options.h -include/lasso/xml/id-wsf-2.0/disco_provider_id.h -include/lasso/xml/id-wsf-2.0/disco_query.h -include/lasso/xml/id-wsf-2.0/disco_query_response.h -include/lasso/xml/id-wsf-2.0/disco_requested_service.h -include/lasso/xml/id-wsf-2.0/disco_security_context.h -include/lasso/xml/id-wsf-2.0/disco_service_context.h -include/lasso/xml/id-wsf-2.0/disco_service_type.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h -include/lasso/xml/id-wsf-2.0/dst_request.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_query.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_register.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h -include/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h -include/lasso/xml/id-wsf-2.0/disco_svc_metadata.h -include/lasso/xml/id-wsf-2.0/dst_data_response_base.h -include/lasso/xml/id-wsf-2.0/dst_delete_item_base.h -include/lasso/xml/id-wsf-2.0/dst_delete_response.h -include/lasso/xml/id-wsf-2.0/dst_result_query_base.h -include/lasso/xml/id-wsf-2.0/dst_test_item_base.h -include/lasso/xml/id-wsf-2.0/dstref_app_data.h -include/lasso/xml/id-wsf-2.0/dstref_create.h -include/lasso/xml/id-wsf-2.0/dstref_create_item.h -include/lasso/xml/id-wsf-2.0/dstref_create_response.h -include/lasso/xml/id-wsf-2.0/dstref_data.h -include/lasso/xml/id-wsf-2.0/dstref_data_response.h -include/lasso/xml/id-wsf-2.0/dstref_delete.h -include/lasso/xml/id-wsf-2.0/dstref_delete_item.h -include/lasso/xml/id-wsf-2.0/dstref_delete_response.h -include/lasso/xml/id-wsf-2.0/dstref_item_data.h -include/lasso/xml/id-wsf-2.0/dstref_modify.h -include/lasso/xml/id-wsf-2.0/dstref_modify_item.h -include/lasso/xml/id-wsf-2.0/dstref_query.h -include/lasso/xml/id-wsf-2.0/dstref_modify_response.h -include/lasso/xml/id-wsf-2.0/dstref_query_item.h -include/lasso/xml/id-wsf-2.0/dstref_query_response.h -include/lasso/xml/id-wsf-2.0/dstref_result_query.h -include/lasso/xml/id-wsf-2.0/dstref_test_item.h -include/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h -include/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h -include/lasso/xml/id-wsf-2.0/ims_mapping_input.h -include/lasso/xml/id-wsf-2.0/ims_mapping_output.h -include/lasso/xml/id-wsf-2.0/is_help.h -include/lasso/xml/id-wsf-2.0/is_inquiry.h -include/lasso/xml/id-wsf-2.0/is_inquiry_element.h -include/lasso/xml/id-wsf-2.0/is_interaction_request.h -include/lasso/xml/id-wsf-2.0/is_interaction_response.h -include/lasso/xml/id-wsf-2.0/is_interaction_statement.h -include/lasso/xml/id-wsf-2.0/is_item.h -include/lasso/xml/id-wsf-2.0/is_parameter.h -include/lasso/xml/id-wsf-2.0/is_select.h -include/lasso/xml/id-wsf-2.0/is_text.h -include/lasso/xml/id-wsf-2.0/ps_add_collection_request.h -include/lasso/xml/id-wsf-2.0/ps_add_collection_response.h -include/lasso/xml/id-wsf-2.0/ps_add_entity_request.h -include/lasso/xml/id-wsf-2.0/ps_add_entity_response.h -include/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h -include/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h -include/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h -include/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h -include/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h -include/lasso/xml/id-wsf-2.0/ps_item_data.h -include/lasso/xml/id-wsf-2.0/ps_list_members_request.h -include/lasso/xml/id-wsf-2.0/ps_list_members_response.h -include/lasso/xml/id-wsf-2.0/ps_notification.h -include/lasso/xml/id-wsf-2.0/ps_notify.h -include/lasso/xml/id-wsf-2.0/ps_object.h -include/lasso/xml/id-wsf-2.0/ps_query_objects_request.h -include/lasso/xml/id-wsf-2.0/ps_query_objects_response.h -include/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h -include/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h -include/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h -include/lasso/xml/id-wsf-2.0/ps_request_abstract.h -include/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h -include/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h -include/lasso/xml/id-wsf-2.0/ps_resolve_input.h -include/lasso/xml/id-wsf-2.0/ps_response_abstract.h -include/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h -include/lasso/xml/id-wsf-2.0/sb2_consent.h -include/lasso/xml/id-wsf-2.0/ps_test_membership_request.h -include/lasso/xml/id-wsf-2.0/ps_test_membership_response.h -include/lasso/xml/id-wsf-2.0/sb2_credentials_context.h -include/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h -include/lasso/xml/id-wsf-2.0/sb2_redirect_request.h -include/lasso/xml/id-wsf-2.0/sb2_sender.h -include/lasso/xml/id-wsf-2.0/sb2_target_identity.h -include/lasso/xml/id-wsf-2.0/sb2_timeout.h -include/lasso/xml/id-wsf-2.0/sb2_usage_directive.h -include/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h -include/lasso/xml/id-wsf-2.0/sbf_framework.h -include/lasso/xml/id-wsf-2.0/sec_token.h -include/lasso/xml/id-wsf-2.0/sec_token_policy.h -include/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h -include/lasso/xml/id-wsf-2.0/subs_notification.h -include/lasso/xml/id-wsf-2.0/subs_notify_response.h -include/lasso/xml/id-wsf-2.0/subs_ref_item.h -include/lasso/xml/id-wsf-2.0/subs_subscription.h -include/lasso/xml/id-wsf-2.0/subsref_app_data.h -include/lasso/xml/id-wsf-2.0/subsref_create.h -include/lasso/xml/id-wsf-2.0/subsref_create_item.h -include/lasso/xml/id-wsf-2.0/subsref_create_response.h -include/lasso/xml/id-wsf-2.0/subsref_data.h -include/lasso/xml/id-wsf-2.0/subsref_data_response.h -include/lasso/xml/id-wsf-2.0/subsref_delete.h -include/lasso/xml/id-wsf-2.0/subsref_delete_item.h -include/lasso/xml/id-wsf-2.0/subsref_delete_response.h -include/lasso/xml/id-wsf-2.0/subsref_item_data.h -include/lasso/xml/id-wsf-2.0/subsref_modify.h -include/lasso/xml/id-wsf-2.0/subsref_modify_item.h -include/lasso/xml/id-wsf-2.0/subsref_modify_response.h -include/lasso/xml/id-wsf-2.0/subsref_notification.h -include/lasso/xml/id-wsf-2.0/subsref_notify.h -include/lasso/xml/id-wsf-2.0/subsref_notify_response.h -include/lasso/xml/id-wsf-2.0/subsref_query.h -include/lasso/xml/id-wsf-2.0/subsref_query_item.h -include/lasso/xml/id-wsf-2.0/subsref_query_response.h -include/lasso/xml/id-wsf-2.0/subsref_result_query.h -include/lasso/xml/id-wsf-2.0/subsref_subscription.h -include/lasso/xml/id-wsf-2.0/subsref_test_item.h -include/lasso/xml/id-wsf-2.0/util_empty.h -include/lasso/xml/id-wsf-2.0/util_extension.h -include/lasso/xml/id-wsf-2.0/util_response.h -include/lasso/xml/id-wsf-2.0/util_status.h -include/lasso/xml/ws/wsa_attributed_any.h -include/lasso/xml/ws/wsa_attributed_qname.h -include/lasso/xml/ws/wsa_attributed_unsigned_long.h -include/lasso/xml/ws/wsa_attributed_uri.h -include/lasso/xml/ws/wsa_endpoint_reference.h -include/lasso/xml/ws/wsa_metadata.h -include/lasso/xml/ws/wsa_problem_action.h -include/lasso/xml/ws/wsa_reference_parameters.h -include/lasso/xml/ws/wsa_relates_to.h -include/lasso/xml/ws/wsse_embedded.h -include/lasso/xml/ws/wsse_reference.h -include/lasso/xml/ws/wsse_security_header.h -include/lasso/xml/ws/wsse_security_token_reference.h -include/lasso/xml/ws/wsse_transformation_parameters.h -include/lasso/xml/ws/wsu_timestamp.h -include/lasso/xml/ws/wsse_username_token.h +include/lasso/xml/soap-1.1/soap_body.h +include/lasso/xml/soap-1.1/soap_detail.h +include/lasso/xml/soap-1.1/soap_fault.h +include/lasso/xml/soap-1.1/soap_envelope.h +include/lasso/xml/soap-1.1/soap_header.h +include/lasso/xml/soap-1.1/xml_soap11.h include/lasso/xml/strings.h +include/lasso/xml/idwsf_strings.h include/lasso/xml/xml.h include/lasso/xml/ds_key_info.h include/lasso/xml/ds_key_value.h @@ -285,17 +127,401 @@ include/lasso/saml-2.0/assertion_query.h include/lasso/saml-2.0/ecp.h include/lasso/saml-2.0/profile.h include/lasso/saml-2.0/name_id_management.h -include/lasso/id-wsf-2.0/discovery.h -include/lasso/id-wsf-2.0/data_service.h -include/lasso/id-wsf-2.0/profile.h -include/lasso/id-wsf-2.0/identity.h -include/lasso/id-wsf-2.0/server.h -include/lasso/id-wsf-2.0/session.h +include/lasso/saml-2.0/provider.h +include/lasso/saml-2.0/saml2_helper.h include/lasso/export.h include/lasso/lasso.h include/lasso/lasso_config.h include/lasso/errors.h -include/lasso/debug.h -include/lasso/registry-private.h include/lasso/registry.h +include/lasso/debug.h include/lasso/utils.h +include/lasso/registry-private.h +share/doc/lasso/writing-a-c-sp.txt +share/doc/lasso/writing-a-php-sp.txt +share/doc/lasso/writing-a-java-sp.txt +share/doc/lasso/writing-a-saml2-php-sp.txt +share/doc/lasso/book.rst +share/doc/lasso/common-knowledge.rst +share/doc/lasso/getting-lasso.rst +share/doc/lasso/integration.rst +share/doc/lasso/language-bindings.rst +share/doc/lasso/lasso-architecture.rst +share/doc/lasso/liberty-architecture.rst +share/doc/lasso/other-profiles.rst +share/doc/lasso/preface.rst +share/doc/lasso/single-sign-on.rst +share/gtk-doc/html/lasso/annotation-glossary.html +share/gtk-doc/html/lasso/api-index.html +share/gtk-doc/html/lasso/architecture.html +share/gtk-doc/html/lasso/home.png +share/gtk-doc/html/lasso/idff.html +share/gtk-doc/html/lasso/idwsf.html +share/gtk-doc/html/lasso/idwsf2.html +share/gtk-doc/html/lasso/index.html +share/gtk-doc/html/lasso/index.sgml +share/gtk-doc/html/lasso/lasso-Addon-to-SAML-2.0-profile-for-ID-WSF-2.0-bootsraping.ht +share/gtk-doc/html/lasso/lasso-Base-Strings.html +share/gtk-doc/html/lasso/lasso-Error-Codes.html +share/gtk-doc/html/lasso/lasso-ID-WSF-1.0-Strings.html +share/gtk-doc/html/lasso/lasso-Initialization-functions.html +share/gtk-doc/html/lasso/lasso-LassoAssertionQuery.html +share/gtk-doc/html/lasso/lasso.html +share/gtk-doc/html/lasso/lasso-LassoAuthentication.html +share/gtk-doc/html/lasso/lasso-LassoDataService.html +share/gtk-doc/html/lasso/lasso-LassoDefederation.html +share/gtk-doc/html/lasso/lasso-LassoDiscoAuthenticateRequester.html +share/gtk-doc/html/lasso/lasso-LassoDiscoAuthenticateSessionContext.html +share/gtk-doc/html/lasso/lasso-LassoDiscoAuthorizeRequester.html +share/gtk-doc/html/lasso/lasso-LassoDiscoCredentials.html +share/gtk-doc/html/lasso/lasso-LassoDiscoDescription.html +share/gtk-doc/html/lasso/lasso-LassoDiscoEncryptResourceID.html +share/gtk-doc/html/lasso/lasso-LassoDiscoEncryptedResourceID.html +share/gtk-doc/html/lasso/lasso-LassoDiscoGenerateBearerToken.html +share/gtk-doc/html/lasso/lasso-LassoDiscoInsertEntry.html +share/gtk-doc/html/lasso/lasso-LassoDiscoModify.html +share/gtk-doc/html/lasso/lasso-LassoDiscoModifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoDiscoOptions.html +share/gtk-doc/html/lasso/lasso-LassoDiscoQuery.html +share/gtk-doc/html/lasso/lasso-LassoDiscoQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoDiscoRemoveEntry.html +share/gtk-doc/html/lasso/lasso-LassoDiscoRequestedServiceType.html +share/gtk-doc/html/lasso/lasso-LassoDiscoResourceID.html +share/gtk-doc/html/lasso/lasso-LassoDiscoResourceOffering.html +share/gtk-doc/html/lasso/lasso-LassoDiscoSendSingleLogout.html +share/gtk-doc/html/lasso/lasso-LassoDiscovery.html +share/gtk-doc/html/lasso/lasso-LassoDiscoServiceInstance.html +share/gtk-doc/html/lasso/lasso-LassoDsKeyInfo.html +share/gtk-doc/html/lasso/lasso-LassoDsKeyValue.html +share/gtk-doc/html/lasso/lasso-LassoDsRsaKeyValue.html +share/gtk-doc/html/lasso/lasso-LassoDstData.html +share/gtk-doc/html/lasso/lasso-LassoDstModification.html +share/gtk-doc/html/lasso/lasso-LassoDstModify.html +share/gtk-doc/html/lasso/lasso-LassoDstModifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoDstNewData.html +share/gtk-doc/html/lasso/lasso-LassoDstQuery.html +share/gtk-doc/html/lasso/lasso-LassoDstQueryItem.html +share/gtk-doc/html/lasso/lasso-LassoDstQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoEcp.html +share/gtk-doc/html/lasso/up.png +share/gtk-doc/html/lasso/lasso-LassoFederation.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DataService.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoAbstract.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoEndpointContext.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoKeys.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoProviderID.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoRequestedService.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSecurityContext.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceContext.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceType.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Discovery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAdd.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAddResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationDelete.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationDeleteResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDelete.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDeleteResponse.html +share/gtk-doc/html/lasso/lasso-LassoIsHelp.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegister.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegisterResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplace.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplaceResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMetadata.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDataResponseBase.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteItemBase.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefAppData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreate.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDataResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDelete.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefItemData.html +share/gtk-doc/html/lasso/lasso-LassoIsItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModify.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQueryItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefResultQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefTestItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstResultQueryBase.html +share/gtk-doc/html/lasso/lasso-LassoIsText.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstTestItemBase.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsMappingInput.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsMappingOutput.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Profile.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsItemData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddToCollectionRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotification.html +share/gtk-doc/html/lasso/lasso-registry.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotify.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsObject.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsQueryObjectsRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsQueryObjectsResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveCollectionRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveEntityRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveFromCollectionRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRequestAbstract.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveInput.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResponseAbstract.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsSetObjectInfoRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsTestMembershipRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsTestMembershipResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Consent.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2CredentialsContext.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2EndpointUpdate.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2RedirectRequest.html +share/gtk-doc/html/lasso/lasso-LassoIdentity.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Sender.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2TargetIdentity.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Timeout.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2UsageDirective.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2UserInteractionHeader.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SbfFramework.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecToken.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTokenPolicy.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTransitedProviderPath.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotification.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilEmpty.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefAppData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreate.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreateItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreateResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDataResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDelete.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteResponse.html +share/gtk-doc/html/lasso/lasso.devhelp +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItemData.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModify.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModifyItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotification.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotify.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotifyResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryItem.html +share/gtk-doc/html/lasso/lasso-LassoIsInquiry.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefResultQuery.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefSubscription.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefTestItem.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsSubscription.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilResponse.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilStatus.html +share/gtk-doc/html/lasso/lasso-LassoIdWsf2Utilextension.html +share/gtk-doc/html/lasso/lasso-LassoInteractionProfileService.html +share/gtk-doc/html/lasso/lasso-LassoIsInquiryElement.html +share/gtk-doc/html/lasso/lasso-LassoLecp.html +share/gtk-doc/html/lasso/lasso-LassoIsInteractionRequest.html +share/gtk-doc/html/lasso/lasso-LassoIsInteractionResponse.html +share/gtk-doc/html/lasso/lasso-LassoIsInteractionStatement.html +share/gtk-doc/html/lasso/lasso-LassoIsParameter.html +share/gtk-doc/html/lasso/lasso-LassoIsRedirectRequest.html +share/gtk-doc/html/lasso/lasso-LassoIsSelect.html +share/gtk-doc/html/lasso/lasso-LassoIsUserInteraction.html +share/gtk-doc/html/lasso/lasso-LassoLibAssertion.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthenticationStatement.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthnContext.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequest.html +share/gtk-doc/html/lasso/lasso-LassoLibIDPEntry.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequestEnvelope.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponse.html +share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponseEnvelope.html +share/gtk-doc/html/lasso/lasso-LassoLibFederationTerminationNotification.html +share/gtk-doc/html/lasso/lasso-LassoLibIDPEntries.html +share/gtk-doc/html/lasso/lasso-LassoLibIDPList.html +share/gtk-doc/html/lasso/lasso-LassoLibLogoutRequest.html +share/gtk-doc/html/lasso/lasso-LassoLibLogoutResponse.html +share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingRequest.html +share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingResponse.html +share/gtk-doc/html/lasso/lasso.devhelp2 +share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierRequest.html +share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierResponse.html +share/gtk-doc/html/lasso/lasso-LassoLibRequestAuthnContext.html +share/gtk-doc/html/lasso/lasso-LassoLibScoping.html +share/gtk-doc/html/lasso/lasso-LassoLibStatusResponse.html +share/gtk-doc/html/lasso/lasso-LassoLibSubject.html +share/gtk-doc/html/lasso/lasso-LassoLogin.html +share/gtk-doc/html/lasso/lasso-LassoLogout.html +share/gtk-doc/html/lasso/lasso-LassoMiscTextNode.html +share/gtk-doc/html/lasso/lasso-LassoNameIdManagement.html +share/gtk-doc/html/lasso/lasso-LassoNameIdentifierMapping.html +share/gtk-doc/html/lasso/lasso-LassoNode.html +share/gtk-doc/html/lasso/lasso-LassoNameRegistration.html +share/gtk-doc/html/lasso/lasso-LassoPersonalProfileService.html +share/gtk-doc/html/lasso/lasso-LassoProfile.html +share/gtk-doc/html/lasso/lasso-LassoProvider.html +share/gtk-doc/html/lasso/lasso-LassoSaCredentials.html +share/gtk-doc/html/lasso/lasso-LassoSaParameter.html +share/gtk-doc/html/lasso/lasso-LassoSaPasswordTransforms.html +share/gtk-doc/html/lasso/lasso-LassoSaSASLRequest.html +share/gtk-doc/html/lasso/lasso-LassoSaSASLResponse.html +share/gtk-doc/html/lasso/lasso-LassoSaTransform.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Action.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Advice.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Assertion.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Attribute.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AttributeStatement.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AttributeValue.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AudienceRestriction.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AuthnContext.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AuthnStatement.html +share/gtk-doc/html/lasso/lasso-LassoSaml2AuthzDecisionStatement.html +share/gtk-doc/html/lasso/lasso-LassoSaml2BaseIDAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSaml2ConditionAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Conditions.html +share/gtk-doc/html/lasso/lasso-LassoSaml2EncryptedElement.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Evidence.html +share/gtk-doc/html/lasso/lasso-LassoSaml2KeyInfoConfirmationData.html +share/gtk-doc/html/lasso/lasso-LassoSaml2NameID.html +share/gtk-doc/html/lasso/lasso-LassoSaml2OneTimeUse.html +share/gtk-doc/html/lasso/lasso-LassoSaml2ProxyRestriction.html +share/gtk-doc/html/lasso/lasso-LassoSaml2StatementAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSaml2Subject.html +share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectConfirmation.html +share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectConfirmationData.html +share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectLocality.html +share/gtk-doc/html/lasso/lasso-LassoSamlAdvice.html +share/gtk-doc/html/lasso/lasso-LassoSamlAssertion.html +share/gtk-doc/html/lasso/lasso-LassoSamlAttribute.html +share/gtk-doc/html/lasso/lasso-LassoSamlAttributeDesignator.html +share/gtk-doc/html/lasso/lasso-LassoSamlAttributeStatement.html +share/gtk-doc/html/lasso/lasso-LassoSamlAttributeValue.html +share/gtk-doc/html/lasso/lasso-LassoSamlAudienceRestrictionCondition.html +share/gtk-doc/html/lasso/lasso-LassoSamlAuthenticationStatement.html +share/gtk-doc/html/lasso/lasso-LassoSamlAuthorityBinding.html +share/gtk-doc/html/lasso/lasso-LassoSamlConditionAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlConditions.html +share/gtk-doc/html/lasso/lasso-LassoSamlNameIdentifier.html +share/gtk-doc/html/lasso/lasso-LassoSamlStatementAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlSubject.html +share/gtk-doc/html/lasso/lasso-LassoSamlSubjectConfirmation.html +share/gtk-doc/html/lasso/lasso-LassoSamlSubjectLocality.html +share/gtk-doc/html/lasso/lasso-LassoSamlSubjectStatement.html +share/gtk-doc/html/lasso/lasso-LassoSamlSubjectStatementAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResolve.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2AssertionIDRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2AttributeQuery.html +share/gtk-doc/html/lasso/lasso-LassoSamlpStatus.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnQuery.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthzDecisionQuery.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2Extensions.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2IDPEntry.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2IDPList.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2LogoutRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2LogoutResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2ManageNameIDRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2ManageNameIDResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDMappingRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDMappingResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDPolicy.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2RequestAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2RequestedAuthnContext.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2Response.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2Scoping.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2Status.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusCode.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusDetail.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2SubjectQueryAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlp2Terminate.html +share/gtk-doc/html/lasso/lasso-LassoSamlpRequest.html +share/gtk-doc/html/lasso/lasso-LassoSamlpRequestAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlpResponse.html +share/gtk-doc/html/lasso/lasso-LassoSamlpResponseAbstract.html +share/gtk-doc/html/lasso/lasso-LassoSamlpStatusCode.html +share/gtk-doc/html/lasso/lasso-LassoSecResourceAccessStatement.html +share/gtk-doc/html/lasso/lasso-LassoServer.html +share/gtk-doc/html/lasso/lasso-LassoSession.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingConsent.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingCorrelation.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtTimeout.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredential.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredentialsContext.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtServiceInstanceUpdate.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingProcessingContext.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingProvider.html +share/gtk-doc/html/lasso/lasso-LassoSoapBindingUsageDirective.html +share/gtk-doc/html/lasso/lasso-LassoSoapBody.html +share/gtk-doc/html/lasso/lasso-LassoSoapDetail.html +share/gtk-doc/html/lasso/lasso-LassoSoapEnvelope.html +share/gtk-doc/html/lasso/lasso-LassoSoapFault.html +share/gtk-doc/html/lasso/lasso-LassoSoapHeader.html +share/gtk-doc/html/lasso/lasso-LassoUtilityStatus.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedAny.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedQName.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedURI.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedUnsignedLong.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrEndpointReference.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrMetadata.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrProblemAction.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrReferenceParameters.html +share/gtk-doc/html/lasso/lasso-LassoWsAddrRelatesTo.html +share/gtk-doc/html/lasso/lasso-LassoWsSec1Embedded.html +share/gtk-doc/html/lasso/lasso-LassoWsSec1Reference.html +share/gtk-doc/html/lasso/lasso-LassoWsSec1SecurityHeader.html +share/gtk-doc/html/lasso/lasso-LassoWsSec1SecurityTokenReference.html +share/gtk-doc/html/lasso/lasso-LassoWsSec1TransformationParameters.html +share/gtk-doc/html/lasso/lasso-LassoWsUtil1Timestamp.html +share/gtk-doc/html/lasso/lasso-LassoWsfProfile.html +share/gtk-doc/html/lasso/lasso-LassoWsseUsernameToken.html +share/gtk-doc/html/lasso/lasso-SAML-2.0-Strings.html +share/gtk-doc/html/lasso/lasso-SOAP-Binding-utility-function-for-ID-WSF-2.0.html +share/gtk-doc/html/lasso/lasso-Strings-for-ID-FF-1.2.html +share/gtk-doc/html/lasso/lasso-Strings-for-ID-WSF-2.0.html +share/gtk-doc/html/lasso/lasso-Strings-for-SOAP.html +share/gtk-doc/html/lasso/lasso-Strings-for-WS-*.html +share/gtk-doc/html/lasso/lasso-Strings-for-XML-DSIG.html +share/gtk-doc/html/lasso/lasso-Utility-functions-for-ID-WSF-1.0.html +share/gtk-doc/html/lasso/lasso-Utility-functions-for-SAML-2.0.html +share/gtk-doc/html/lasso/left.png +share/gtk-doc/html/lasso/pt01.html +share/gtk-doc/html/lasso/right.png +share/gtk-doc/html/lasso/rn01.html +share/gtk-doc/html/lasso/saml2.html +share/gtk-doc/html/lasso/soap.html +share/gtk-doc/html/lasso/style.css +share/gtk-doc/html/lasso/ws-addr.html +share/gtk-doc/html/lasso/xml-dsig.html +share/gtk-doc/html/lasso/xml-idff.html +share/gtk-doc/html/lasso/xml-idwsf.html +share/gtk-doc/html/lasso/xml-idwsf2.html +share/gtk-doc/html/lasso/xml-samlv2.html +@dirrm include/lasso/xml +@dirrm include/lasso/xml/saml-2.0 +@dirrm include/lasso/xml/soap-1.1 +@dirrm include/lasso/id-ff +@dirrm include/lasso/saml-2.0 +@dirrm include/lasso +@dirrm share/doc/lasso +@dirrm share/gtk-doc/html/lasso diff --git a/security/lasso/distinfo b/security/lasso/distinfo index ab9d56381042..bee6ba9518a9 100644 --- a/security/lasso/distinfo +++ b/security/lasso/distinfo @@ -1,14 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/12/01 08:49:46 manu Exp $ +$NetBSD: distinfo,v 1.7 2010/05/31 16:44:28 manu Exp $ -SHA1 (lasso-2.2.2.tar.gz) = 32651fa71b16da01a94db234425846729a510623 -RMD160 (lasso-2.2.2.tar.gz) = a4faae605726202db33d36a2b520b0ab8f17aa76 -Size (lasso-2.2.2.tar.gz) = 1802749 bytes -SHA1 (patch-aa) = 965365d3aff5e1014dbe5bc7036e12837ccfc185 -SHA1 (patch-ba) = 4ebb013f1c264e5b0008faeebdecc7bdb49be63a -SHA1 (patch-bb) = 0867b8ae4036620084b73d28546ac089b57d3fb9 -SHA1 (patch-bc) = 1633e47d0b4db574183bc3798a2dd839c98d11cb -SHA1 (patch-bd) = d6788200b7f7a871b8d5bb788c5feff174c2a371 -SHA1 (patch-ca) = d65ec7dcf14db7be4abf0d804e666768d0cb81d5 -SHA1 (patch-cb) = 181213f32003c2744e40c45d24fa30198444e0af -SHA1 (patch-cc) = 71794a4f081bafd451528f11b06fb61997ff4f9f -SHA1 (patch-cd) = 6dfacf5eb7308ad78609e3c8412422b98cb891d4 +SHA1 (lasso-2.2.91.tar.gz) = 22f8e22938cea9c77abbac763c9bb698e1c44cc8 +RMD160 (lasso-2.2.91.tar.gz) = bcbc1d293a9e9bcf45ca9a09d103de9e640b625a +Size (lasso-2.2.91.tar.gz) = 1919703 bytes diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa deleted file mode 100644 index f7dd60127437..000000000000 --- a/security/lasso/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/07/06 22:01:34 joerg Exp $ - ---- lasso/registry.c.orig 2010-05-31 15:45:21.000000000 +0200 -+++ lasso/registry.c -@@ -116,7 +116,7 @@ guint lasso_registry_direct_mapping_hash - { - return g_direct_hash((void*)(record->from_namespace - ^ record->from_name -- ^ record->to_namespace)); -+ ^ (size_t)record->to_namespace)); - } - - /** -@@ -129,7 +129,7 @@ guint lasso_registry_direct_mapping_hash - */ - guint lasso_registry_functional_mapping_hash(LassoRegistryFunctionalMappingRecord *record) - { -- return g_direct_hash((void*)(record->from_namespace ^ record->to_namespace)); -+ return g_direct_hash((void*)(record->from_namespace ^ (size_t)record->to_namespace)); - } - - /** diff --git a/security/lasso/patches/patch-ba b/security/lasso/patches/patch-ba deleted file mode 100644 index acc47a0c18e4..000000000000 --- a/security/lasso/patches/patch-ba +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2009/04/09 03:23:55 manu Exp $ ---- configure.ac.orig 2008-07-22 12:46:24.000000000 +0000 -+++ configure.ac 2009-03-01 06:41:53.000000000 +0000 -@@ -791,9 +791,9 @@ - if test "z$PKG_CONFIG_PATH" != "z"; then - export PKG_CONFIG_PATH - fi - --PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) -+PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) - - AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth]) - if test "x$enable_wsf" = "xyes"; then - if test "$with_sasl2" != "no" && test "$with_sasl2" != "yes" diff --git a/security/lasso/patches/patch-bb b/security/lasso/patches/patch-bb deleted file mode 100644 index 388bdcf2c3ea..000000000000 --- a/security/lasso/patches/patch-bb +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2009/05/26 05:26:00 manu Exp $ ---- configure.orig 2009-04-05 09:25:04.000000000 +0200 -+++ configure 2009-04-05 09:25:48.000000000 +0200 -@@ -15388,14 +15388,14 @@ - if test -n "$LASSO_CFLAGS"; then - pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null` -+ pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null` - else - pkg_failed=yes - fi - fi -@@ -15406,14 +15406,14 @@ - if test -n "$LASSO_LIBS"; then - pkg_cv_LASSO_LIBS="$LASSO_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null` -+ pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null` - else - pkg_failed=yes - fi - fi -@@ -15430,16 +15430,16 @@ - else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"` -+ LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"` - else -- LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"` -+ LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LASSO_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met: - - $LASSO_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you -@@ -15448,9 +15448,9 @@ - Alternatively, you may set the environment variables LASSO_CFLAGS - and LASSO_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met: -+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met: - - $LASSO_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you diff --git a/security/lasso/patches/patch-bc b/security/lasso/patches/patch-bc deleted file mode 100644 index 45b1ac7cc80d..000000000000 --- a/security/lasso/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2009/07/06 22:01:34 joerg Exp $ - ---- lasso/xml/tools.c.orig 2009-03-27 17:12:48.000000000 +0100 -+++ lasso/xml/tools.c -@@ -1210,7 +1210,7 @@ is_base64(const char *message) - const char *c; - - c = message; -- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++; -+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++; - while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */ - - if (*c == 0) diff --git a/security/lasso/patches/patch-bd b/security/lasso/patches/patch-bd deleted file mode 100644 index ce3d6879426d..000000000000 --- a/security/lasso/patches/patch-bd +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-bd,v 1.3 2009/07/06 22:01:34 joerg Exp $ - ---- lasso/xml/xml.c.orig 2009-03-27 17:12:48.000000000 +0100 -+++ lasso/xml/xml.c -@@ -1554,8 +1554,9 @@ lasso_node_new_from_xmlNode(xmlNode *xml - } - } - } -- -- node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename); -+ if (typename) { -+ node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename); -+ } - lasso_release(typename); - - return node; -@@ -1592,7 +1593,7 @@ is_base64(const char *message) - const char *c; - - c = message; -- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++; -+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++; - while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */ - - if (*c == 0) diff --git a/security/lasso/patches/patch-ca b/security/lasso/patches/patch-ca deleted file mode 100644 index 8592d58baae9..000000000000 --- a/security/lasso/patches/patch-ca +++ /dev/null @@ -1,133 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2009/12/01 08:49:46 manu Exp $ ---- lasso/saml-2.0/profile.c.orig 2009-03-27 17:12:48.000000000 +0100 -+++ lasso/saml-2.0/profile.c 2009-11-30 20:19:47.000000000 +0100 -@@ -49,5 +49,5 @@ - static char* lasso_saml20_profile_build_artifact(LassoProvider *provider); - static void remove_all_signatures(LassoNode *node); --static char * lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign); -+static int lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query); - - /* -@@ -1014,36 +1014,41 @@ - * Return value: a newly allocated string containing the query string if successfull, NULL otherwise. - */ --static char * --lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign) { -+static int -+lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query) { - char *unsigned_query = NULL; - char *result = NULL; -+ int rc = 0; - -- g_return_val_if_fail(LASSO_IS_NODE(msg), NULL); -+ lasso_bad_param(PROFILE, profile); -+ lasso_bad_param(NODE, msg); - - unsigned_query = lasso_node_build_query(msg); - if (profile->msg_relayState) { -- char *query = unsigned_query; -- xmlChar *encoded_relayState; -- if (strlen(profile->msg_relayState) < 81) { -- encoded_relayState = xmlURIEscape((xmlChar*)profile->msg_relayState); -- if (encoded_relayState != NULL) { -- unsigned_query = g_strdup_printf("%s&RelayState=%s", query, -- (char*)encoded_relayState); -- lasso_release_string(query); -- lasso_release_xml_string(encoded_relayState); -- } -- } else { -- g_warning("Refused to encode a RelayState of more than 80 bytes, #3.4.3 of" -- " saml-bindings-2.0-os"); -+ unsigned_query = lasso_url_add_parameters(unsigned_query, 1, "RelayState", profile->msg_relayState, NULL); -+ -+ if (strlen(profile->msg_relayState) > 80) { -+ g_warning("Encoded a RelayState of more than 80 bytes, see #3.4.3 of saml-bindings-2.0-os"); - } - } - if (sign && lasso_flag_add_signature) { -+ LassoServer *server = profile->server; -+ goto_cleanup_if_fail_with_rc (LASSO_IS_SERVER(server), -+ LASSO_PROFILE_ERROR_MISSING_SERVER); -+ goto_cleanup_if_fail_with_rc ( -+ profile->server->signature_method != LASSO_SIGNATURE_TYPE_NONE && -+ profile->server->private_key, -+ LASSO_DS_ERROR_PRIVATE_KEY_LOAD_FAILED); -+ - result = lasso_query_sign(unsigned_query, profile->server->signature_method, - profile->server->private_key); -- lasso_release_string(unsigned_query); -+ lasso_transfer_string(*query, result); - } else { -- result = unsigned_query; -+ lasso_transfer_string(*query, unsigned_query); - } -- return result; -+cleanup: -+ lasso_release_string(unsigned_query); -+ lasso_release_string(result); -+ return rc; -+ - } - -@@ -1054,8 +1059,13 @@ - if (node == NULL) - return; -+ - klass = LASSO_NODE_GET_CLASS(node); -- if (klass->node_data->sign_type_offset != 0) { -- G_STRUCT_MEMBER(LassoSignatureType, node,klass->node_data->sign_type_offset) = -- LASSO_SIGNATURE_TYPE_NONE; -+ /* follow the class parenting chain */ -+ while (klass && LASSO_IS_NODE_CLASS(klass)) { -+ if (klass && klass->node_data && klass->node_data->sign_type_offset != 0) { -+ G_STRUCT_MEMBER(LassoSignatureType, node, klass->node_data->sign_type_offset) = -+ LASSO_SIGNATURE_TYPE_NONE; -+ } -+ klass = g_type_class_peek_parent(klass); - } - } -@@ -1097,4 +1107,17 @@ - } - -+/** -+ * lasso_saml20_profile_build_http_redirect: -+ * @profile: a #LassoProfile object -+ * @msg: a #LassoNode object representing a SAML 2.0 message -+ * @must_sign: wheter to sign the query message using query signatures -+ * @url: the URL where the query is targeted -+ * -+ * Build an HTTP URL with a query-string following the SAML 2.0 HTTP-Redirect binding rules, -+ * eventually sign it. Any signature at the message level is removed. -+ * -+ * Return value: 0 if successful, an error code otherwise. -+ */ -+ - gint - lasso_saml20_profile_build_http_redirect(LassoProfile *profile, -@@ -1103,12 +1126,17 @@ - const char *url) - { -- char *query; -+ char *query = NULL; -+ int rc = 0; - - if (url == NULL) { - return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); - } -+ /* remove XML signature */ -+ remove_signature(msg); - /* No signature on the XML message */ -- remove_all_signatures(msg); -- query = lasso_saml20_profile_export_to_query(profile, msg, must_sign); -+ rc = lasso_saml20_profile_export_to_query(profile, msg, must_sign, &query); -+ if (rc) -+ return rc; -+ - lasso_assign_new_string(profile->msg_url, lasso_concat_url_query(url, query)); - lasso_release(profile->msg_body); -@@ -1317,4 +1345,5 @@ - lasso_release(idx); - } -+ /* remove signature at the message level */ - rc = lasso_saml20_profile_build_http_redirect(profile, msg, must_sign, url); - lasso_release(url); diff --git a/security/lasso/patches/patch-cb b/security/lasso/patches/patch-cb deleted file mode 100644 index 7f91cc07faf1..000000000000 --- a/security/lasso/patches/patch-cb +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-cb,v 1.3 2009/12/01 08:49:46 manu Exp $ ---- lasso/xml/tools.c.orig 2009-11-30 18:38:05.000000000 +0100 -+++ lasso/xml/tools.c 2009-11-30 18:39:45.000000000 +0100 -@@ -1492,2 +1492,70 @@ - return result; - } -+ -+ -+/** -+ * lasso_url_add_parameters: -+ * @url: the original URL -+ * @free: whether to free the URL parameter -+ * @...: pairs of strings, key, value, followed by NULL -+ * -+ * Iterate over all pairs of key,value, and concatenate them to @url encoded as "&key=value", where -+ * key and value are url-encoded. -+ * If free is true and at least one pair was given, url is freed. If url is NULL, the first -+ * ampersand is omitted. -+ * -+ * Return value: a newly allocated string, or url. -+ */ -+char* -+lasso_url_add_parameters(char *url, -+ gboolean free, ...) -+{ -+ char *old_url = url, *new_url; -+ xmlChar *encoded_key, *encoded_value; -+ int rc = 0; -+ va_list ap; -+ -+ va_start(ap, free); -+ -+ while (1) { -+ char *key; -+ char *value; -+ -+ key = va_arg(ap, char*); -+ if (! key) { -+ break; -+ } -+ encoded_key = xmlURIEscapeStr((xmlChar*)key, NULL); -+ goto_cleanup_if_fail_with_rc(encoded_key, 0); -+ -+ value = va_arg(ap, char*); -+ if (! value) { -+ message(G_LOG_LEVEL_CRITICAL, "lasso_url_add_parameter: key without a value !!"); -+ break; -+ } -+ encoded_value = xmlURIEscapeStr((xmlChar*)value, NULL); -+ goto_cleanup_if_fail_with_rc(encoded_value, 0); -+ -+ if (old_url) { -+ new_url = g_strdup_printf("%s&%s=%s", old_url, (char*)encoded_key, (char*)encoded_value); -+ } else { -+ new_url = g_strdup_printf("%s=%s", (char*)encoded_key, (char*)encoded_value); -+ } -+ if (old_url != url) { -+ lasso_release_string(old_url); -+ } -+ old_url = new_url; -+ -+ lasso_release_xml_string(encoded_key); -+ lasso_release_xml_string(encoded_value); -+ } -+cleanup: -+ va_end(ap); -+ if (free && new_url != url) { -+ lasso_release(url); -+ } -+ lasso_release_xml_string(encoded_key); -+ -+ return new_url; -+} -+ diff --git a/security/lasso/patches/patch-cc b/security/lasso/patches/patch-cc deleted file mode 100644 index c6466cda4db9..000000000000 --- a/security/lasso/patches/patch-cc +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2009/12/01 08:49:46 manu Exp $ ---- lasso/utils.h.orig 2009-11-30 18:54:46.000000000 +0100 -+++ lasso/utils.h 2009-11-30 19:31:22.000000000 +0100 -@@ -336,4 +336,73 @@ - g_return_val_if_fail(name != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - -+/** -+ * The following macros are made to create some formalism for function's cleanup code. -+ * -+ * The exit label should be called 'cleanup'. And for functions returning an integer error code, the -+ * error code should be named 'rc' and 'return rc;' should be the last statement of the function. -+ */ -+ -+/** -+ * goto_cleanup_with_rc: -+ * @rc_value: integer return value -+ * -+ * This macro jump to the 'cleanup' label and set the return value to @rc_value. -+ * -+ */ -+#define goto_cleanup_with_rc(rc_value) \ -+ {\ -+ rc = (rc_value); \ -+ goto cleanup; \ -+ } -+ -+/** -+ * goto_cleanup_if_fail: -+ * @condition: a boolean condition -+ * -+ * Jump to the 'cleanup' label if the @condition is FALSE. -+ * -+ */ -+#define goto_cleanup_if_fail(condition) \ -+ {\ -+ if (! (condition) ) {\ -+ goto cleanup; \ -+ } \ -+ } -+ -+/** -+ * goto_cleanup_if_fail_with_rc: -+ * @condition: a boolean condition -+ * @rc_value: integer return value -+ * -+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to -+ * @rc_value. -+ * -+ */ -+#define goto_cleanup_if_fail_with_rc(condition, rc_value) \ -+ {\ -+ if (! (condition) ) {\ -+ rc = (rc_value); \ -+ goto cleanup; \ -+ } \ -+ } -+ -+/** -+ * goto_cleanup_if_fail_with_rc_with_warning: -+ * @condition: a boolean condition -+ * @rc_value: integer return value -+ * -+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to -+ * @rc_value. Also emit a warning, showing the condition and the return value. -+ * -+ */ -+#define goto_cleanup_if_fail_with_rc_with_warning(condition, rc_value) \ -+ {\ -+ if (! (condition) ) {\ -+ g_warning("%s failed, returning %s", __STRING(condition), __STRING(rc_value));\ -+ rc = (rc_value); \ -+ goto cleanup; \ -+ } \ -+ } -+ - #define goto_exit_with_rc(rc_value) \ - {\ diff --git a/security/lasso/patches/patch-cd b/security/lasso/patches/patch-cd deleted file mode 100644 index 8b8ac3821bb5..000000000000 --- a/security/lasso/patches/patch-cd +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2009/12/01 08:49:46 manu Exp $ ---- lasso/xml/private.h.orig 2009-11-30 19:54:53.000000000 +0100 -+++ lasso/xml/private.h 2009-11-30 19:55:04.000000000 +0100 -@@ -214,4 +214,5 @@ - - char * lasso_get_relaystate_from_query(const char *query); -+char * lasso_url_add_parameters(char *url, gboolean free, ...); - - #ifdef __cplusplus diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile index 55b93cc2dcc0..9fcb730a2962 100644 --- a/www/ap2-auth-mellon/Makefile +++ b/www/ap2-auth-mellon/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/01/17 12:02:48 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/05/31 16:46:30 manu Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/} -DISTNAME= mod_auth_mellon-0.2.5 -PKGREVISION= 3 +DISTNAME= mod_auth_mellon-0.2.7 CATEGORIES= www security MASTER_SITES= http://modmellon.googlecode.com/files/ diff --git a/www/ap2-auth-mellon/distinfo b/www/ap2-auth-mellon/distinfo index 9ac6768a10f5..844567802360 100644 --- a/www/ap2-auth-mellon/distinfo +++ b/www/ap2-auth-mellon/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2009/12/20 11:31:30 manu Exp $ +$NetBSD: distinfo,v 1.8 2010/05/31 16:46:30 manu Exp $ -SHA1 (mod_auth_mellon-0.2.5.tar.gz) = f1d75456df39d183b6d1919f06dc2bc7b9b1afb6 -RMD160 (mod_auth_mellon-0.2.5.tar.gz) = 7db221e431384ff9f73badc208eed55a0a0011a7 -Size (mod_auth_mellon-0.2.5.tar.gz) = 89404 bytes -SHA1 (patch-aa) = b8a46a2a82f228a95cf28c1d395394373e0f6ccb +SHA1 (mod_auth_mellon-0.2.7.tar.gz) = ed6b7e74d00bcf32889eff7d647b93e7adb41bd8 +RMD160 (mod_auth_mellon-0.2.7.tar.gz) = 35acee9d78f20388792dae0ec96f7490e36ea685 +Size (mod_auth_mellon-0.2.7.tar.gz) = 90018 bytes diff --git a/www/ap2-auth-mellon/patches/patch-aa b/www/ap2-auth-mellon/patches/patch-aa deleted file mode 100644 index 067eeb969b2f..000000000000 --- a/www/ap2-auth-mellon/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/12/20 11:31:30 manu Exp $ ---- auth_mellon_handler.c.orig 2009-12-20 10:19:47.000000000 +0100 -+++ auth_mellon_handler.c 2009-12-20 10:20:09.000000000 +0100 -@@ -1899,9 +1899,9 @@ - return HTTP_BAD_REQUEST; - } - - /* Check that charset is sane */ -- for (cp = psf_id; *cp; cp++) { -+ for (cp = charset; *cp; cp++) { - if (!apr_isalnum(*cp) && (*cp != '-') && (*cp != '_')) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "Bad repost query: invalid charset \"%s\"", charset); - return HTTP_BAD_REQUEST; diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 5138dbc3ef82..8053559ccaca 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.200 2010/04/15 01:09:55 wiz Exp $ +# $NetBSD: Makefile,v 1.201 2010/05/31 17:34:33 drochner Exp $ -DISTNAME= gtk+-2.18.9 +DISTNAME= gtk+-2.20.1 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 1 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \ - ${MASTER_SITE_GNOME:=sources/gtk+/2.18/} +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.20/ \ + ${MASTER_SITE_GNOME:=sources/gtk+/2.20/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -30,6 +29,7 @@ USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes GNU_CONFIGURE= yes +CONFIG_SHELL= bash CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata # Work around build problems, disable unstable PAPI, PR #41608: CONFIGURE_ARGS+= --disable-papi diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index fc9ce302ca58..02dca564f804 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.70 2010/02/14 09:58:14 wiz Exp $ +@comment $NetBSD: PLIST,v 1.71 2010/05/31 17:34:33 drochner Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-builder-convert @@ -86,6 +86,7 @@ include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrendererspin.h +include/gtk-2.0/gtk/gtkcellrendererspinner.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcellview.h @@ -167,6 +168,7 @@ include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoffscreenwindow.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkorientable.h @@ -211,6 +213,7 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h +include/gtk-2.0/gtk/gtkspinner.h include/gtk-2.0/gtk/gtkstatusbar.h include/gtk-2.0/gtk/gtkstatusicon.h include/gtk-2.0/gtk/gtkstock.h @@ -236,6 +239,8 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolitemgroup.h +include/gtk-2.0/gtk/gtktoolpalette.h include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h @@ -292,6 +297,7 @@ lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la +lib/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la @@ -369,9 +375,11 @@ share/gtk-2.0/demo/printing.c share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/search_entry.c share/gtk-2.0/demo/sizegroup.c +share/gtk-2.0/demo/spinner.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textscroll.c share/gtk-2.0/demo/textview.c +share/gtk-2.0/demo/toolpalette.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html @@ -387,6 +395,7 @@ share/gtk-doc/html/gail-libgail-util/right.png share/gtk-doc/html/gail-libgail-util/style.css share/gtk-doc/html/gail-libgail-util/up.png share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html +share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html share/gtk-doc/html/gdk-pixbuf/apa.html share/gtk-doc/html/gdk-pixbuf/apas02.html share/gtk-doc/html/gdk-pixbuf/apas03.html @@ -435,12 +444,14 @@ share/gtk-doc/html/gdk/GdkDisplay.html share/gtk-doc/html/gdk/GdkDisplayManager.html share/gtk-doc/html/gdk/GdkScreen.html share/gtk-doc/html/gdk/X_cursor.png +share/gtk-doc/html/gdk/annotation-glossary.html share/gtk-doc/html/gdk/api-index-2-10.html share/gtk-doc/html/gdk/api-index-2-12.html share/gtk-doc/html/gdk/api-index-2-14.html share/gtk-doc/html/gdk/api-index-2-16.html share/gtk-doc/html/gdk/api-index-2-18.html share/gtk-doc/html/gdk/api-index-2-2.html +share/gtk-doc/html/gdk/api-index-2-20.html share/gtk-doc/html/gdk/api-index-2-4.html share/gtk-doc/html/gdk/api-index-2-6.html share/gtk-doc/html/gdk/api-index-2-8.html @@ -594,11 +605,11 @@ share/gtk-doc/html/gtk/GtkCellRendererCombo.html share/gtk-doc/html/gtk/GtkCellRendererPixbuf.html share/gtk-doc/html/gtk/GtkCellRendererProgress.html share/gtk-doc/html/gtk/GtkCellRendererSpin.html +share/gtk-doc/html/gtk/GtkCellRendererSpinner.html share/gtk-doc/html/gtk/GtkCellRendererText.html share/gtk-doc/html/gtk/GtkCellRendererToggle.html share/gtk-doc/html/gtk/GtkCellView.html share/gtk-doc/html/gtk/GtkCheckButton.html -share/gtk-doc/html/gtk/GtkCheckMenuItem.html share/gtk-doc/html/gtk/GtkColorButton.html share/gtk-doc/html/gtk/GtkColorSelection.html share/gtk-doc/html/gtk/GtkColorSelectionDialog.html @@ -662,6 +673,7 @@ share/gtk-doc/html/gtk/GtkMessageDialog.html share/gtk-doc/html/gtk/GtkMisc.html share/gtk-doc/html/gtk/GtkNotebook.html share/gtk-doc/html/gtk/GtkObject.html +share/gtk-doc/html/gtk/GtkOffscreenWindow.html share/gtk-doc/html/gtk/GtkOldEditable.html share/gtk-doc/html/gtk/GtkOptionMenu.html share/gtk-doc/html/gtk/GtkPageSetup.html @@ -701,6 +713,7 @@ share/gtk-doc/html/gtk/GtkSettings.html share/gtk-doc/html/gtk/GtkSizeGroup.html share/gtk-doc/html/gtk/GtkSocket.html share/gtk-doc/html/gtk/GtkSpinButton.html +share/gtk-doc/html/gtk/GtkSpinner.html share/gtk-doc/html/gtk/GtkStatusIcon.html share/gtk-doc/html/gtk/GtkStatusbar.html share/gtk-doc/html/gtk/GtkStyle.html @@ -718,6 +731,8 @@ share/gtk-doc/html/gtk/GtkToggleButton.html share/gtk-doc/html/gtk/GtkToggleToolButton.html share/gtk-doc/html/gtk/GtkToolButton.html share/gtk-doc/html/gtk/GtkToolItem.html +share/gtk-doc/html/gtk/GtkToolItemGroup.html +share/gtk-doc/html/gtk/GtkToolPalette.html share/gtk-doc/html/gtk/GtkToolShell.html share/gtk-doc/html/gtk/GtkToolbar.html share/gtk-doc/html/gtk/GtkTooltip.html @@ -763,12 +778,14 @@ share/gtk-doc/html/gtk/TreeWidgetObjects.html share/gtk-doc/html/gtk/WindowWidgets.html share/gtk-doc/html/gtk/aboutdialog.png share/gtk-doc/html/gtk/accel-label.png +share/gtk-doc/html/gtk/annotation-glossary.html share/gtk-doc/html/gtk/api-index-2-10.html share/gtk-doc/html/gtk/api-index-2-12.html share/gtk-doc/html/gtk/api-index-2-14.html share/gtk-doc/html/gtk/api-index-2-16.html share/gtk-doc/html/gtk/api-index-2-18.html share/gtk-doc/html/gtk/api-index-2-2.html +share/gtk-doc/html/gtk/api-index-2-20.html share/gtk-doc/html/gtk/api-index-2-4.html share/gtk-doc/html/gtk/api-index-2-6.html share/gtk-doc/html/gtk/api-index-2-8.html @@ -870,6 +887,7 @@ share/gtk-doc/html/gtk/gtk-goto-last-ltr.png share/gtk-doc/html/gtk/gtk-goto-last-rtl.png share/gtk-doc/html/gtk/gtk-goto-top.png share/gtk-doc/html/gtk/gtk-gtkbuildable.html +share/gtk-doc/html/gtk/gtk-gtkcheckmenuitem.html share/gtk-doc/html/gtk/gtk-gtkfilefilter.html share/gtk-doc/html/gtk/gtk-harddisk.png share/gtk-doc/html/gtk/gtk-help.png @@ -1018,10 +1036,12 @@ share/gtk-doc/html/gtk/scrolledwindow.png share/gtk-doc/html/gtk/separator.png share/gtk-doc/html/gtk/setting-the-page-flow.html share/gtk-doc/html/gtk/spinbutton.png +share/gtk-doc/html/gtk/spinner.png share/gtk-doc/html/gtk/statusbar.png share/gtk-doc/html/gtk/style.css share/gtk-doc/html/gtk/toggle-button.png share/gtk-doc/html/gtk/toolbar.png +share/gtk-doc/html/gtk/toolpalette.png share/gtk-doc/html/gtk/tree-view-coordinates.png share/gtk-doc/html/gtk/ui-manager.html share/gtk-doc/html/gtk/up.png diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 2c0ee794e239..eee7b1f0df1c 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.126 2010/04/15 01:09:55 wiz Exp $ +$NetBSD: distinfo,v 1.128 2010/05/31 18:32:41 wiz Exp $ -SHA1 (gtk+-2.18.9.tar.bz2) = 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b -RMD160 (gtk+-2.18.9.tar.bz2) = 4499af3cef1c53cddda989f35aaf2e030aab5bcf -Size (gtk+-2.18.9.tar.bz2) = 18194639 bytes +SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02 +RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 +Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3 -SHA1 (patch-ab) = 60b23f3b5691e9ffa689b9c32d49d5944a056bf0 +SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133 -SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79 -SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab index ca5dfe965fba..8f4fd5643fa6 100644 --- a/x11/gtk2/patches/patch-ab +++ b/x11/gtk2/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.22 2010/04/15 01:09:55 wiz Exp $ +$NetBSD: patch-ab,v 1.24 2010/05/31 18:32:41 wiz Exp $ http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html ---- gtk/gtkentry.c.orig 2010-03-17 13:45:47.000000000 +0000 +--- gtk/gtkentry.c.orig 2010-05-02 03:14:28.000000000 +0000 +++ gtk/gtkentry.c -@@ -6661,8 +6661,11 @@ gtk_entry_set_buffer (GtkEntry *en +@@ -6712,8 +6712,11 @@ gtk_entry_set_buffer (GtkEntry *en g_object_notify (obj, "invisible-char-set"); g_object_thaw_notify (obj); @@ -17,4 +17,4 @@ http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html + } } - + /** diff --git a/x11/gtk2/patches/patch-gb b/x11/gtk2/patches/patch-gb deleted file mode 100644 index 9ff760db36c1..000000000000 --- a/x11/gtk2/patches/patch-gb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-gb,v 1.1 2008/12/15 11:17:47 rillig Exp $ - -Prevent an int-to-pointer-cast warning from gcc. - ---- modules/other/gail/gailbutton.c.orig 2008-10-17 06:06:24.000000000 +0200 -+++ modules/other/gail/gailbutton.c 2008-12-15 11:34:12.000000000 +0100 -@@ -475,7 +475,7 @@ gail_button_do_action (AtkAction *action - { - button->action_queue = g_queue_new (); - } -- g_queue_push_head (button->action_queue, (gpointer) i); -+ g_queue_push_head (button->action_queue, (gpointer) (gssize) i); - if (!button->action_idle_handler) - button->action_idle_handler = gdk_threads_add_idle (idle_do_action, button); - break; diff --git a/x11/gtk2/patches/patch-ob b/x11/gtk2/patches/patch-ob deleted file mode 100644 index ad3c2836c7d5..000000000000 --- a/x11/gtk2/patches/patch-ob +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ob,v 1.1 2008/12/15 11:17:47 rillig Exp $ - -Prevent an int-to-pointer-cast warning from gcc. The specification says -about gsize that "This type is wide enough to hold the numeric value of -a pointer", so there's no additional loss in converting a glong first to -gssize and later to (void *). - ---- gtk/tests/object.c.orig 2008-10-17 06:06:13.000000000 +0200 -+++ gtk/tests/object.c 2008-12-15 11:27:59.000000000 +0100 -@@ -199,19 +199,19 @@ value_as_pointer (GValue *value) - if (g_value_fits_pointer (value)) - return g_value_peek_pointer (value); - if (G_VALUE_HOLDS_BOOLEAN (value)) -- return (void*) g_value_get_boolean (value); -+ return (void*) (gsize) g_value_get_boolean (value); - if (G_VALUE_HOLDS_CHAR (value)) - return (void*) (gssize) g_value_get_char (value); - if (G_VALUE_HOLDS_UCHAR (value)) - return (void*) (gsize) g_value_get_uchar (value); - if (G_VALUE_HOLDS_INT (value)) -- return (void*) g_value_get_int (value); -+ return (void*) (gssize) g_value_get_int (value); - if (G_VALUE_HOLDS_UINT (value)) -- return (void*) g_value_get_uint (value); -+ return (void*) (gsize) g_value_get_uint (value); - if (G_VALUE_HOLDS_LONG (value)) -- return (void*) g_value_get_long (value); -+ return (void*) (gssize) g_value_get_long (value); - if (G_VALUE_HOLDS_ULONG (value)) -- return (void*) g_value_get_ulong (value); -+ return (void*) (gsize) g_value_get_ulong (value); - if (G_VALUE_HOLDS_FLOAT (value)) - return (void*) (gssize) g_value_get_float (value); - if (G_VALUE_HOLDS_DOUBLE (value)) -- 2.41.0