Page MenuHomeFreeBSD
Files F150099260

D5690.id14458.diff
No OneTemporary
Actions

D5690.id14458.diff
View Options

Index: databases/evolution-data-server/Makefile
===================================================================
--- databases/evolution-data-server/Makefile
+++ databases/evolution-data-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 3.18.5
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -22,7 +23,7 @@
libical.so:${PORTSDIR}/devel/libical \
libnss3.so:${PORTSDIR}/security/nss \
libtasn1.so:${PORTSDIR}/security/libtasn1 \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+ libsecret-1.so:${PORTSDIR}/security/libsecret
PORTSCOUT= limitw:1,even
Index: net/gnome-online-accounts/Makefile
===================================================================
--- net/gnome-online-accounts/Makefile
+++ net/gnome-online-accounts/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-online-accounts
PORTVERSION= 3.18.4
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
@@ -15,7 +16,6 @@
libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
libnotify.so:${PORTSDIR}/devel/libnotify \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
libsecret-1.so:${PORTSDIR}/security/libsecret \
librest-0.7.so:${PORTSDIR}/devel/librest
Index: net/vinagre/Makefile
===================================================================
--- net/vinagre/Makefile
+++ net/vinagre/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vinagre
PORTVERSION= 3.18.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,8 +14,7 @@
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \
libgdbm.so:${PORTSDIR}/databases/gdbm \
- libsecret-1.so:${PORTSDIR}/security/libsecret \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+ libsecret-1.so:${PORTSDIR}/security/libsecret
RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
Index: net/vino/Makefile
===================================================================
--- net/vino/Makefile
+++ net/vino/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vino
PORTVERSION= 3.18.1
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,8 +14,8 @@
LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+ libsecret-1.so:${PORTSDIR}/security/libsecret \
libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
libnotify.so:${PORTSDIR}/devel/libnotify \
libavahi-glib.so:${PORTSDIR}/net/avahi-app
Index: security/gnome-keyring/Makefile
===================================================================
--- security/gnome-keyring/Makefile
+++ security/gnome-keyring/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnome-keyring
PORTVERSION= 3.18.3
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,8 +14,7 @@
BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
gcr>=3.5.3:${PORTSDIR}/security/gcr
-LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
- libdbus-1.so:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
libgcr-3.so:${PORTSDIR}/security/gcr \
libtasn1.so:${PORTSDIR}/security/libtasn1 \
libp11-kit.so:${PORTSDIR}/security/p11-kit \
Index: www/epiphany/Makefile
===================================================================
--- www/epiphany/Makefile
+++ www/epiphany/Makefile
@@ -3,6 +3,7 @@
PORTNAME= epiphany
PORTVERSION= 3.16.3
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -20,7 +21,7 @@
libnss3.so:${PORTSDIR}/security/nss \
libavahi-gobject.so:${PORTSDIR}/net/avahi-app \
libnotify.so:${PORTSDIR}/devel/libnotify \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+ libsecret-1.so:${PORTSDIR}/security/libsecret
RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
Index: x11/gdm/Makefile
===================================================================
--- x11/gdm/Makefile
+++ x11/gdm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gdm
PORTVERSION= 3.16.4
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -90,10 +91,7 @@
GNOME_LOCALSTATEDIR= /var
-OPTIONS_DEFINE= IPV6 KEYRING
-OPTIONS_DEFAULT=KEYRING
-KEYRING_DESC= Gnomekeyring/PAM integration
-KEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+OPTIONS_DEFINE= IPV6
IPV6_CONFIGURE_ENABLE= ipv6
.include <bsd.port.options.mk>
@@ -102,12 +100,6 @@
CONFIGURE_ARGS+= --enable-debug
.endif
-.if ${PORT_OPTIONS:MKEYRING}
-SUB_LIST+= PAM_KEYRING=
-.else
-SUB_LIST+= PAM_KEYRING=\#
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
${WRKSRC}/data/Makefile.in
Index: x11/gdm/files/gdm-password.in
===================================================================
--- x11/gdm/files/gdm-password.in
+++ x11/gdm/files/gdm-password.in
@@ -4,7 +4,7 @@
auth include system
auth optional /usr/local/lib/pam_ck_connector.so
-%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
+auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
account required pam_nologin.so
account include system
@@ -12,4 +12,4 @@
password include system
session include system
-%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
+session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
Index: x11/gnome-shell/Makefile
===================================================================
--- x11/gnome-shell/Makefile
+++ x11/gnome-shell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-shell
PORTVERSION= 3.18.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,7 +16,7 @@
LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
libcaribou.so:${PORTSDIR}/accessibility/caribou \
libmutter.so:${PORTSDIR}/x11-wm/mutter \
- libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+ libsecret-1.so:${PORTSDIR}/security/libsecret \
libgcr-3.so:${PORTSDIR}/security/gcr \
libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 8:54 AM (2 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30582124
Default Alt Text
D5690.id14458.diff (6 KB)

Event Timeline