diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-11-07 19:40:59 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-11-07 19:40:59 +0000 |
| commit | d7588dfb2c0258efd62bbeec5edb5af77f381713 (patch) | |
| tree | 3b705599c0d7b4175a5d486db48aed673ea86368 /net/rtg/files/patch-etc_Makefile.in | |
| parent | devel/clixon: Update to 3.8.0 (diff) | |
* Fix runtime PHP errors that stop the code working if short_opentag is disabled (default!)
* Remove most PHP warnings/notices that go to error_log
* Convert patches to new format where needed
* Fix HTML output to be valid
* Fix quoting of SQL objects
* Fix escaping of user-provided SQL data (potential sql injection)
* Widen fields in 95.php and 95.pl for interface and router names
* Fix warnings in perl modules in newer perl versions
* Fix createdb script to use CREATE USER/GRANT not manipulate user db directly
* Add "Update_desc" config entry to auto-update port descriptions from snmp
* Update default SNMP version to 2
* Although this doesn't reference any CVE's, it does contain fixes for potential security issues
PR: 227376
Submitted by: freebsd-ports@dan.me.uk (maintainer)
Reported by: freebsd-ports@dan.me.uk (maintainer)
Reviewed by: mfechner
Approved by: mentors (timeout), portmgr (timeout)
MFC after: 2 days
Differential Revision: https://reviews.freebsd.org/D17637
Notes
Notes:
svn path=/head/; revision=484406
Diffstat (limited to 'net/rtg/files/patch-etc_Makefile.in')
| -rw-r--r-- | net/rtg/files/patch-etc_Makefile.in | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/net/rtg/files/patch-etc_Makefile.in b/net/rtg/files/patch-etc_Makefile.in new file mode 100644 index 000000000000..b7e64a203715 --- /dev/null +++ b/net/rtg/files/patch-etc_Makefile.in @@ -0,0 +1,49 @@ +--- etc/Makefile.in.orig 2003-10-02 15:59:32 UTC ++++ etc/Makefile.in +@@ -84,19 +84,19 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + + top_builddir = .. +-etcdir = /etc +-webdir = /web +-reportsdir = /bin ++etcdir = @etcdir@ ++webdir = @webdir@ ++reportsdir = @bindir@ + +-ETC = rtg.conf rtgtargmkr.pl routers createdb BER.pm \ ++ETC = rtg.conf.sample rtgtargmkr.pl routers.sample createdb BER.pm \ + SNMP_Session.pm SNMP_util.pm + + WEB = rtg.php 95.php view.php common.php rtg.png rtgback.png + REPORTS = report.pl 95.pl + + EXTRA_DIST = rtgtargmkr.pl.in report.pl 95.pl createdb.in \ +- BER.pm SNMP_Session.pm SNMP_util.pm rtg.conf \ +- routers rtg.php 95.php view.php common.php.in rtg.png rtgback.png ++ BER.pm SNMP_Session.pm SNMP_util.pm rtg.conf.sample \ ++ routers.sample rtg.php 95.php view.php common.php.in rtg.png rtgback.png + + subdir = etc + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +@@ -220,14 +220,14 @@ uninstall-am: uninstall-info-am + all: + + install: installdirs +- @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(etcdir) ; echo "install: installed $$i in $(prefix)$(etcdir)" ; done +- @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(webdir) ; echo "install: installed $$i in $(prefix)$(webdir)" ; done +- @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(reportsdir) ; echo "install: installed $$i in $(prefix)$(reportsdir)" ; done ++ @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(etcdir) ; echo "install: installed $$i in $(DESTDIR)$(etcdir)" ; done ++ @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(webdir) ; echo "install: installed $$i in $(DESTDIR)$(webdir)" ; done ++ @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(reportsdir) ; echo "install: installed $$i in $(DESTDIR)$(reportsdir)" ; done + + installdirs: +- $(mkinstalldirs) $(prefix)$(etcdir) +- $(mkinstalldirs) $(prefix)$(webdir) +- $(mkinstalldirs) $(prefix)$(reportsdir) ++ $(mkinstalldirs) $(DESTDIR)$(etcdir) ++ $(mkinstalldirs) $(DESTDIR)$(webdir) ++ $(mkinstalldirs) $(DESTDIR)$(reportsdir) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |