cherry-pick uri security fix

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index cdf28f16effce8bc6c42c8e586f620bfb69bdcd1..49fac1adecbfa1e57ac85414bd7b661366568e53 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,35 +13,64 @@ pure_install:: extra_install
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 

-extra_build:
-       ./ikiwiki.pl doc html --templatedir=templates --underlaydir=basewiki \
-               --wikiname="ikiwiki" --verbose --no-rcs \
-               --exclude=/discussion --no-discussion \
-               --plugin=brokenlinks --plugin=pagecount \
-               --plugin=orphans --plugin=haiku --plugin=meta \
-               --plugin=tag --plugin=polygen --plugin=pagestats \
-               --plugin=fortune --plugin=aggregate --plugin=map \
-               --plugin=template --plugin=toc
+PROBABLE_INST_LIB=$(shell \\
+       if [ "$(INSTALLDIRS)" = "perl" ]; then \\
+               echo $(INSTALLPRIVLIB); \\
+       elif [ "$(INSTALLDIRS)" = "site" ]; then \\
+               echo $(INSTALLSITELIB); \\
+       elif [ "$(INSTALLDIRS)" = "vendor" ]; then \\
+               echo $(INSTALLVENDORLIB); \\
+       fi \\
+)
+
+tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+
+ikiwiki.out: ikiwiki.in
+       ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
+       chmod +x ikiwiki.out
+
+extra_build: ikiwiki.out
+       perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh

        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man

-       ./pm_filter $(PREFIX) $(VER) < ikiwiki.pl > ikiwiki.out
-               
+       ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
+       ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
+       $(MAKE) -C po
+       if [ "$$PROFILE" = 1 ]; then dprofpp; fi
+

 extra_clean:
        rm -rf html doc/.ikiwiki
 extra_clean:
        rm -rf html doc/.ikiwiki

-       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
+       rm -f *.man ikiwiki.out
+       $(MAKE) -C po clean

 
 extra_install:
 
 extra_install:

-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-       cp templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-       cp -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+       for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
+                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               done; \
+       done
+       for dir in `find templates -follow -type d ! -regex '.*\.svn.*'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               for file in `find $$dir -follow -maxdepth 1 -type f`; do \
+                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               done; \
+       done
+       
+       install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
+       for file in `find plugins -maxdepth 1 -type f`; do \
+               install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+       done; \

 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1

-       install ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+       install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+       install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
+       install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1

        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8
        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8

-       install ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
+       install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8

        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin


@@ -51,13 +80,29 @@ extra_install:
 
        install -d $(DESTDIR)$(PREFIX)/bin
        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
 
        install -d $(DESTDIR)$(PREFIX)/bin
        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki

+       install ikiwiki-makerepo ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
+
+       $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)

 }
 }
 
 WriteMakefile(
        NAME            => 'IkiWiki',
        PREFIX          => "/usr/local",
 }
 }
 
 WriteMakefile(
        NAME            => 'IkiWiki',
        PREFIX          => "/usr/local",

-       PM_FILTER       => './pm_filter $(PREFIX) $(VER)',
+       PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',

        MAN1PODS        => {},
        MAN1PODS        => {},

-       clean           => {FILES => 'ikiwiki'},
+       PREREQ_PM       => {
+               'XML::Simple'           => 0,
+               'Text::Markdown'        => 0,
+               'Date::Parse'           => 0,
+               'HTML::Template'        => 0,
+               'HTML::Scrubber'        => 0,
+               'CGI::FormBuilder'      => 3.02.02,
+               'Time::Duration'        => 0,
+               'CGI::Session'          => 0,
+               'Mail::Sendmail'        => 0,
+               'HTML::Parser'          => 0,
+               'URI'                   => 0,
+               'Data::Dumper'          => 2.11,
+       },

 );
 );