Attachment #89108 for bug #125983

View | Details | Raw Unified | Return to bug 125983
Collapse All | Expand All

Lines 8-13 Link Here

(-)/usr/ports/x11/gdm/Makefile (-3 / +9 lines)
8		8
9	PORTNAME= gdm	9	PORTNAME= gdm
10	PORTVERSION= 2.20.7	10	PORTVERSION= 2.20.7
		11	PORTREVISION= 1
11	CATEGORIES= x11 gnome	12	CATEGORIES= x11 gnome
12	MASTER_SITES= GNOME	13	MASTER_SITES= GNOME
13	DIST_SUBDIR= gnome2	14	DIST_SUBDIR= gnome2
Lines 38-43 Link Here
38	GTKDOC="false"	39	GTKDOC="false"
39	CONFIGURE_ARGS=--with-console-kit=yes	40	CONFIGURE_ARGS=--with-console-kit=yes
40		41
		42	SUB_FILES+= gdm.pam
		43
41	GDMDIR?= ${PREFIX}/etc/gdm	44	GDMDIR?= ${PREFIX}/etc/gdm
42	PKGMESSAGE= ${WRKDIR}/pkg-message	45	PKGMESSAGE= ${WRKDIR}/pkg-message
43		46
Lines 46-59 Link Here
46	MAN1= gdm.1	49	MAN1= gdm.1
47		50
48	OPTIONS= IPV6 "Enable IPv6 support" on \	51	OPTIONS= IPV6 "Enable IPv6 support" on \
		52	KEYRING "Enable GnomeKeyring/PAM integration" on \
49	LOG_LIMIT "Limit ~/.xsession-errors size" on	53	LOG_LIMIT "Limit ~/.xsession-errors size" on
50		54
51	.include <bsd.port.pre.mk>	55	.include <bsd.port.pre.mk>
52		56
53	.if exists(/usr/include/security/pam_misc.h)	57	.if defined(WITHOUT_KEYRING)
54	PLIST_SUB+= PAM_MISC=""	58	SUB_LIST+= PAM_KEYRING=\#
55	.else	59	.else
56	PLIST_SUB+= PAM_MISC="@comment "	60	RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
		61	SUB_LIST+= PAM_KEYRING=
57	.endif	62	.endif
58		63
59	.if !defined(WITHOUT_IPV6)	64	.if !defined(WITHOUT_IPV6)
Lines 87-92 Link Here
87	.endif	92	.endif
88	${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \	93	${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
89	${PREFIX}/etc/gdm/custom.conf.default	94	${PREFIX}/etc/gdm/custom.conf.default
		95	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
90	@${MKDIR} ${PREFIX}/etc/gdm/Sessions	96	@${MKDIR} ${PREFIX}/etc/gdm/Sessions
91	@${SED} -e 's\|%%PREFIX%%\|${PREFIX}\|g' < ${PKGDIR}/pkg-message \	97	@${SED} -e 's\|%%PREFIX%%\|${PREFIX}\|g' < ${PKGDIR}/pkg-message \
92	\| /usr/bin/fmt 75 79 > ${PKGMESSAGE}	98	\| /usr/bin/fmt 75 79 > ${PKGMESSAGE}

Lines 14-19 Link Here

(-)/usr/ports/x11/gdm/files/gdm.in (+6 lines)
14	. %%GNOME_SUBR%%	14	. %%GNOME_SUBR%%
15		15
16	gdm_enable=${gdm_enable-${gnome_enable}}	16	gdm_enable=${gdm_enable-${gnome_enable}}
		17	gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
17		18
18	export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin	19	export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
19		20
Lines 31-36 Link Here
31	fi	32	fi
32	echo "Starting ${name}."	33	echo "Starting ${name}."
33		34
		35	# make sure there is no pam configuration for gdm service in base system
		36	if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
		37	rm -f /etc/pam.d/gdm
		38	fi
		39
34	( iter=0	40	( iter=0
35	while ! ps -axoargs \| grep "^/usr/libexec/getty " \| grep -qv grep >/dev/null 2>&1; do	41	while ! ps -axoargs \| grep "^/usr/libexec/getty " \| grep -qv grep >/dev/null 2>&1; do
36	if [ ${iter} -eq 60 ]; then	42	if [ ${iter} -eq 60 ]; then




#
# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
#
# PAM configuration for the "gdm" service
#

# auth
#auth		sufficient	pam_krb5.so		no_warn try_first_pass
#auth		sufficient	pam_ssh.so		no_warn try_first_pass
auth		required	pam_unix.so		no_warn try_first_pass
%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so

# account
account		required	pam_nologin.so
#account 	required	pam_krb5.so
account		required	pam_unix.so

# session
#session 	optional	pam_ssh.so
session		required	pam_permit.so
%%PAM_KEYRING%%session		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so	auto_start




@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi
etc/gdm/modules/factory-AccessKeyMouseEvents
@exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents
etc/pam.d/gdm
lib/gtk-2.0/modules/libdwellmouselistener.a
lib/gtk-2.0/modules/libdwellmouselistener.la
lib/gtk-2.0/modules/libdwellmouselistener.so
lib/gtk-2.0/modules/libkeymouselistener.a
lib/gtk-2.0/modules/libkeymouselistener.la
lib/gtk-2.0/modules/libkeymouselistener.so
%%PAM_MISC%%libexec/gdmaskpass
libexec/gdmchooser
libexec/gdmgreeter
libexec/gdmlogin

Return to bug 125983

Line 0 Link Here

(-)/usr/ports/x11/gdm/files/gdm.pam.in (+21 lines)
	1	#
	2	# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
	3	#
	4	# PAM configuration for the "gdm" service
	5	#
	6
	7	# auth
	8	#auth sufficient pam_krb5.so no_warn try_first_pass
	9	#auth sufficient pam_ssh.so no_warn try_first_pass
	10	auth required pam_unix.so no_warn try_first_pass
	11	%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
	12
	13	# account
	14	account required pam_nologin.so
	15	#account required pam_krb5.so
	16	account required pam_unix.so
	17
	18	# session
	19	#session optional pam_ssh.so
	20	session required pam_permit.so
	21	%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start

Lines 21-33 Link Here

(-)/usr/ports/x11/gdm/pkg-plist (-1 / +1 lines)
21	@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi	21	@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi
22	etc/gdm/modules/factory-AccessKeyMouseEvents	22	etc/gdm/modules/factory-AccessKeyMouseEvents
23	@exec [ -f %B/AccessKeyMouseEvents ] \|\| cp %B/%f %B/AccessKeyMouseEvents	23	@exec [ -f %B/AccessKeyMouseEvents ] \|\| cp %B/%f %B/AccessKeyMouseEvents
		24	etc/pam.d/gdm
24	lib/gtk-2.0/modules/libdwellmouselistener.a	25	lib/gtk-2.0/modules/libdwellmouselistener.a
25	lib/gtk-2.0/modules/libdwellmouselistener.la	26	lib/gtk-2.0/modules/libdwellmouselistener.la
26	lib/gtk-2.0/modules/libdwellmouselistener.so	27	lib/gtk-2.0/modules/libdwellmouselistener.so
27	lib/gtk-2.0/modules/libkeymouselistener.a	28	lib/gtk-2.0/modules/libkeymouselistener.a
28	lib/gtk-2.0/modules/libkeymouselistener.la	29	lib/gtk-2.0/modules/libkeymouselistener.la
29	lib/gtk-2.0/modules/libkeymouselistener.so	30	lib/gtk-2.0/modules/libkeymouselistener.so
30	%%PAM_MISC%%libexec/gdmaskpass
31	libexec/gdmchooser	31	libexec/gdmchooser
32	libexec/gdmgreeter	32	libexec/gdmgreeter
33	libexec/gdmlogin	33	libexec/gdmlogin