diff options
author | drochner <drochner@pkgsrc.org> | 2007-11-05 19:49:04 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2007-11-05 19:49:04 +0000 |
commit | 4b5e9f89719d192860b547eed896cbd68694ca36 (patch) | |
tree | 4ab5c5f3366961c1c1c609f496d7cbd90ff73a2f /security/seahorse | |
parent | 64d2f57a50a9012477e19fa51ff9d204305c8561 (diff) | |
download | pkgsrc-4b5e9f89719d192860b547eed896cbd68694ca36.tar.gz |
update to 2.20.1
This switches to the new gnome-2.20 branch.
Diffstat (limited to 'security/seahorse')
-rw-r--r-- | security/seahorse/Makefile | 7 | ||||
-rw-r--r-- | security/seahorse/PLIST | 47 | ||||
-rw-r--r-- | security/seahorse/distinfo | 12 | ||||
-rw-r--r-- | security/seahorse/patches/patch-ab | 73 | ||||
-rw-r--r-- | security/seahorse/patches/patch-ad | 19 | ||||
-rw-r--r-- | security/seahorse/patches/patch-aj | 22 |
6 files changed, 138 insertions, 42 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index eeed8216f7f..cfe0bb3783a 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.67 2007/09/21 13:04:16 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2007/11/05 19:49:04 drochner Exp $ -DISTNAME= seahorse-1.0.1 -PKGREVISION= 4 +DISTNAME= seahorse-2.20.1 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/2.20/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST index 4512451a7a5..59cd61c65a3 100644 --- a/security/seahorse/PLIST +++ b/security/seahorse/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2007/09/25 10:54:18 hira Exp $ +@comment $NetBSD: PLIST,v 1.17 2007/11/05 19:49:04 drochner Exp $ bin/seahorse bin/seahorse-agent bin/seahorse-daemon @@ -22,7 +22,6 @@ share/applications/seahorse-pgp-keys.desktop share/applications/seahorse-pgp-preferences.desktop share/applications/seahorse-pgp-signature.desktop share/applications/seahorse.desktop -share/control-center-2.0/capplets/seahorse-pgp-preferences.desktop share/dbus-1/services/org.gnome.seahorse.service share/gconf/schemas/seahorse.schemas share/gnome/help/seahorse/C/figures/export.png @@ -91,6 +90,19 @@ share/gnome/help/seahorse/it/figures/seahorse-window.png share/gnome/help/seahorse/it/figures/signature.png share/gnome/help/seahorse/it/figures/text-editor.png share/gnome/help/seahorse/it/seahorse.xml +share/gnome/help/seahorse/oc/figures/export.png +share/gnome/help/seahorse/oc/figures/file-manager.png +share/gnome/help/seahorse/oc/figures/generate.png +share/gnome/help/seahorse/oc/figures/import.png +share/gnome/help/seahorse/oc/figures/key-manager.png +share/gnome/help/seahorse/oc/figures/key-properties.png +share/gnome/help/seahorse/oc/figures/passphrase.png +share/gnome/help/seahorse/oc/figures/preferences.png +share/gnome/help/seahorse/oc/figures/recipients.png +share/gnome/help/seahorse/oc/figures/seahorse-window.png +share/gnome/help/seahorse/oc/figures/signature.png +share/gnome/help/seahorse/oc/figures/text-editor.png +share/gnome/help/seahorse/oc/seahorse.xml share/gnome/help/seahorse/sv/figures/export.png share/gnome/help/seahorse/sv/figures/file-manager.png share/gnome/help/seahorse/sv/figures/generate.png @@ -104,6 +116,19 @@ share/gnome/help/seahorse/sv/figures/seahorse-window.png share/gnome/help/seahorse/sv/figures/signature.png share/gnome/help/seahorse/sv/figures/text-editor.png share/gnome/help/seahorse/sv/seahorse.xml +share/gnome/help/seahorse/vi/figures/export.png +share/gnome/help/seahorse/vi/figures/file-manager.png +share/gnome/help/seahorse/vi/figures/generate.png +share/gnome/help/seahorse/vi/figures/import.png +share/gnome/help/seahorse/vi/figures/key-manager.png +share/gnome/help/seahorse/vi/figures/key-properties.png +share/gnome/help/seahorse/vi/figures/passphrase.png +share/gnome/help/seahorse/vi/figures/preferences.png +share/gnome/help/seahorse/vi/figures/recipients.png +share/gnome/help/seahorse/vi/figures/seahorse-window.png +share/gnome/help/seahorse/vi/figures/signature.png +share/gnome/help/seahorse/vi/figures/text-editor.png +share/gnome/help/seahorse/vi/seahorse.xml share/icons/hicolor/22x22/apps/seahorse-preferences.svg share/icons/hicolor/22x22/apps/seahorse.svg share/icons/hicolor/48x48/apps/seahorse-applet.png @@ -114,7 +139,9 @@ share/icons/hicolor/scalable/apps/seahorse-preferences.svg share/icons/hicolor/scalable/apps/seahorse.svg share/locale/ar/LC_MESSAGES/seahorse.mo share/locale/az/LC_MESSAGES/seahorse.mo +share/locale/be@latin/LC_MESSAGES/seahorse.mo share/locale/bg/LC_MESSAGES/seahorse.mo +share/locale/bn/LC_MESSAGES/seahorse.mo share/locale/bn_IN/LC_MESSAGES/seahorse.mo share/locale/ca/LC_MESSAGES/seahorse.mo share/locale/cs/LC_MESSAGES/seahorse.mo @@ -132,30 +159,37 @@ share/locale/fr/LC_MESSAGES/seahorse.mo share/locale/gl/LC_MESSAGES/seahorse.mo share/locale/gu/LC_MESSAGES/seahorse.mo share/locale/he/LC_MESSAGES/seahorse.mo +share/locale/hi/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/ko/LC_MESSAGES/seahorse.mo share/locale/lt/LC_MESSAGES/seahorse.mo +share/locale/lv/LC_MESSAGES/seahorse.mo share/locale/mk/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/ne/LC_MESSAGES/seahorse.mo share/locale/nl/LC_MESSAGES/seahorse.mo +share/locale/oc/LC_MESSAGES/seahorse.mo +share/locale/or/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/si/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/ta/LC_MESSAGES/seahorse.mo +share/locale/te/LC_MESSAGES/seahorse.mo share/locale/th/LC_MESSAGES/seahorse.mo share/locale/tr/LC_MESSAGES/seahorse.mo share/locale/uk/LC_MESSAGES/seahorse.mo @@ -169,7 +203,9 @@ share/omf/seahorse/seahorse-en_GB.omf share/omf/seahorse/seahorse-es.omf share/omf/seahorse/seahorse-fr.omf share/omf/seahorse/seahorse-it.omf +share/omf/seahorse/seahorse-oc.omf share/omf/seahorse/seahorse-sv.omf +share/omf/seahorse/seahorse-vi.omf share/pixmaps/seahorse-applet.svg share/pixmaps/seahorse-preferences.png share/pixmaps/seahorse.png @@ -181,10 +217,12 @@ share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png share/pixmaps/seahorse/22x22/seahorse-key-personal.png share/pixmaps/seahorse/22x22/seahorse-key-ssh.png share/pixmaps/seahorse/22x22/seahorse-key.png +share/pixmaps/seahorse/22x22/seahorse-person.png share/pixmaps/seahorse/22x22/seahorse-preferences.png share/pixmaps/seahorse/22x22/seahorse-share-keys.png share/pixmaps/seahorse/22x22/seahorse-sign-bad.png share/pixmaps/seahorse/22x22/seahorse-sign-ok.png +share/pixmaps/seahorse/22x22/seahorse-sign.png share/pixmaps/seahorse/22x22/seahorse.png share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png share/pixmaps/seahorse/48x48/seahorse-applet-key.png @@ -261,8 +299,12 @@ share/seahorse/glade/seahorse-ssh-upload.glade @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor +@dirrm share/gnome/help/seahorse/vi/figures +@dirrm share/gnome/help/seahorse/vi @dirrm share/gnome/help/seahorse/sv/figures @dirrm share/gnome/help/seahorse/sv +@dirrm share/gnome/help/seahorse/oc/figures +@dirrm share/gnome/help/seahorse/oc @dirrm share/gnome/help/seahorse/it/figures @dirrm share/gnome/help/seahorse/it @dirrm share/gnome/help/seahorse/fr/figures @@ -277,7 +319,6 @@ share/seahorse/glade/seahorse-ssh-upload.glade @comment in gnome2-dirs: @dirrm share/gnome/help @comment in GConf: @dirrm share/gconf/schemas @comment in dbus: @dirrm share/dbus-1/services -@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in xdg-dirs: @dirrm share/applications @dirrm lib/seahorse @dirrm include/libcryptui diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index e576366c8c4..94a68e98a8d 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.20 2007/08/18 13:19:56 obache Exp $ +$NetBSD: distinfo,v 1.21 2007/11/05 19:49:04 drochner Exp $ -SHA1 (seahorse-1.0.1.tar.bz2) = 03e5232d47e0d9d16fe7a713b00533859583a8d8 -RMD160 (seahorse-1.0.1.tar.bz2) = c11d2b0ae114cb41d52a3dc068f8a4fafc322603 -Size (seahorse-1.0.1.tar.bz2) = 1857602 bytes +SHA1 (seahorse-2.20.1.tar.bz2) = 7e8f5684598cfb7232a804e3462ee5ea583e6254 +RMD160 (seahorse-2.20.1.tar.bz2) = a2508bac5ad9df42edb52ab619abf6320e76d76a +Size (seahorse-2.20.1.tar.bz2) = 2287702 bytes SHA1 (patch-aa) = 991e7eb505efa2b81a6f56910aa9359743e1cb3b -SHA1 (patch-ab) = 8d391aecd0edc78dbbcc6638a76bc29b0a2fba9c +SHA1 (patch-ab) = c069dcda73f0ade281d2a847b8aee2ed3d945a3c SHA1 (patch-ac) = 0ad2021c9bda727b3b219cd6d6ca0a6132cc0a37 -SHA1 (patch-ad) = 46eefba09bb80c67547d824e775cf35383856aa5 SHA1 (patch-ae) = a0a85645b1df89ffb992c9191c30b228d2c5bd6f SHA1 (patch-ah) = 4a60c47ffd0de18fc423e317e870d08e8295a95c SHA1 (patch-ai) = 435ed5231c352f01ed4d83e4c5447cfef6468953 +SHA1 (patch-aj) = 8ce56f143c38a402eeca41b23f4d90d2c7ca04d6 diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab index 03ff5b2bb54..50dbe3a1df4 100644 --- a/security/seahorse/patches/patch-ab +++ b/security/seahorse/patches/patch-ab @@ -1,22 +1,75 @@ -$NetBSD: patch-ab,v 1.7 2007/04/11 21:48:02 drochner Exp $ +$NetBSD: patch-ab,v 1.8 2007/11/05 19:49:04 drochner Exp $ ---- configure.orig 2006-10-31 18:32:35.000000000 +0100 +--- configure.orig 2007-09-19 05:47:31.000000000 +0200 +++ configure -@@ -30737,7 +30737,7 @@ fi - +@@ -38698,12 +38698,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.16 >= 2.15.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gedit-2.16 >= 2.15.0") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.20 >= 2.15.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gedit-2.20 >= 2.15.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags "gedit-2.16 >= 2.15.0" 2>/dev/null` ++ pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags "gedit-2.20 >= 2.15.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -38716,12 +38716,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_GEDIT_LIBS="$GEDIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.16 >= 2.15.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gedit-2.16 >= 2.15.0") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.20 >= 2.15.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gedit-2.20 >= 2.15.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs "gedit-2.16 >= 2.15.0" 2>/dev/null` ++ pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs "gedit-2.20 >= 2.15.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -38740,9 +38740,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gedit-2.16 >= 2.15.0"` ++ GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gedit-2.20 >= 2.15.0"` + else +- GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gedit-2.16 >= 2.15.0"` ++ GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gedit-2.20 >= 2.15.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GEDIT_PKG_ERRORS" >&5 +@@ -43517,7 +43517,7 @@ _ACEOF + fi --if test "$enable_ssh" == "yes"; then -+if test "$enable_ssh" = "yes"; then +- if test "$enable_ssh" == "yes"; then ++ if test "$enable_ssh" = "yes"; then WITH_SSH_TRUE= WITH_SSH_FALSE='#' else -@@ -30797,7 +30797,7 @@ fi - +@@ -43605,7 +43605,7 @@ fi + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $EBOOK_CFLAGS" + SEAHORSE_LIBS="$SEAHORSE_LIBS $EBOOK_LIBS" +- if test "$enable_ebook" == "yes"; then ++ if test "$enable_ebook" = "yes"; then + WITH_EBOOK_TRUE= + WITH_EBOOK_FALSE='#' + else +@@ -43662,7 +43662,7 @@ if test "$enable_tests" != "yes"; then + enable_tests="no" + fi --if test "$enable_tests" == "yes"; then -+if test "$enable_tests" = "yes"; then +- if test "$enable_tests" == "yes"; then ++ if test "$enable_tests" = "yes"; then WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else diff --git a/security/seahorse/patches/patch-ad b/security/seahorse/patches/patch-ad deleted file mode 100644 index dddcf8ad74e..00000000000 --- a/security/seahorse/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2007/08/18 13:19:56 obache Exp $ -http://svn.gnome.org/viewcvs/seahorse/trunk/agent/Makefile.am?r1=1480&r2=1730&view=patch - ---- agent/Makefile.in.orig 2007-08-18 12:19:57.000000000 +0000 -+++ agent/Makefile.in -@@ -739,10 +739,10 @@ uninstall-man: uninstall-man1 - uninstall-man uninstall-man1 - - --# Don't make the daemon setuid --# Make the daemon setuid -+# Don't make the agent setuid -+# Make the agent setuid - @HAVE_USER_MLOCK_FALSE@install-exec-hook: --@HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon -+@HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-agent - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/security/seahorse/patches/patch-aj b/security/seahorse/patches/patch-aj new file mode 100644 index 00000000000..ad0d622dc90 --- /dev/null +++ b/security/seahorse/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1 2007/11/05 19:49:05 drochner Exp $ + +--- plugins/epiphany/Makefile.in.orig 2007-04-18 21:42:58.000000000 +0200 ++++ plugins/epiphany/Makefile.in +@@ -61,7 +61,7 @@ extensionLTLIBRARIES_INSTALL = $(INSTALL + LTLIBRARIES = $(extension_LTLIBRARIES) + am__DEPENDENCIES_1 = + libseahorseextension_la_DEPENDENCIES = mozilla/libsbmozilla.la \ +- $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) + am_libseahorseextension_la_OBJECTS = \ + libseahorseextension_la-seahorse-extension.lo \ + libseahorseextension_la-seahorse.lo +@@ -373,7 +373,7 @@ libseahorseextension_la_CFLAGS = \ + + libseahorseextension_la_LIBADD = \ + mozilla/libsbmozilla.la \ +- $(top_builddir)/libcryptui/libcryptui.la \ ++ -lcryptui \ + $(MOZILLA_COMPONENT_LIBS) + + libseahorseextension_la_LDFLAGS = \ |