Attachment 605 Details for Bug 972 – Patch to prevent installation outside ProjectRoot

[patch] Patch to prevent installation outside ProjectRoot

xprint-install-diff.patch (text/plain), 6.81 KB, created by Kristian Høgsberg on 2004-08-11 10:12:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2004-08-11 10:12:30 UTC

Size: 6.81 KB

patch

obsolete

>? Makefile
>? Xprint.7.html
>? Xprint._man
>? etc/Makefile
>? etc/etcdir.cf
>? etc/etcdir.rules
>? etc/Xsession.d/Makefile
>? etc/init.d/Makefile
>? etc/init.d/xprint
>? etc/profile.d/Makefile
>? pcl/Makefile
>? pcl-mono/Makefile
>? ps/Makefile
>? raster/Makefile
>Index: etc/Xsession.d/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/Xsession.d/Imakefile,v
>retrieving revision 1.3
>diff -u -p -r1.3 Imakefile
>--- etc/Xsession.d/Imakefile	20 Jun 2004 00:46:20 -0000	1.3
>+++ etc/Xsession.d/Imakefile	11 Aug 2004 17:07:59 -0000
>@@ -1,5 +1,13 @@
> XCOMM $Xorg: Imakefile,v 1.1 2003/01/25 14:42:52 gisburn Exp $
> 
>+#if NothingOutsideProjectRoot
>+#define EtcDir ProjectRoot/etc
>+#else
>+#define EtcDir /etc
>+#endif
>+
>+ETCDIR = EtcDir
>+
> all::
> 
> XCOMM Install glue for Xprint on Solaris/CDE1.x and CDE on AIX
>@@ -11,6 +19,6 @@ XCOMM Install xdm startup glue for Xprin
> XCOMM platforms have /etc/X11/Xsession.d/ and/or /etc/X11/xinit/xinitrc.d
> XCOMM (see http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=182)
> #if defined(LinuxArchitecture)
>-InstallNamedProg(cde_xsessiond_xprint.sh,92xprint-xpserverlist.sh,/etc/X11/Xsession.d)
>-InstallNamedProg(cde_xsessiond_xprint.sh,92xprint-xpserverlist.sh,/etc/X11/xinit/xinitrc.d)
>+InstallNamedProg(cde_xsessiond_xprint.sh,92xprint-xpserverlist.sh,$(ETCDIR)/X11/Xsession.d)
>+InstallNamedProg(cde_xsessiond_xprint.sh,92xprint-xpserverlist.sh,$(ETCDIR)/X11/xinit/xinitrc.d)
> #endif
>Index: etc/init.d/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/Imakefile,v
>retrieving revision 1.5
>diff -u -p -r1.5 Imakefile
>--- etc/init.d/Imakefile	30 Jul 2004 12:03:56 -0000	1.5
>+++ etc/init.d/Imakefile	11 Aug 2004 17:07:59 -0000
>@@ -22,22 +22,36 @@ OS_DEFINES = -DOS_AIX
> OS_DEFINES = 
> #endif
> 
>+#if NothingOutsideProjectRoot
>+#define EtcDir ProjectRoot/etc
>+#else
>+#define EtcDir /etc
>+#endif
>+
>+ETCDIR = EtcDir
>+
> MakeScriptFromCpp(xprint, -DDEF_XPCUSTOMGLUE=$(XPCUSTOMGLUE) $(OS_DEFINES))
> 
> #if defined(FreeBSDArchitecture)
>-InstallNamedProg(xprint,xprint,/usr/X11R6/etc/rc.d)
>+InstallNamedProg(xprint,xprint,$(PROJECTROOT)/etc/rc.d)
> #else
> XCOMM Solaris, Linux, etc.
>-InstallNamedProg(xprint,xprint,/etc/init.d)
>+InstallNamedProg(xprint,xprint,$(ETCDIR)/init.d)
> #endif
> 
> XCOMM Create startup/shutdown links in /etc/init.d/ for Solaris
> #if defined(SunArchitecture) && (OSMajorVersion > 4)
>+
>+#define InstallStartupLink(rcdir,script,linkname) \
>+	MakeDir($(DESTDIR)$(ETCDIR)/rcdir) ; \
>+	RemoveFile($(DESTDIR)$(ETCDIR)/rcdir/linkname) ; \
>+	ln -s ../init.d/script $(DESTDIR)$(ETCDIR)/rcdir/linkname
>+
> install::
>-	MakeDir($(DESTDIR)/etc/rc0.d) ; RemoveFile($(DESTDIR)/etc/rc0.d/K38xprint) ; ln -s /etc/init.d/xprint $(DESTDIR)/etc/rc0.d/K38xprint
>-	MakeDir($(DESTDIR)/etc/rc1.d) ; RemoveFile($(DESTDIR)/etc/rc1.d/K38xprint) ; ln -s /etc/init.d/xprint $(DESTDIR)/etc/rc1.d/K38xprint
>-	MakeDir($(DESTDIR)/etc/rc2.d) ; RemoveFile($(DESTDIR)/etc/rc2.d/S81xprint) ; ln -s /etc/init.d/xprint $(DESTDIR)/etc/rc2.d/S81xprint
>-	MakeDir($(DESTDIR)/etc/rcS.d) ; RemoveFile($(DESTDIR)/etc/rcS.d/K38xprint) ; ln -s /etc/init.d/xprint $(DESTDIR)/etc/rcS.d/K38xprint
>+	InstallStartupScript(rc0.d,xprint,K38xprint)
>+	InstallStartupScript(rc1.d,xprint,K38xprint)
>+	InstallStartupScript(rc2.d,xprint,S81xprint)
>+	InstallStartupScript(rcS.d,xprint,K38xprint)
> #endif /* defined(SunArchitecture) && (OSMajorVersion > 4) */
> 
> XCOMM Create startup/shutdown links in /etc/init.d/ for Linux
>@@ -46,25 +60,35 @@ XCOMM Create startup/shutdown links in /
>      (LinuxDistribution == LinuxDebian) || \
>      (LinuxDistribution == LinuxUnknown)
> XCOMM SuSE Linux(-like)
>+
>+#define InstallStartupLink(rcdir,script,linkname) \
>+	MakeDir($(DESTDIR)$(ETCDIR)/rc.d/rcdir) ; \
>+	ln -sf ../script $(DESTDIR)$(ETCDIR)/rc.d/rcdir/linkname
>+
> install::
> 	echo "# Installing /etc/init.d links for SuSE Linux(-like)"
>-	MakeDir($(DESTDIR)/etc/rc.d/rc2.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc2.d/K21xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc2.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc2.d/S21xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc3.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc3.d/K21xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc3.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc3.d/S21xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc5.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc5.d/K21xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc5.d) ; ln -sf ../xprint $(DESTDIR)/etc/rc.d/rc5.d/S21xprint
>+	InstallStartupLink(rc2.d,xprint,K21xprint)
>+	InstallStartupLink(rc2.d,xprint,S21xprint)
>+	InstallStartupLink(rc3.d,xprint,K21xprint)
>+	InstallStartupLink(rc3.d,xprint,S21xprint)
>+	InstallStartupLink(rc5.d,xprint,K21xprint)
>+	InstallStartupLink(rc5.d,xprint,S21xprint)
> # elif LinuxDistribution == LinuxRedHat
> XCOMM RedHat Linux(-like)
>+
>+#define InstallStartupLink(rcdir,script,linkname) \
>+	MakeDir($(DESTDIR)$(ETCDIR)/rcdir) ; \
>+	ln -sf ../init.d/script $(DESTDIR)$(ETCDIR)/rcdir/linkname
>+
> install::
> 	echo "# Installing /etc/init.d links for RedHat Linux(-like)"
>-	MakeDir($(DESTDIR)/etc/rc.d/rc0.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc0.d/K61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc1.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc1.d/K61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc2.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc2.d/S61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc3.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc3.d/S61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc4.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc4.d/S61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc5.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc5.d/S61xprint
>-	MakeDir($(DESTDIR)/etc/rc.d/rc6.d) ; ln -sf /etc/init.d/xprint $(DESTDIR)/etc/rc.d/rc6.d/K61xprint
>+	InstallStartupLink(rc0.d,xprint,K61xprint)
>+	InstallStartupLink(rc1.d,xprint,K61xprint)
>+	InstallStartupLink(rc2.d,xprint,S61xprint)
>+	InstallStartupLink(rc3.d,xprint,S61xprint)
>+	InstallStartupLink(rc4.d,xprint,S61xprint)
>+	InstallStartupLink(rc5.d,xprint,S61xprint)
>+	InstallStartupLink(rc6.d,xprint,K61xprint)
> # else
> install::
> 	echo "WARNING: No links for /etc/init.d/xprint set."
>Index: etc/profile.d/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/profile.d/Imakefile,v
>retrieving revision 1.2
>diff -u -p -r1.2 Imakefile
>--- etc/profile.d/Imakefile	23 Apr 2004 18:57:50 -0000	1.2
>+++ etc/profile.d/Imakefile	11 Aug 2004 17:07:59 -0000
>@@ -1,6 +1,14 @@
> XCOMM $Xorg: Imakefile,v 1.1 2002/10/31 14:42:52 gisburn Exp $
> 
>+#if NothingOutsideProjectRoot
>+#define EtcDir ProjectRoot/etc
>+#else
>+#define EtcDir /etc
>+#endif
>+
>+ETCDIR = EtcDir
>+
> all::
> 
>-InstallNamedProg(xprint.csh,xprint.csh,/etc/profile.d)
>-InstallNamedProg(xprint.sh,xprint.sh,/etc/profile.d)
>+InstallNamedProg(xprint.csh,xprint.csh,$(ETCDIR)/profile.d)
>+InstallNamedProg(xprint.sh,xprint.sh,$(ETCDIR)/profile.d)

Actions: View | Splinter Review

Attachments on bug 972: 581 | 587 | 605

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.