pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove gnome-keyring, version in HEAD is newer
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Sun Nov 22 22:30:10 2020 +0100
Changeset: 494a6512e09eee207911d3299968c6ca15b2eaa2
Modified Files:
Makefile
Removed Files:
gnome-keyring/DESCR
gnome-keyring/MESSAGE
gnome-keyring/Makefile
gnome-keyring/PLIST
gnome-keyring/TODO
gnome-keyring/buildlink3.mk
gnome-keyring/distinfo
gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
gnome-keyring/patches/patch-egg_egg-unix-credentials.c
gnome-keyring/patches/patch-egg_egg-unix-credentials.h
Log Message:
Remove gnome-keyring, version in HEAD is newer
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=494a6512e09eee207911d3299968c6ca15b2eaa2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
gnome-keyring/DESCR | 15 ---
gnome-keyring/MESSAGE | 21 ----
gnome-keyring/Makefile | 50 ----------
gnome-keyring/PLIST | 109 ---------------------
gnome-keyring/TODO | 5 -
gnome-keyring/buildlink3.mk | 19 ----
gnome-keyring/distinfo | 9 --
.../patch-daemon_control_gkd-control-server.c | 16 ---
.../patches/patch-egg_egg-unix-credentials.c | 97 ------------------
.../patches/patch-egg_egg-unix-credentials.h | 13 ---
11 files changed, 355 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index ad3b93dc71..c0166e823b 100644
--- a/Makefile
+++ b/Makefile
@@ -1126,7 +1126,6 @@ SUBDIR+= gnome-common
SUBDIR+= gnome-core
SUBDIR+= gnome-jabber
SUBDIR+= gnome-js-common
-SUBDIR+= gnome-keyring
SUBDIR+= gnome-mount
SUBDIR+= gnome-paint
SUBDIR+= gnome-todo
diff --git a/gnome-keyring/DESCR b/gnome-keyring/DESCR
deleted file mode 100644
index d7cc1cc23a..0000000000
--- a/gnome-keyring/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-gnome-keyring is a program that keeps passwords and other secrets for
-users. It is run as a damon in the session, similar to ssh-agent, and
-other applications can locate it by an environment variable.
-
-The program can manage several keyrings, each with its own master
-password, and there is also a session keyring which is never stored to
-disk, but forgotten when the session ends.
-
-The library libgnome-keyring is used by applications to integrate with
-the gnome keyring system. However, at this point the library hasn't
-been tested and used enough to consider the API to be publically exposed.
-Therefore use of libgnome-keyring is at the moment limited to internal
-use in the gnome desktop. However, we hope that the gnome-keyring API
-will turn out useful and good, so that later it can be made public for
-any application to use.
diff --git a/gnome-keyring/MESSAGE b/gnome-keyring/MESSAGE
deleted file mode 100644
index 39dc36246d..0000000000
--- a/gnome-keyring/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2009/03/04 19:25:56 ahoka Exp $
-
-If you would like to have your keyring automatically unlocked upon login,
-please make sure you have a 'login' keyring and do the following:
-
-In /etc/pam.d/gdm, add lines like this at the end of the 'auth'
-and 'session' blocks:
-
- auth optional pam_gnome_keyring.so
- session optional pam_gnome_keyring.so auto_start
-
-In /etc/pam.d/gnome-screensaver, add a line like this to the 'auth' block:
-
- auth optional pam_gnome_keyring.so
-
-In /etc/pam.d/passwd, add a line like this to the 'password' block:
-
- password optional pam_gnome_keyring.so
-
-===========================================================================
diff --git a/gnome-keyring/Makefile b/gnome-keyring/Makefile
deleted file mode 100644
index 65b0d90a7a..0000000000
--- a/gnome-keyring/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.83 2015/04/25 14:24:48 tnn Exp $
-
-DISTNAME= gnome-keyring-3.20.1
-CATEGORIES= security gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/3.20/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.gnome.org/
-COMMENT= GNOME password and secret manager
-LICENSE= gnu-gpl-v2
-
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-PKGCONFIG_OVERRIDE+= gcr/gcr.pc.in
-PKGCONFIG_OVERRIDE+= gp11/gp11.pc.in
-
-CFLAGS.HPUX+= -DMAP_ANON=MAP_ANONYMOUS
-
-# Workaround a bug with NetBSD's openpam
-# The bug is described in PR security/39313
-#
-CFLAGS.NetBSD+= -DNO_STATIC_MODULES
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= ac_cv_header_security_pam_modules_h=yes
-.endif
-
-.include "../../mk/dlopen.buildlink3.mk"
-
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
-.include "../../devel/glib2/schemas.mk"
-.include "../../security/gcr/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../security/libtasn1/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-keyring/PLIST b/gnome-keyring/PLIST
deleted file mode 100644
index 49f9cdf375..0000000000
--- a/gnome-keyring/PLIST
+++ /dev/null
@@ -1,109 +0,0 @@
-@comment $NetBSD$
-bin/gnome-keyring
-bin/gnome-keyring-3
-bin/gnome-keyring-daemon
-etc/xdg/autostart/gnome-keyring-pkcs11.desktop
-etc/xdg/autostart/gnome-keyring-secrets.desktop
-etc/xdg/autostart/gnome-keyring-ssh.desktop
-lib/gnome-keyring/devel/gkm-gnome2-store-standalone.la
-lib/gnome-keyring/devel/gkm-secret-store-standalone.la
-lib/gnome-keyring/devel/gkm-ssh-store-standalone.la
-lib/gnome-keyring/devel/gkm-xdg-store-standalone.la
-lib/pkcs11/gnome-keyring-pkcs11.la
-lib/security/pam_gnome_keyring.la
-man/man1/gnome-keyring-3.1
-man/man1/gnome-keyring-daemon.1
-man/man1/gnome-keyring.1
-share/GConf/gsettings/org.gnome.crypto.cache.convert
-share/dbus-1/services/org.freedesktop.secrets.service
-share/dbus-1/services/org.gnome.keyring.service
-share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
-share/locale/af/LC_MESSAGES/gnome-keyring.mo
-share/locale/ar/LC_MESSAGES/gnome-keyring.mo
-share/locale/as/LC_MESSAGES/gnome-keyring.mo
-share/locale/ast/LC_MESSAGES/gnome-keyring.mo
-share/locale/az/LC_MESSAGES/gnome-keyring.mo
-share/locale/be/LC_MESSAGES/gnome-keyring.mo
-share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
-share/locale/bg/LC_MESSAGES/gnome-keyring.mo
-share/locale/bn/LC_MESSAGES/gnome-keyring.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
-share/locale/bs/LC_MESSAGES/gnome-keyring.mo
-share/locale/ca/LC_MESSAGES/gnome-keyring.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-keyring.mo
-share/locale/cs/LC_MESSAGES/gnome-keyring.mo
-share/locale/cy/LC_MESSAGES/gnome-keyring.mo
-share/locale/da/LC_MESSAGES/gnome-keyring.mo
-share/locale/de/LC_MESSAGES/gnome-keyring.mo
-share/locale/dz/LC_MESSAGES/gnome-keyring.mo
-share/locale/el/LC_MESSAGES/gnome-keyring.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
-share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
-share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
-share/locale/eo/LC_MESSAGES/gnome-keyring.mo
-share/locale/es/LC_MESSAGES/gnome-keyring.mo
-share/locale/et/LC_MESSAGES/gnome-keyring.mo
-share/locale/eu/LC_MESSAGES/gnome-keyring.mo
-share/locale/fa/LC_MESSAGES/gnome-keyring.mo
-share/locale/fi/LC_MESSAGES/gnome-keyring.mo
-share/locale/fr/LC_MESSAGES/gnome-keyring.mo
-share/locale/fur/LC_MESSAGES/gnome-keyring.mo
-share/locale/ga/LC_MESSAGES/gnome-keyring.mo
-share/locale/gd/LC_MESSAGES/gnome-keyring.mo
-share/locale/gl/LC_MESSAGES/gnome-keyring.mo
-share/locale/gu/LC_MESSAGES/gnome-keyring.mo
-share/locale/he/LC_MESSAGES/gnome-keyring.mo
-share/locale/hi/LC_MESSAGES/gnome-keyring.mo
-share/locale/hr/LC_MESSAGES/gnome-keyring.mo
-share/locale/hu/LC_MESSAGES/gnome-keyring.mo
-share/locale/id/LC_MESSAGES/gnome-keyring.mo
-share/locale/is/LC_MESSAGES/gnome-keyring.mo
-share/locale/it/LC_MESSAGES/gnome-keyring.mo
-share/locale/ja/LC_MESSAGES/gnome-keyring.mo
-share/locale/ka/LC_MESSAGES/gnome-keyring.mo
-share/locale/kk/LC_MESSAGES/gnome-keyring.mo
-share/locale/km/LC_MESSAGES/gnome-keyring.mo
-share/locale/kn/LC_MESSAGES/gnome-keyring.mo
-share/locale/ko/LC_MESSAGES/gnome-keyring.mo
-share/locale/lt/LC_MESSAGES/gnome-keyring.mo
-share/locale/lv/LC_MESSAGES/gnome-keyring.mo
-share/locale/mai/LC_MESSAGES/gnome-keyring.mo
-share/locale/mg/LC_MESSAGES/gnome-keyring.mo
-share/locale/mk/LC_MESSAGES/gnome-keyring.mo
-share/locale/ml/LC_MESSAGES/gnome-keyring.mo
-share/locale/mn/LC_MESSAGES/gnome-keyring.mo
-share/locale/mr/LC_MESSAGES/gnome-keyring.mo
-share/locale/ms/LC_MESSAGES/gnome-keyring.mo
-share/locale/nb/LC_MESSAGES/gnome-keyring.mo
-share/locale/ne/LC_MESSAGES/gnome-keyring.mo
-share/locale/nl/LC_MESSAGES/gnome-keyring.mo
-share/locale/nn/LC_MESSAGES/gnome-keyring.mo
-share/locale/oc/LC_MESSAGES/gnome-keyring.mo
-share/locale/or/LC_MESSAGES/gnome-keyring.mo
-share/locale/pa/LC_MESSAGES/gnome-keyring.mo
-share/locale/pl/LC_MESSAGES/gnome-keyring.mo
-share/locale/pt/LC_MESSAGES/gnome-keyring.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
-share/locale/ro/LC_MESSAGES/gnome-keyring.mo
-share/locale/ru/LC_MESSAGES/gnome-keyring.mo
-share/locale/rw/LC_MESSAGES/gnome-keyring.mo
-share/locale/si/LC_MESSAGES/gnome-keyring.mo
-share/locale/sk/LC_MESSAGES/gnome-keyring.mo
-share/locale/sl/LC_MESSAGES/gnome-keyring.mo
-share/locale/sq/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
-share/locale/sv/LC_MESSAGES/gnome-keyring.mo
-share/locale/ta/LC_MESSAGES/gnome-keyring.mo
-share/locale/te/LC_MESSAGES/gnome-keyring.mo
-share/locale/tg/LC_MESSAGES/gnome-keyring.mo
-share/locale/th/LC_MESSAGES/gnome-keyring.mo
-share/locale/tr/LC_MESSAGES/gnome-keyring.mo
-share/locale/ug/LC_MESSAGES/gnome-keyring.mo
-share/locale/uk/LC_MESSAGES/gnome-keyring.mo
-share/locale/vi/LC_MESSAGES/gnome-keyring.mo
-share/locale/xh/LC_MESSAGES/gnome-keyring.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
-share/p11-kit/modules/gnome-keyring.module
diff --git a/gnome-keyring/TODO b/gnome-keyring/TODO
deleted file mode 100644
index 87b9bff43d..0000000000
--- a/gnome-keyring/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Check if this crazy change actually works.
-Otherwise, add local creds as follows:
-https://bugzilla.gnome.org/show_bug.cgi?id=353105
-Removed here:
-https://git.gnome.org/browse/gnome-keyring/commit/?id=da22a40250da283a502ecb35add5e6548c654c6b
diff --git a/gnome-keyring/buildlink3.mk b/gnome-keyring/buildlink3.mk
deleted file mode 100644
index c85de36646..0000000000
--- a/gnome-keyring/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.37 2015/04/25 14:24:48 tnn Exp $
-
-BUILDLINK_TREE+= gnome-keyring
-
-.if !defined(GNOME_KEYRING_BUILDLINK3_MK)
-GNOME_KEYRING_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0
-BUILDLINK_ABI_DEPENDS.gnome-keyring+= gnome-keyring>=2.32.1nb19
-BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../wip/gnome-keyring
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/libtasn1/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif # GNOME_KEYRING_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -gnome-keyring
diff --git a/gnome-keyring/distinfo b/gnome-keyring/distinfo
deleted file mode 100644
index 0fe1ab3f8b..0000000000
--- a/gnome-keyring/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.44 2015/11/04 01:17:44 agc Exp $
-
-SHA1 (gnome-keyring-3.20.1.tar.xz) = d94f68dfc790363dd508804f88c9c8954d572837
-RMD160 (gnome-keyring-3.20.1.tar.xz) = 70550529ede762f6ce1f0946441293f6a416d272
-SHA512 (gnome-keyring-3.20.1.tar.xz) = a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177
-Size (gnome-keyring-3.20.1.tar.xz) = 1219800 bytes
-SHA1 (patch-daemon_control_gkd-control-server.c) = 9400ecef7efd148ed6d9512572bd6ac196dcccca
-SHA1 (patch-egg_egg-unix-credentials.c) = 2ed51494ba97476d923ab84d03713cc1d9563bc6
-SHA1 (patch-egg_egg-unix-credentials.h) = a688de09828436cee573ac0b6a944eb8d75e4794
diff --git a/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c b/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
deleted file mode 100644
index a0bc115fcf..0000000000
--- a/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- daemon/control/gkd-control-server.c.orig 2015-06-29 15:24:02.000000000 +0000
-+++ daemon/control/gkd-control-server.c
-@@ -431,11 +431,6 @@ gkd_control_listen (void)
- return FALSE;
- }
-
-- if (egg_unix_credentials_setup (sock) < 0) {
-- close (sock);
-- return FALSE;
-- }
--
- channel = g_io_channel_unix_new (sock);
- g_io_add_watch (channel, G_IO_IN | G_IO_HUP, control_accept, NULL);
- g_io_channel_set_close_on_unref (channel, TRUE);
diff --git a/gnome-keyring/patches/patch-egg_egg-unix-credentials.c b/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
deleted file mode 100644
index d45c848626..0000000000
--- a/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
---- egg/egg-unix-credentials.c.orig 2014-09-23 07:45:13.000000000 +0000
-+++ egg/egg-unix-credentials.c
-@@ -56,14 +56,8 @@ egg_unix_credentials_read (int sock, pid
- char buf;
- int ret;
-
--#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-- /* Prefer CMSGCRED over LOCAL_CREDS because the former provides the
-- * remote PID. */
- #if defined(HAVE_CMSGCRED)
- struct cmsgcred *cred;
--#else /* defined(LOCAL_CREDS) */
-- struct sockcred *cred;
--#endif
- union {
- struct cmsghdr hdr;
- char cred[CMSG_SPACE (sizeof *cred)];
-@@ -84,7 +78,7 @@ egg_unix_credentials_read (int sock, pid
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-
--#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED)
- memset (&cmsg, 0, sizeof (cmsg));
- msg.msg_control = (caddr_t) &cmsg;
- msg.msg_controllen = CMSG_SPACE(sizeof *cred);
-@@ -108,7 +102,7 @@ egg_unix_credentials_read (int sock, pid
- return -1;
- }
-
--#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED)
- if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
- cmsg.hdr.cmsg_type != SCM_CREDS) {
- fprintf (stderr, "message from recvmsg() was not SCM_CREDS\n");
-@@ -138,11 +132,6 @@ egg_unix_credentials_read (int sock, pid
- cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
- *pid = cred->cmcred_pid;
- *uid = cred->cmcred_euid;
--#elif defined(LOCAL_CREDS)
-- cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
-- *pid = 0;
-- *uid = cred->sc_euid;
-- set_local_creds(sock, 0);
- #elif defined(HAVE_GETPEEREID) /* OpenBSD */
- uid_t euid;
- gid_t egid;
-@@ -179,7 +168,7 @@ egg_unix_credentials_write (int socket)
- {
- char buf;
- int bytes_written;
--#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
- union {
- struct cmsghdr hdr;
- char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-@@ -190,7 +179,7 @@ egg_unix_credentials_write (int socket)
-
- buf = 0;
-
--#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
- iov.iov_base = &buf;
- iov.iov_len = 1;
-
-@@ -208,7 +197,7 @@ egg_unix_credentials_write (int socket)
-
- again:
-
--#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
- bytes_written = sendmsg (socket, &msg, 0);
- #else
- bytes_written = write (socket, &buf, 1);
-@@ -223,20 +212,6 @@ again:
- return 0;
- }
-
--int
--egg_unix_credentials_setup (int sock)
--{
-- int retval = 0;
--#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
-- int val = 1;
-- if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
-- fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
-- retval = -1;
-- }
--#endif
-- return retval;
--}
--
- char*
- egg_unix_credentials_executable (pid_t pid)
- {
diff --git a/gnome-keyring/patches/patch-egg_egg-unix-credentials.h b/gnome-keyring/patches/patch-egg_egg-unix-credentials.h
deleted file mode 100644
index bbcb352ef4..0000000000
--- a/gnome-keyring/patches/patch-egg_egg-unix-credentials.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- egg/egg-unix-credentials.h.orig 2014-09-23 07:45:13.000000000 +0000
-+++ egg/egg-unix-credentials.h
-@@ -43,8 +43,6 @@ int egg_unix_credentials_read
-
- int egg_unix_credentials_write (int sock);
-
--int egg_unix_credentials_setup (int sock);
--
- char* egg_unix_credentials_executable (pid_t pid);
-
- #endif /*EGGUNIXCREDENTIALS_H_*/
Home |
Main Index |
Thread Index |
Old Index