Attachment #18898 for bug #33762

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

Lines 6-12 Link Here

(-)/usr/ports/x11/launch.app/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= launch.app	8	PORTNAME= launch.app
9	PORTVERSION= 0.6.5	9	PORTVERSION= 0.7.0
10	CATEGORIES= x11 windowmaker	10	CATEGORIES= x11 windowmaker
11	MASTER_SITES= http://stepmaker.sourceforge.net/launch/	11	MASTER_SITES= http://stepmaker.sourceforge.net/launch/
12	DISTNAME= ${PORTNAME:S/l/L/}-${PORTVERSION}	12	DISTNAME= ${PORTNAME:S/l/L/}-${PORTVERSION}
Lines 14-19 Link Here
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15		15
16	LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker	16	LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
		17	#LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \
		18	# PropList.2:${PORTSDIR}/devel/libPropList
17		19
18	WRKSRC= ${WRKDIR}/${PORTNAME:S/l/L/}	20	WRKSRC= ${WRKDIR}/${PORTNAME:S/l/L/}
19		21

Line 1 Link Here

(-)/usr/ports/x11/launch.app/distinfo (-1 / +1 lines)
1	MD5 (Launch.app-0.6.5.tar.gz) = 7444a8d7ec3ca6f0f93840100b779509	1	MD5 (Launch.app-0.7.0.tar.gz) = b6ca0abd8dea0cac54daf33fba4db1e9




--- GNUmakefile.orig	Thu Oct 18 14:26:03 2001
+++ GNUmakefile	Thu Jan 10 13:52:21 2002

--- GNUmakefile.orig	Mon Jun  4 14:56:00 2001
+++ GNUmakefile	Mon Aug 20 18:56:09 2001
@@ -1,10 +1,10 @@
-PREFIX = /usr/local/GNUstep/Apps
+prefix = $(PREFIX)/GNUstep/Apps
 # Comment out the line below if you don't use shadow passwords
-SHADOW = yes
-CFLAGS = `get-wings-flags --cflags` -DPREFIX="\"$(PREFIX)\""
-LDFLAGS = `get-wings-flags --ldflags`
-LIBS = `get-wings-flags --libs` -lWMaker -lcrypt
 LDFLAGS = `get-wraster-flags --ldflags`
-LIBS = `get-wraster-flags --libs` -L/usr/X11R6/lib -L/usr/local/GNUstep/lib -lWMaker -lWINGs -lPropList -lcrypt
-CC = gcc -O2 -ggdb
+#SHADOW = yes
+CFLAGS += `get-wings-flags --cflags` -DPREFIX="\"$(prefix)\""
+LDFLAGS = `get-wraster-flags --ldflags`
+LIBS = `get-wings-flags --libs` -L$(X11BASE)/lib -L$(X11BASE)/GNUstep/lib -lWMaker -lcrypt
+CC ?= gcc
 OBJS = launch.o history.o execute.o user_auth.o exec_panel.o \
 completion.o test_file.o common_panel.o preferences.o info.o legal.o utils.o
 
@@ -51,21 +51,21 @@
@@ -50,21 +50,21 @@
 	$(CC) $(CFLAGS) -c legal.c -o legal.o 
 
 install: Launch




--- execute.c.orig	Thu Oct 18 13:56:26 2001
+++ execute.c	Thu Jan 10 13:48:12 2002
@@ -161,13 +161,13 @@
--- execute.c	2001/08/20 09:08:11	1.1
+++ execute.c	2001/08/20 09:09:29
@@ -157,13 +157,13 @@
 	pid = fork ();
 	if (pid == 0)
 	{
-		if (setuid (pw->pw_gid))
+		if (setgid (pw->pw_gid))
 		{
 //			fprintf (stderr, "unable to set group id\n");
 			SMRunAttentionPanel (wm_screen, LaunchPanel->window,
           "Command Execution", "Unable to set group ID.", NULL, NULL, "Ok");
 		}
-		if (setgid (pw->pw_uid))
+		if (setuid (pw->pw_uid))
 		{
 //			fprintf (stderr, "unable to set user id\n");
 			SMRunAttentionPanel (wm_screen, LaunchPanel->window,
 		}
 		setenv ("HOME", pw->pw_dir, 1);
 		setenv ("USER", pw->pw_name, 1);

Return to bug 33762

Lines 1-25 Link Here

(-)/usr/ports/x11/launch.app/files/patch-GNUmakefile (-14 / +12 lines)
1		1	--- GNUmakefile.orig Thu Oct 18 14:26:03 2001
2	$FreeBSD: ports/x11/launch.app/files/patch-GNUmakefile,v 1.1 2001/08/20 15:58:53 sobomax Exp $	2	+++ GNUmakefile Thu Jan 10 13:52:21 2002
3
4	--- GNUmakefile.orig Mon Jun 4 14:56:00 2001
5	+++ GNUmakefile Mon Aug 20 18:56:09 2001
6	@@ -1,10 +1,10 @@	3	@@ -1,10 +1,10 @@
7	-PREFIX = /usr/local/GNUstep/Apps	4	-PREFIX = /usr/local/GNUstep/Apps
8	+prefix = $(PREFIX)/GNUstep/Apps	5	+prefix = $(PREFIX)/GNUstep/Apps
9	# Comment out the line below if you don't use shadow passwords	6	# Comment out the line below if you don't use shadow passwords
10	-SHADOW = yes	7	-SHADOW = yes
11	-CFLAGS = `get-wraster-flags --cflags` -DPREFIX="\"$(PREFIX)\""	8	-CFLAGS = `get-wings-flags --cflags` -DPREFIX="\"$(PREFIX)\""
12	+#SHADOW = yes	9	-LDFLAGS = `get-wings-flags --ldflags`
13	+CFLAGS += `get-wraster-flags --cflags` -DPREFIX="\"$(prefix)\""	10	-LIBS = `get-wings-flags --libs` -lWMaker -lcrypt
14	LDFLAGS = `get-wraster-flags --ldflags`
15	-LIBS = `get-wraster-flags --libs` -L/usr/X11R6/lib -L/usr/local/GNUstep/lib -lWMaker -lWINGs -lPropList -lcrypt
16	-CC = gcc -O2 -ggdb	11	-CC = gcc -O2 -ggdb
17	+LIBS = `get-wraster-flags --libs` -L$(X11BASE)/lib -L$(X11BASE)/GNUstep/lib -lWMaker -lWINGs -lPropList -lcrypt	12	+#SHADOW = yes
		13	+CFLAGS += `get-wings-flags --cflags` -DPREFIX="\"$(prefix)\""
		14	+LDFLAGS = `get-wraster-flags --ldflags`
		15	+LIBS = `get-wings-flags --libs` -L$(X11BASE)/lib -L$(X11BASE)/GNUstep/lib -lWMaker -lcrypt
18	+CC ?= gcc	16	+CC ?= gcc
19	OBJS = launch.o history.o execute.o user_auth.o exec_panel.o completion.o test_file.o common_panel.o pref_panel.o info.o legal.o	17	OBJS = launch.o history.o execute.o user_auth.o exec_panel.o \
		18	completion.o test_file.o common_panel.o preferences.o info.o legal.o utils.o
20		19
21	all: Launch	20	@@ -51,21 +51,21 @@
22	@@ -50,21 +50,21 @@
23	$(CC) $(CFLAGS) -c legal.c -o legal.o	21	$(CC) $(CFLAGS) -c legal.c -o legal.o
24		22
25	install: Launch	23	install: Launch

Lines 1-22 Link Here

(-)/usr/ports/x11/launch.app/files/patch-execute.c (-12 / +8 lines)
1		1	--- execute.c.orig Thu Oct 18 13:56:26 2001
2	$FreeBSD: ports/x11/launch.app/files/patch-execute.c,v 1.1 2001/08/20 15:58:53 sobomax Exp $	2	+++ execute.c Thu Jan 10 13:48:12 2002
3		3	@@ -161,13 +161,13 @@
4	--- execute.c 2001/08/20 09:08:11 1.1
5	+++ execute.c 2001/08/20 09:09:29
6	@@ -157,13 +157,13 @@
7	pid = fork ();	4	pid = fork ();
8	if (pid == 0)	5	if (pid == 0)
9	{	6	{
10	- if (setuid (pw->pw_gid))	7	- if (setuid (pw->pw_gid))
11	+ if (setgid (pw->pw_gid))	8	+ if (setgid (pw->pw_gid))
12	{	9	{
13	fprintf (stderr, "unable to set group id\n");	10	// fprintf (stderr, "unable to set group id\n");
		11	SMRunAttentionPanel (wm_screen, LaunchPanel->window,
		12	"Command Execution", "Unable to set group ID.", NULL, NULL, "Ok");
14	}	13	}
15	- if (setgid (pw->pw_uid))	14	- if (setgid (pw->pw_uid))
16	+ if (setuid (pw->pw_uid))	15	+ if (setuid (pw->pw_uid))
17	{	16	{
18	- fprintf (stderr, "unable to set group id\n");	17	// fprintf (stderr, "unable to set user id\n");
19	+ fprintf (stderr, "unable to set user id\n");	18	SMRunAttentionPanel (wm_screen, LaunchPanel->window,
20	}
21	setenv ("HOME", pw->pw_dir, 1);
22	setenv ("USER", pw->pw_name, 1);