diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-29 11:24:22 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-29 11:24:22 +0800 |
commit | f8b641d50cefe82088fa9b68a3d4cae3ac43efee (patch) | |
tree | 22bc0e1c72ce0698dd716887f5bc206e24af467d | |
parent | 7b8aba216e9e28e0231a6bd1c04ca78a44b8947a (diff) | |
download | marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar.gz marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar.bz2 marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar.lz marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar.xz marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.tar.zst marcuscom-ports-f8b641d50cefe82088fa9b68a3d4cae3ac43efee.zip |
Chase the libsoup shared lib version.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4654 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | databases/evolution-data-server/Makefile | 6 | ||||
-rw-r--r-- | security/seahorse/Makefile | 77 | ||||
-rw-r--r-- | security/seahorse/distinfo | 2 | ||||
-rw-r--r-- | security/seahorse/files/patch-agent_seahorse-agent-io.c | 32 | ||||
-rw-r--r-- | security/seahorse/files/patch-agent_seahorse-agent.c | 40 | ||||
-rw-r--r-- | security/seahorse/files/patch-libseahorse_seahorse-key-store.c | 22 | ||||
-rw-r--r-- | security/seahorse/files/patch-libseahorse_seahorse-server-source.c | 15 | ||||
-rw-r--r-- | security/seahorse/files/patch-src_seahorse-generate-druid.c | 13 | ||||
-rw-r--r-- | security/seahorse/pkg-descr | 8 | ||||
-rw-r--r-- | security/seahorse/pkg-plist | 108 | ||||
-rw-r--r-- | www/gtkhtml3/Makefile | 5 | ||||
-rw-r--r-- | www/gtkhtml38/Makefile | 5 |
12 files changed, 326 insertions, 7 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 2e9afc157..18a10a423 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.58 2005/08/23 17:50:49 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.59 2005/08/25 22:29:53 marcus Exp $ # PORTNAME= evolution-data-server PORTVERSION= 1.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.2.9:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup \ nss3.1:${PORTSDIR}/security/nss \ tasn1.2:${PORTSDIR}/security/libtasn1 diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile new file mode 100644 index 000000000..7f24e7452 --- /dev/null +++ b/security/seahorse/Makefile @@ -0,0 +1,77 @@ +# New ports collection makefile for: Seahorse +# Date created: 08 March 2000 +# Whom: Dave McKay <dave@mu.org> +# +# $FreeBSD: ports/security/seahorse/Makefile,v 1.42 2005/08/28 08:33:40 marcus Exp $ +# + +PORTNAME= seahorse +PORTVERSION= 0.7.9 +PORTREVISION= 3 +CATEGORIES= security +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7 +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A front end for GnuPG + +BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg +RUN_DEPENDS= ${BUILD_DEPENDS} +LIB_DEPENDS= gpgme.14:${PORTSDIR}/security/gpgme + +USE_BZIP2= yes +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_LIBTOOL_VER=15 +USE_REINPLACE= yes +INSTALLS_OMF= yes +INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --disable-gpg-check +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= seahorse.schemas + +OPTIONS= GEDIT "Enable the gedit plug-in" on \ + NAUTILUS "Enable the Nautilus component" on \ + LDAP "Enable LDAP support" on \ + HKP "Enable HKP keyserver interface" on + +.include <bsd.port.pre.mk> + +.if defined(WITH_GEDIT) +BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit +RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit +PLIST_SUB+= GEDIT="" +GCONF_SCHEMAS+= seahorse-gedit.schemas +.else +PLIST_SUB+= GEDIT="@comment " +CONFIGURE_ARGS+=--disable-gedit +.endif + +.if defined(WITH_NAUTILUS) +USE_GNOME+= nautilus2 +PLIST_SUB+= NAUTILUS="" +.else +PLIST_SUB+= NAUTILUS="@comment " +CONFIGURE_ARGS+=--disable-nautilus +.endif + +.if !defined(WITHOUT_LDAP) +USE_OPENLDAP= yes +.else +CONFIGURE_ARGS+=--disable-ldap +.endif + +.if !defined(WITHOUT_HKP) +LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup +.else +CONFIGURE_ARGS+=--disable-hkp +.endif + +post-install: + -@update-desktop-database + +.include <bsd.port.post.mk> diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo new file mode 100644 index 000000000..6ce256ace --- /dev/null +++ b/security/seahorse/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/seahorse-0.7.9.tar.bz2) = 67158777084e537145ba42d0b5ca199d +SIZE (gnome2/seahorse-0.7.9.tar.bz2) = 1138765 diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse/files/patch-agent_seahorse-agent-io.c new file mode 100644 index 000000000..73f68960e --- /dev/null +++ b/security/seahorse/files/patch-agent_seahorse-agent-io.c @@ -0,0 +1,32 @@ +--- agent/seahorse-agent-io.c.orig Fri Jan 28 15:52:18 2005 ++++ agent/seahorse-agent-io.c Fri Jan 28 15:54:19 2005 +@@ -377,12 +377,18 @@ + gsize length; + GError *err = NULL; + gboolean ret = TRUE; ++ GIOStatus status; + + if (condition & G_IO_IN) { + /* Read 1 line from the io channel, including newline character */ +- g_io_channel_read_line (source, &string, &length, NULL, &err); ++ status = g_io_channel_read_line (source, &string, &length, NULL, &err); + +- if (err != NULL) { ++ if (status == G_IO_STATUS_EOF) { ++ free_conn (cn); ++ ret = FALSE; ++ } ++ ++ else if (err != NULL) { + g_critical ("couldn't read from socket: %s", err->message); + g_clear_error (&err); + free_conn (cn); +@@ -398,7 +404,7 @@ + g_free (string); + } + +- if (condition & G_IO_HUP) { ++ else if (condition & G_IO_HUP) { + free_conn (cn); + ret = FALSE; /* removes watch */ + } diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c new file mode 100644 index 000000000..25531909e --- /dev/null +++ b/security/seahorse/files/patch-agent_seahorse-agent.c @@ -0,0 +1,40 @@ +--- agent/seahorse-agent.c.orig Thu May 19 00:15:36 2005 ++++ agent/seahorse-agent.c Thu Jul 28 01:32:39 2005 +@@ -273,18 +273,18 @@ main (int argc, char **argv) + const char *sockname; + GnomeProgram *program = NULL; + +- secmem_init (65536); +- + /* We need to drop privileges completely for security */ + #if defined(HAVE_SETRESUID) && defined(HAVE_SETRESGID) + + /* Not in header files for all OSs, even where present */ + int setresuid(uid_t ruid, uid_t euid, uid_t suid); + int setresgid(gid_t rgid, gid_t egid, gid_t sgid); ++ secmem_init (65536); + + if (setresuid (getuid (), getuid (), getuid ()) == -1 || + setresgid (getgid (), getgid (), getgid ()) == -1) + #else ++ secmem_init (65536); + if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1) + #endif + err (1, _("couldn't drop privileges properly")); +@@ -301,7 +301,6 @@ main (int argc, char **argv) + * All functions after this point have to print messages + * nicely and not just called exit() + */ +- daemonize (sockname); + + /* Handle some signals */ + signal (SIGINT, on_quit); +@@ -314,6 +313,8 @@ main (int argc, char **argv) + /* Initialize our sub systems */ + seahorse_agent_actions_init (); + seahorse_agent_cache_init (); ++ ++ daemonize (sockname); + + if (seahorse_agent_io_init () == -1) + return 1; /* message already printed */ diff --git a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c new file mode 100644 index 000000000..fc8b7af60 --- /dev/null +++ b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c @@ -0,0 +1,22 @@ +--- libseahorse/seahorse-key-store.c.orig Wed Dec 22 15:18:27 2004 ++++ libseahorse/seahorse-key-store.c Wed Dec 22 15:19:48 2004 +@@ -184,6 +184,8 @@ + { + GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props); + SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj); ++ guint cols; ++ GType* types; + + /* init private vars */ + skstore->priv = g_new0 (SeahorseKeyStorePriv, 1); +@@ -191,8 +193,8 @@ + NULL, (GDestroyNotify)seahorse_key_row_free); + + /* Setup the store */ +- guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns; +- GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types; ++ cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns; ++ types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types; + gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types); + + /* Setup the sort and filter */ diff --git a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c new file mode 100644 index 000000000..d7422de5e --- /dev/null +++ b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c @@ -0,0 +1,15 @@ +--- libseahorse/seahorse-server-source.c.orig Fri Mar 11 22:17:43 2005 ++++ libseahorse/seahorse-server-source.c Fri Mar 11 22:17:55 2005 +@@ -518,11 +518,11 @@ + seahorse_server_source_get_state (SeahorseKeySource *src) + { + SeahorseServerSource *ssrc; ++ guint state = SEAHORSE_KEY_SOURCE_REMOTE; + + g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0); + ssrc = SEAHORSE_SERVER_SOURCE (src); + +- guint state = SEAHORSE_KEY_SOURCE_REMOTE; + if (!seahorse_operation_is_done (ssrc->priv->operation)) + state |= SEAHORSE_KEY_SOURCE_LOADING; + return state; diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c new file mode 100644 index 000000000..9e356ed1a --- /dev/null +++ b/security/seahorse/files/patch-src_seahorse-generate-druid.c @@ -0,0 +1,13 @@ +--- src/seahorse-generate-druid.c.orig Wed Dec 22 15:22:02 2004 ++++ src/seahorse-generate-druid.c Wed Dec 22 15:22:22 2004 +@@ -173,8 +173,9 @@ + gboolean + on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget) + { ++ GtkWidget *druidpage; + g_print("go to finish\n"); +- GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1"); ++ druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1"); + + gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage)); + gtk_widget_show (druidpage); diff --git a/security/seahorse/pkg-descr b/security/seahorse/pkg-descr new file mode 100644 index 000000000..ea4098271 --- /dev/null +++ b/security/seahorse/pkg-descr @@ -0,0 +1,8 @@ +Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. + +It is a tool for secure communications and data storage. +Data encryption and digital signature creation can easily +be performed through a GUI and Key Management operations +can easily be carried out through an intuitive interface. + +WWW: http://seahorse.sourceforge.net/ diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist new file mode 100644 index 000000000..3bdcce72b --- /dev/null +++ b/security/seahorse/pkg-plist @@ -0,0 +1,108 @@ +bin/seahorse +bin/seahorse-agent +bin/seahorse-pgp-preferences +%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so +%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin +lib/libseahorse-internal.a +lib/libseahorse-internal.so +lib/libseahorse-internal.so.0 +%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.so +share/gnome/applications/seahorse-pgp-preferences.desktop +share/gnome/applications/seahorse.desktop +share/gnome/applications/seahorse-pgp-encrypted.desktop +share/gnome/applications/seahorse-pgp-keys.desktop +share/gnome/applications/seahorse-pgp-signature.desktop +share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +share/gnome/help/seahorse/C/figures/export.png +share/gnome/help/seahorse/C/figures/file-manager.png +share/gnome/help/seahorse/C/figures/generate.png +share/gnome/help/seahorse/C/figures/import.png +share/gnome/help/seahorse/C/figures/key-manager.png +share/gnome/help/seahorse/C/figures/key-properties.png +share/gnome/help/seahorse/C/figures/passphrase.png +share/gnome/help/seahorse/C/figures/preferences.png +share/gnome/help/seahorse/C/figures/recipients.png +share/gnome/help/seahorse/C/figures/signature.png +share/gnome/help/seahorse/C/figures/text-editor.png +share/gnome/help/seahorse/C/legal.xml +share/gnome/help/seahorse/C/seahorse.xml +share/gnome/mime-info/seahorse.keys +share/gnome/mime-info/seahorse.mime +share/gnome/omf/seahorse/seahorse-C.omf +share/gnome/pixmaps/seahorse-key.png +share/gnome/pixmaps/seahorse-secret.png +share/gnome/pixmaps/seahorse.png +share/gnome/seahorse/glade/seahorse-add-keyserver.glade +share/gnome/seahorse/glade/seahorse-add-subkey.glade +share/gnome/seahorse/glade/seahorse-add-uid.glade +share/gnome/seahorse/glade/seahorse-agent-cache.glade +share/gnome/seahorse/glade/seahorse-change-passphrase.glade +share/gnome/seahorse/glade/seahorse-expires.glade +share/gnome/seahorse/glade/seahorse-generate-adv.glade +share/gnome/seahorse/glade/seahorse-generate-druid.glade +share/gnome/seahorse/glade/seahorse-generate-select.glade +share/gnome/seahorse/glade/seahorse-key-manager.glade +share/gnome/seahorse/glade/seahorse-key-manager.ui +share/gnome/seahorse/glade/seahorse-key-properties.glade +share/gnome/seahorse/glade/seahorse-keyserver-results.glade +share/gnome/seahorse/glade/seahorse-keyserver-results.ui +share/gnome/seahorse/glade/seahorse-keyserver-search.glade +share/gnome/seahorse/glade/seahorse-keyserver-sync.glade +share/gnome/seahorse/glade/seahorse-multi-encrypt.glade +share/gnome/seahorse/glade/seahorse-passphrase.glade +share/gnome/seahorse/glade/seahorse-prefs.glade +share/gnome/seahorse/glade/seahorse-preferences.glade +share/gnome/seahorse/glade/seahorse-progress.glade +share/gnome/seahorse/glade/seahorse-recipients.glade +share/gnome/seahorse/glade/seahorse-revoke.glade +share/gnome/seahorse/glade/seahorse-sign.glade +share/gnome/seahorse/glade/seahorse-signatures.glade +share/gnome/seahorse/glade/seahorse-signer.glade +share/mime/packages/seahorse.xml +share/locale/az/LC_MESSAGES/seahorse.mo +share/locale/bg/LC_MESSAGES/seahorse.mo +share/locale/ca/LC_MESSAGES/seahorse.mo +share/locale/cs/LC_MESSAGES/seahorse.mo +share/locale/da/LC_MESSAGES/seahorse.mo +share/locale/de/LC_MESSAGES/seahorse.mo +share/locale/en_CA/LC_MESSAGES/seahorse.mo +share/locale/en_GB/LC_MESSAGES/seahorse.mo +share/locale/es/LC_MESSAGES/seahorse.mo +share/locale/eu/LC_MESSAGES/seahorse.mo +share/locale/fi/LC_MESSAGES/seahorse.mo +share/locale/fr/LC_MESSAGES/seahorse.mo +share/locale/hr/LC_MESSAGES/seahorse.mo +share/locale/hu/LC_MESSAGES/seahorse.mo +share/locale/it/LC_MESSAGES/seahorse.mo +share/locale/ja/LC_MESSAGES/seahorse.mo +share/locale/ml/LC_MESSAGES/seahorse.mo +share/locale/ms/LC_MESSAGES/seahorse.mo +share/locale/nb/LC_MESSAGES/seahorse.mo +share/locale/nl/LC_MESSAGES/seahorse.mo +share/locale/no/LC_MESSAGES/seahorse.mo +share/locale/pa/LC_MESSAGES/seahorse.mo +share/locale/pl/LC_MESSAGES/seahorse.mo +share/locale/pt/LC_MESSAGES/seahorse.mo +share/locale/pt_BR/LC_MESSAGES/seahorse.mo +share/locale/ru/LC_MESSAGES/seahorse.mo +share/locale/rw/LC_MESSAGES/seahorse.mo +share/locale/sk/LC_MESSAGES/seahorse.mo +share/locale/sl/LC_MESSAGES/seahorse.mo +share/locale/sq/LC_MESSAGES/seahorse.mo +share/locale/sr/LC_MESSAGES/seahorse.mo +share/locale/sr@Latn/LC_MESSAGES/seahorse.mo +share/locale/sv/LC_MESSAGES/seahorse.mo +share/locale/tr/LC_MESSAGES/seahorse.mo +share/locale/uk/LC_MESSAGES/seahorse.mo +share/locale/zh_CN/LC_MESSAGES/seahorse.mo +share/locale/zh_TW/LC_MESSAGES/seahorse.mo +@dirrm share/gnome/help/seahorse/C/figures +@dirrm share/gnome/help/seahorse/C +@dirrm share/gnome/help/seahorse +@dirrm share/gnome/omf/seahorse +@dirrm share/gnome/seahorse/glade +@dirrm share/gnome/seahorse +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 1d3ee0587..455026ad4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.58 2005/08/22 17:04:33 kwm Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.59 2005/08/22 18:35:11 kwm Exp $ # PORTNAME= gtkhtml3 PORTVERSION= 3.7.7 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.7 @@ -17,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.9:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 1d3ee0587..455026ad4 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.58 2005/08/22 17:04:33 kwm Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.59 2005/08/22 18:35:11 kwm Exp $ # PORTNAME= gtkhtml3 PORTVERSION= 3.7.7 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.7 @@ -17,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.9:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes |