diff options
| -rw-r--r-- | security/seahorse/Makefile | 17 | ||||
| -rw-r--r-- | security/seahorse/PLIST | 35 | ||||
| -rw-r--r-- | security/seahorse/distinfo | 9 | ||||
| -rw-r--r-- | security/seahorse/patches/patch-aa | 44 | ||||
| -rw-r--r-- | security/seahorse/patches/patch-ab | 13 |
5 files changed, 57 insertions, 61 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 7d40a69df37..ddd639a0631 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.30 2004/10/03 00:18:13 tv Exp $ +# $NetBSD: Makefile,v 1.31 2004/10/20 20:45:55 jmmv Exp $ -DISTNAME= seahorse-0.7.3 -PKGREVISION= 13 +DISTNAME= seahorse-0.7.4 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=seahorse/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/0.7/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://seahorse.sourceforge.net/ @@ -18,10 +18,16 @@ USE_GNU_TOOLS+= make USE_X11= yes USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes +USE_LIBTOOL= yes + +CONFIGURE_ARGS= --disable-gedit GCONF2_SCHEMAS= seahorse.schemas +BUILDLINK_DEPENDS.gpgme= gpgme>=1.0.0 + .include "../../databases/gnome-mime-data/buildlink3.mk" +.include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/eel2/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -29,7 +35,8 @@ GCONF2_SCHEMAS= seahorse.schemas .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" -.include "../../security/gpgme03/buildlink3.mk" +.include "../../security/gpgme/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST index 37f1ebd2b60..abf62fa85f0 100644 --- a/security/seahorse/PLIST +++ b/security/seahorse/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/10/20 20:45:55 jmmv Exp $ bin/seahorse +bin/seahorse-agent bin/seahorse-pgp-preferences lib/bonobo/libseahorse-pgp-file-listener.la lib/bonobo/servers/Seahorse_PGP_File_Listener.server @@ -19,37 +20,54 @@ 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 +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/seahorse.mo +${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/seahorse.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/seahorse.mo share/mime-info/seahorse.keys share/mime-info/seahorse.mime +share/mime/packages/seahorse.xml share/omf/seahorse/seahorse-C.omf share/pixmaps/seahorse.png share/seahorse/glade/seahorse-add-subkey.glade share/seahorse/glade/seahorse-add-uid.glade +share/seahorse/glade/seahorse-agent-cache.glade share/seahorse/glade/seahorse-change-passphrase.glade -share/seahorse/glade/seahorse-export.glade -share/seahorse/glade/seahorse-generate.glade -share/seahorse/glade/seahorse-import.glade +share/seahorse/glade/seahorse-generate-adv.glade +share/seahorse/glade/seahorse-generate-druid.glade +share/seahorse/glade/seahorse-generate-select.glade share/seahorse/glade/seahorse-key-manager.glade share/seahorse/glade/seahorse-key-properties.glade +share/seahorse/glade/seahorse-multi-encrypt.glade share/seahorse/glade/seahorse-passphrase.glade share/seahorse/glade/seahorse-pgp-preferences.glade share/seahorse/glade/seahorse-preferences.glade @@ -59,15 +77,16 @@ share/seahorse/glade/seahorse-sign.glade share/seahorse/glade/seahorse-signatures.glade @dirrm share/seahorse/glade @dirrm share/seahorse +@comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/omf/seahorse @comment in scrollkeeper: @dirrm share/omf -@comment in gnome-dirs: @dirrm share/mime-info +@comment in shared-mime-info: @dirrm share/mime/packages +@comment in xdg-dirs: @dirrm share/mime-info @dirrm share/gnome/help/seahorse/C/figures @dirrm share/gnome/help/seahorse/C @dirrm share/gnome/help/seahorse @comment in gnome2-dirs: @dirrm share/gnome/help @comment in GConf2: @dirrm share/gconf/schemas @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets -@comment in gnome2-dirs: @dirrm share/applications -@comment in bonobo-activation: @dirrm lib/bonobo/servers -@comment in bonobo-activation: @dirrm lib/bonobo +@comment in xdg-dirs: @dirrm share/applications +@comment in libbonobo: @dirrm lib/bonobo/servers diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index e7c70e081d5..86a9131ea95 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2004/03/11 12:38:18 jmmv Exp $ +$NetBSD: distinfo,v 1.7 2004/10/20 20:45:55 jmmv Exp $ -SHA1 (seahorse-0.7.3.tar.gz) = 1323b2b4b49bca9d9733b1ee38e811238c29e1b2 -Size (seahorse-0.7.3.tar.gz) = 706411 bytes -SHA1 (patch-aa) = 0fed5d18bed7747ea37ed4ce43ee22501bb2a78e -SHA1 (patch-ab) = 4c99062d2618150cbd4fb94befe54f891db726c2 +SHA1 (seahorse-0.7.4.tar.bz2) = e018607afbf1b9db45454924057403b65c9102f0 +Size (seahorse-0.7.4.tar.bz2) = 891599 bytes +SHA1 (patch-aa) = c0d8f8acc955f030b1cd57966c8a0fcf30b9f8e7 diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa index a62d0f6fe14..f03d4907174 100644 --- a/security/seahorse/patches/patch-aa +++ b/security/seahorse/patches/patch-aa @@ -1,33 +1,17 @@ -$NetBSD: patch-aa,v 1.4 2003/05/30 15:25:09 jmmv Exp $ +$NetBSD: patch-aa,v 1.5 2004/10/20 20:45:55 jmmv Exp $ ---- src/main.c.orig 2003-04-14 16:22:32.000000000 +0200 -+++ src/main.c -@@ -29,7 +29,7 @@ - #include "seahorse-libdialogs.h" +--- agent/seahorse-agent.c.orig 2004-10-15 00:12:08.000000000 +0200 ++++ agent/seahorse-agent.c +@@ -264,8 +264,12 @@ main (int argc, char *argv[]) + secmem_init (65536); - static gchar *import = NULL; --static gchar *encrypt = NULL; -+static gchar *encrypt_opt = NULL; - static gchar *sign = NULL; - static gchar *encrypt_sign = NULL; - static gchar *decrypt = NULL; -@@ -40,7 +40,7 @@ static const struct poptOption options[] - { "import", 'i', POPT_ARG_STRING, &import, 0, - N_("Import keys from the file"), N_("FILE") }, + /* We need to drop privileges completely for security */ ++#ifdef _GNU_SOURCE + if (setresuid (getuid (), getuid (), getuid ()) == -1 || + setresgid (getgid (), getgid (), getgid ()) == -1) ++#else ++ if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1) ++#endif + err (1, _("couldn't drop privileges properly")); -- { "encrypt", 'e', POPT_ARG_STRING, &encrypt, 0, -+ { "encrypt", 'e', POPT_ARG_STRING, &encrypt_opt, 0, - N_("Encrypt file"), N_("FILE") }, - - { "sign", 's', POPT_ARG_STRING, &sign, 0, -@@ -137,8 +137,8 @@ main (int argc, char **argv) - return 0; - } - } -- if (encrypt != NULL) -- do_encrypt (sctx, encrypt, seahorse_op_encrypt_file, _("Encrypt file is %s")); -+ if (encrypt_opt != NULL) -+ do_encrypt (sctx, encrypt_opt, seahorse_op_encrypt_file, _("Encrypt file is %s")); - if (sign != NULL) { - new_path = seahorse_op_sign_file (sctx, sign, &err); - + gtk_init (&argc, &argv); diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab deleted file mode 100644 index 1e16a89379e..00000000000 --- a/security/seahorse/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/03/11 12:38:18 jmmv Exp $ - ---- plugins/nautilus/seahorse-pgp-preferences.desktop.in.orig 2003-04-30 02:47:17.000000000 +0200 -+++ plugins/nautilus/seahorse-pgp-preferences.desktop.in -@@ -4,7 +4,7 @@ _Comment=Configure PGP - Exec=seahorse-pgp-preferences - Terminal=false - Type=Application --Icon=document-icons/gnome-application-pgp-keys.png -+Icon=gnome-mime-application-pgp-keys.png - Categories=Application;Settings;Advanced - StartupNotify=true - X-GNOME-Bugzilla-Bugzilla=GNOME |