Attachment #235881 for bug #265818

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

Lines 1-8 Link Here

(-)b/x11/lightdm/Makefile (-3 / +2 lines)
1	PORTNAME= lightdm	1	PORTNAME= lightdm
2	PORTVERSION= 1.30.0	2	PORTVERSION= 1.32.0
3	PORTREVISION= 3
4	CATEGORIES= x11	3	CATEGORIES= x11
5	MASTER_SITES= https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/	4	MASTER_SITES= https://github.com/canonical/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
6		5
7	MAINTAINER= desktop@FreeBSD.org	6	MAINTAINER= desktop@FreeBSD.org
8	COMMENT= Lightweight Display Manager	7	COMMENT= Lightweight Display Manager

Lines 1-3 Link Here

(-)b/x11/lightdm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559844986	1	TIMESTAMP = 1660386883
2	SHA256 (lightdm-1.30.0.tar.xz) = a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95	2	SHA256 (lightdm-1.32.0.tar.xz) = 12f5ab432748f0387c7cf8b94430495a558a035a4f8465e5181af6faff133e4b
3	SIZE (lightdm-1.30.0.tar.xz) = 509220	3	SIZE (lightdm-1.32.0.tar.xz) = 518168




--- data/Makefile.in.orig	2022-07-18 03:38:31 UTC
+++ data/Makefile.in
@@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am \
-	$(dist_apparmor_profile_abstractions_DATA) \
 	$(dist_completions_DATA) $(dist_conf_DATA) $(dist_dbus_DATA) \
 	$(dist_dbusconf_DATA) $(dist_init_DATA) $(dist_pam_DATA) \
 	$(am__DIST_COMMON)
@@ -155,16 +154,13 @@ am__uninstall_files_from_dir = { \
   }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(apparmor_profiledir)" \
-	"$(DESTDIR)$(apparmor_profile_abstractionsdir)" \
 	"$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" \
 	"$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" \
 	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" \
 	"$(DESTDIR)$(polkitdir)"
 NROFF = nroff
 MANS = $(dist_man1_MANS)
-DATA = $(apparmor_profile_DATA) \
-	$(dist_apparmor_profile_abstractions_DATA) \
+DATA = \
 	$(dist_completions_DATA) $(dist_conf_DATA) $(dist_dbus_DATA) \
 	$(dist_dbusconf_DATA) $(dist_init_DATA) $(dist_pam_DATA) \
 	$(polkit_DATA)
@@ -375,15 +371,7 @@ dist_pam_DATA = pam/lightdm \
 
 completionsdir = $(datadir)/bash-completion/completions
 dist_completions_DATA = bash-completion/dm-tool bash-completion/lightdm
-apparmor_profiledir = $(sysconfdir)/apparmor.d
-apparmor_profile_DATA = \
-    lightdm-guest-session
 
-apparmor_profile_abstractionsdir = $(apparmor_profiledir)/abstractions
-dist_apparmor_profile_abstractions_DATA = \
-    apparmor/abstractions/lightdm \
-    apparmor/abstractions/lightdm_chromium-browser
-
 accountsservice_interface = org.freedesktop.DisplayManager.AccountsService.xml
 dbusdir = $(datadir)/dbus-1/interfaces
 dist_dbus_DATA = \
@@ -476,48 +464,6 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-apparmor_profileDATA: $(apparmor_profile_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(apparmor_profiledir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(apparmor_profiledir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profiledir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profiledir)" || exit $$?; \
-	done
-
-uninstall-apparmor_profileDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(apparmor_profiledir)'; $(am__uninstall_files_from_dir)
-install-dist_apparmor_profile_abstractionsDATA: $(dist_apparmor_profile_abstractions_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_apparmor_profile_abstractions_DATA)'; test -n "$(apparmor_profile_abstractionsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(apparmor_profile_abstractionsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(apparmor_profile_abstractionsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profile_abstractionsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profile_abstractionsdir)" || exit $$?; \
-	done
-
-uninstall-dist_apparmor_profile_abstractionsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_apparmor_profile_abstractions_DATA)'; test -n "$(apparmor_profile_abstractionsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(apparmor_profile_abstractionsdir)'; $(am__uninstall_files_from_dir)
 install-dist_completionsDATA: $(dist_completions_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_completions_DATA)'; test -n "$(completionsdir)" || list=; \
@@ -708,7 +654,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(apparmor_profile_abstractionsdir)" "$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" "$(DESTDIR)$(polkitdir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" "$(DESTDIR)$(polkitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -762,9 +708,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-apparmor_profileDATA \
-	install-dist_apparmor_profile_abstractionsDATA \
-	install-dist_completionsDATA install-dist_confDATA \
+install-data-am: install-dist_completionsDATA \
+	install-dist_confDATA \
 	install-dist_dbusDATA install-dist_dbusconfDATA \
 	install-dist_initDATA install-dist_pamDATA install-man \
 	install-polkitDATA
@@ -812,9 +757,8 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-apparmor_profileDATA \
-	uninstall-dist_apparmor_profile_abstractionsDATA \
-	uninstall-dist_completionsDATA uninstall-dist_confDATA \
+uninstall-am: uninstall-dist_completionsDATA \
+	uninstall-dist_confDATA \
 	uninstall-dist_dbusDATA uninstall-dist_dbusconfDATA \
 	uninstall-dist_initDATA uninstall-dist_pamDATA uninstall-man \
 	uninstall-polkitDATA
@@ -826,8 +770,8 @@ uninstall-man: uninstall-man1
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-apparmor_profileDATA install-data \
-	install-data-am install-dist_apparmor_profile_abstractionsDATA \
+	install install-am install-data \
+	install-data-am \
 	install-dist_completionsDATA install-dist_confDATA \
 	install-dist_dbusDATA install-dist_dbusconfDATA \
 	install-dist_initDATA install-dist_pamDATA install-dvi \
@@ -838,8 +782,7 @@ uninstall-man: uninstall-man1
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-apparmor_profileDATA \
-	uninstall-dist_apparmor_profile_abstractionsDATA \
+	uninstall-am \
 	uninstall-dist_completionsDATA uninstall-dist_confDATA \
 	uninstall-dist_dbusDATA uninstall-dist_dbusconfDATA \
 	uninstall-dist_initDATA uninstall-dist_pamDATA uninstall-man \

Added Link Here

(-)b/x11/lightdm/files/patch-src_lightdm.c (+11 lines)
1	--- src/lightdm.c.orig 2022-07-10 21:17:23 UTC
2	+++ src/lightdm.c
3	@@ -813,7 +813,7 @@ main (int argc, char **argv)
4	if (!config_has_key (config_get_instance (), "XDMCPServer", "hostname"))
5	config_set_string (config_get_instance (), "XDMCPServer", "hostname", g_get_host_name ());
6	if (!config_has_key (config_get_instance (), "LightDM", "logind-check-graphical"))
7	- config_set_boolean (config_get_instance (), "LightDM", "logind-check-graphical", TRUE);
8	+ config_set_boolean (config_get_instance (), "LightDM", "logind-check-graphical", FALSE);
9
10	/* Override defaults */
11	if (log_dir)

Removed Link Here

(-)a/x11/lightdm/files/patch-src_process.c (-11 lines)
1	--- src/process.c.orig 2018-08-30 00:28:55 UTC
2	+++ src/process.c
3	@@ -73,6 +73,8 @@ static GHashTable *processes = NULL;
4	static pid_t signal_pid;
5	static int signal_pipe[2];
6
7	+extern char **environ;
8	+
9	Process *
10	process_get_current (void)
11	{

Lines 1-8 Link Here

(-)b/x11/lightdm/pkg-plist (-4 / +1 lines)
1	bin/dm-tool	1	bin/dm-tool
2	etc/apparmor.d/abstractions/lightdm
3	etc/apparmor.d/abstractions/lightdm_chromium-browser
4	etc/apparmor.d/lightdm-guest-session
5	etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
6	%%ETCDIR%%/Xsession	2	%%ETCDIR%%/Xsession
7	@sample %%ETCDIR%%/keys.conf.sample	3	@sample %%ETCDIR%%/keys.conf.sample
8	@sample %%ETCDIR%%/lightdm.conf.sample	4	@sample %%ETCDIR%%/lightdm.conf.sample
Lines 32-37 share/accountsservice/interfaces/org.freedesktop.DisplayManager.AccountsService. Link Here
32	share/bash-completion/completions/dm-tool	28	share/bash-completion/completions/dm-tool
33	share/bash-completion/completions/lightdm	29	share/bash-completion/completions/lightdm
34	share/dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml	30	share/dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
		31	share/dbus-1/system.d/org.freedesktop.DisplayManager.conf
35	%%VAPI%%share/gir-1.0/LightDM-1.gir	32	%%VAPI%%share/gir-1.0/LightDM-1.gir
36	%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMGreeter.html	33	%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMGreeter.html
37	%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLanguage.html	34	%%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLanguage.html

Return to bug 265818

Added Link Here

(-)b/x11/lightdm/files/patch-data_Makefile.in (+147 lines)
1	--- data/Makefile.in.orig 2022-07-18 03:38:31 UTC
2	+++ data/Makefile.in
3	@@ -99,7 +99,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
4	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
5	$(ACLOCAL_M4)
6	DIST_COMMON = $(srcdir)/Makefile.am \
7	- $(dist_apparmor_profile_abstractions_DATA) \
8	$(dist_completions_DATA) $(dist_conf_DATA) $(dist_dbus_DATA) \
9	$(dist_dbusconf_DATA) $(dist_init_DATA) $(dist_pam_DATA) \
10	$(am__DIST_COMMON)
11	@@ -155,16 +154,13 @@ am__uninstall_files_from_dir = { \
12	}
13	man1dir = $(mandir)/man1
14	am__installdirs = "$(DESTDIR)$(man1dir)" \
15	- "$(DESTDIR)$(apparmor_profiledir)" \
16	- "$(DESTDIR)$(apparmor_profile_abstractionsdir)" \
17	"$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" \
18	"$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" \
19	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" \
20	"$(DESTDIR)$(polkitdir)"
21	NROFF = nroff
22	MANS = $(dist_man1_MANS)
23	-DATA = $(apparmor_profile_DATA) \
24	- $(dist_apparmor_profile_abstractions_DATA) \
25	+DATA = \
26	$(dist_completions_DATA) $(dist_conf_DATA) $(dist_dbus_DATA) \
27	$(dist_dbusconf_DATA) $(dist_init_DATA) $(dist_pam_DATA) \
28	$(polkit_DATA)
29	@@ -375,15 +371,7 @@ dist_pam_DATA = pam/lightdm \
30
31	completionsdir = $(datadir)/bash-completion/completions
32	dist_completions_DATA = bash-completion/dm-tool bash-completion/lightdm
33	-apparmor_profiledir = $(sysconfdir)/apparmor.d
34	-apparmor_profile_DATA = \
35	- lightdm-guest-session
36
37	-apparmor_profile_abstractionsdir = $(apparmor_profiledir)/abstractions
38	-dist_apparmor_profile_abstractions_DATA = \
39	- apparmor/abstractions/lightdm \
40	- apparmor/abstractions/lightdm_chromium-browser
41	-
42	accountsservice_interface = org.freedesktop.DisplayManager.AccountsService.xml
43	dbusdir = $(datadir)/dbus-1/interfaces
44	dist_dbus_DATA = \
45	@@ -476,48 +464,6 @@ uninstall-man1:
46	} \| sed -e 's,./,,;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
47	-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
48	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
49	-install-apparmor_profileDATA: $(apparmor_profile_DATA)
50	- @$(NORMAL_INSTALL)
51	- @list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" \|\| list=; \
52	- if test -n "$$list"; then \
53	- echo " $(MKDIR_P) '$(DESTDIR)$(apparmor_profiledir)'"; \
54	- $(MKDIR_P) "$(DESTDIR)$(apparmor_profiledir)" \|\| exit 1; \
55	- fi; \
56	- for p in $$list; do \
57	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
58	- echo "$$d$$p"; \
59	- done \| $(am__base_list) \| \
60	- while read files; do \
61	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profiledir)'"; \
62	- $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profiledir)" \|\| exit $$?; \
63	- done
64	-
65	-uninstall-apparmor_profileDATA:
66	- @$(NORMAL_UNINSTALL)
67	- @list='$(apparmor_profile_DATA)'; test -n "$(apparmor_profiledir)" \|\| list=; \
68	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
69	- dir='$(DESTDIR)$(apparmor_profiledir)'; $(am__uninstall_files_from_dir)
70	-install-dist_apparmor_profile_abstractionsDATA: $(dist_apparmor_profile_abstractions_DATA)
71	- @$(NORMAL_INSTALL)
72	- @list='$(dist_apparmor_profile_abstractions_DATA)'; test -n "$(apparmor_profile_abstractionsdir)" \|\| list=; \
73	- if test -n "$$list"; then \
74	- echo " $(MKDIR_P) '$(DESTDIR)$(apparmor_profile_abstractionsdir)'"; \
75	- $(MKDIR_P) "$(DESTDIR)$(apparmor_profile_abstractionsdir)" \|\| exit 1; \
76	- fi; \
77	- for p in $$list; do \
78	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
79	- echo "$$d$$p"; \
80	- done \| $(am__base_list) \| \
81	- while read files; do \
82	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmor_profile_abstractionsdir)'"; \
83	- $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmor_profile_abstractionsdir)" \|\| exit $$?; \
84	- done
85	-
86	-uninstall-dist_apparmor_profile_abstractionsDATA:
87	- @$(NORMAL_UNINSTALL)
88	- @list='$(dist_apparmor_profile_abstractions_DATA)'; test -n "$(apparmor_profile_abstractionsdir)" \|\| list=; \
89	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
90	- dir='$(DESTDIR)$(apparmor_profile_abstractionsdir)'; $(am__uninstall_files_from_dir)
91	install-dist_completionsDATA: $(dist_completions_DATA)
92	@$(NORMAL_INSTALL)
93	@list='$(dist_completions_DATA)'; test -n "$(completionsdir)" \|\| list=; \
94	@@ -708,7 +654,7 @@ check-am: all-am
95	check: check-am
96	all-am: Makefile $(MANS) $(DATA)
97	installdirs:
98	- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(apparmor_profiledir)" "$(DESTDIR)$(apparmor_profile_abstractionsdir)" "$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" "$(DESTDIR)$(polkitdir)"; do \
99	+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(completionsdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(pamdir)" "$(DESTDIR)$(polkitdir)"; do \
100	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
101	done
102	install: install-am
103	@@ -762,9 +708,8 @@ info: info-am
104
105	info-am:
106
107	-install-data-am: install-apparmor_profileDATA \
108	- install-dist_apparmor_profile_abstractionsDATA \
109	- install-dist_completionsDATA install-dist_confDATA \
110	+install-data-am: install-dist_completionsDATA \
111	+ install-dist_confDATA \
112	install-dist_dbusDATA install-dist_dbusconfDATA \
113	install-dist_initDATA install-dist_pamDATA install-man \
114	install-polkitDATA
115	@@ -812,9 +757,8 @@ ps: ps-am
116
117	ps-am:
118
119	-uninstall-am: uninstall-apparmor_profileDATA \
120	- uninstall-dist_apparmor_profile_abstractionsDATA \
121	- uninstall-dist_completionsDATA uninstall-dist_confDATA \
122	+uninstall-am: uninstall-dist_completionsDATA \
123	+ uninstall-dist_confDATA \
124	uninstall-dist_dbusDATA uninstall-dist_dbusconfDATA \
125	uninstall-dist_initDATA uninstall-dist_pamDATA uninstall-man \
126	uninstall-polkitDATA
127	@@ -826,8 +770,8 @@ uninstall-man: uninstall-man1
128	.PHONY: all all-am check check-am clean clean-generic clean-libtool \
129	cscopelist-am ctags-am distclean distclean-generic \
130	distclean-libtool distdir dvi dvi-am html html-am info info-am \
131	- install install-am install-apparmor_profileDATA install-data \
132	- install-data-am install-dist_apparmor_profile_abstractionsDATA \
133	+ install install-am install-data \
134	+ install-data-am \
135	install-dist_completionsDATA install-dist_confDATA \
136	install-dist_dbusDATA install-dist_dbusconfDATA \
137	install-dist_initDATA install-dist_pamDATA install-dvi \
138	@@ -838,8 +782,7 @@ uninstall-man: uninstall-man1
139	installcheck installcheck-am installdirs maintainer-clean \
140	maintainer-clean-generic mostlyclean mostlyclean-generic \
141	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
142	- uninstall-am uninstall-apparmor_profileDATA \
143	- uninstall-dist_apparmor_profile_abstractionsDATA \
144	+ uninstall-am \
145	uninstall-dist_completionsDATA uninstall-dist_confDATA \
146	uninstall-dist_dbusDATA uninstall-dist_dbusconfDATA \
147	uninstall-dist_initDATA uninstall-dist_pamDATA uninstall-man \