f91bd7e5dd
off-by-one errors causing information leakage and possibly DoS. Restructure the patch files to follow the newer naming conventions. Add the rc.d script to PLIST. Bump PKGREVISION.
116 lines
5.6 KiB
Text
116 lines
5.6 KiB
Text
$NetBSD: patch-html_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
|
|
|
|
Adjustments to build procedure.
|
|
|
|
--- html/Makefile.in.orig 2012-02-13 20:40:42.000000000 +0000
|
|
+++ html/Makefile.in
|
|
@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
|
|
LOGDIR=@localstatedir@
|
|
CFGDIR=@sysconfdir@
|
|
BINDIR=@bindir@
|
|
-CGIDIR=@sbindir@
|
|
+CGIDIR=@libexecdir@
|
|
HTMLDIR=@datadir@
|
|
INSTALL=@INSTALL@
|
|
INSTALL_OPTS=@INSTALL_OPTS@
|
|
@@ -34,55 +34,55 @@ distclean: clean
|
|
devclean: distclean
|
|
|
|
install:
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
|
|
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
|
|
-# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/js
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
|
|
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
|
|
+ $(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
|
|
+# $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
|
|
# Remove old HTML files (PHP files are used now)
|
|
rm -f $(DESTDIR)$(HTMLDIR)/index.html
|
|
rm -f $(DESTDIR)$(HTMLDIR)/main.html
|
|
rm -f $(DESTDIR)$(HTMLDIR)/side.html
|
|
- for file in *.php; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
|
|
-# for file in media/*.wav; \
|
|
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
|
|
- for file in stylesheets/*.css; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
|
|
- for file in contexthelp/*.html; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
|
|
- for file in js/*.js; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
|
|
-# for file in docs/*.html; \
|
|
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
|
|
-# for file in docs/images/*.*; \
|
|
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
|
|
- for file in images/*.gif; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
- for file in images/*.jpg; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
- for file in images/*.png; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
- for file in images/*.ico; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
- for file in images/logos/*.*; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
|
|
- for file in includes/*.*; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
|
|
- for file in includes/rss/*.*; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
|
|
- for file in includes/rss/extlib/*.*; \
|
|
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
|
|
+ for file in *.php; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
|
|
+# for file in media/*.wav; do \
|
|
+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
|
|
+ for file in stylesheets/*.css; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
|
|
+ for file in contexthelp/*.html; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
|
|
+ for file in js/*.js; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done
|
|
+# for file in docs/*.html; do \
|
|
+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
|
|
+# for file in docs/images/*.*; do \
|
|
+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
|
|
+ for file in images/*.gif; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
+ for file in images/*.jpg; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
+ for file in images/*.png; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
+ for file in images/*.ico; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
+ for file in images/logos/*.*; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
|
|
+ for file in includes/*.*; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done
|
|
+ for file in includes/rss/*.*; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
|
|
+ for file in includes/rss/extlib/*.*; do \
|
|
+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
|
|
|
|
install-unstripped:
|
|
$(MAKE) install
|