← Back to branch summary

~ubuntu-branches/debian/experimental/smokeping/experimental

« back to all changes in this revision

Viewing changes to debian/patches/fcgi_destdir

  • Committer: Package Import Robot
  • Author(s): Antoine Beaupré
  • Date: 2013-03-16 11:34:03 UTC
  • mfrom: (1.3.1) (7.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20130316113403-ht1ik5dtc457l6jj
Tags: 2.6.9-1~exp0
http://bugs.debian.org/659899
* New upstream release to properly fix CVE-2012-0790 (Closes: #659899)
* Acknowledge the NMU, thanks gregor!

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fcgi_destdir
1
1
Description: use DESTDIR, not PREFIX for /etc
2
2
 
3
 
--- smokeping-2.6.5.orig/htdocs/Makefile.am
4
 
+++ smokeping-2.6.5/htdocs/Makefile.am
 
3
diff --git a/htdocs/Makefile.am b/htdocs/Makefile.am
 
4
index 12de76f..1ef92fc 100644
 
5
--- a/htdocs/Makefile.am
 
6
+++ b/htdocs/Makefile.am
5
7
@@ -28,5 +28,5 @@ nobase_js_DATA = $(JS)
6
8
 install-data-local:
7
9
        $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
8
10
        $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
9
 
-       $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
10
 
+       $(ECHO) "$(prefix)/bin/smokeping_cgi /etc/smokeping/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
 
11
-       $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
 
12
+       $(ECHO) "exec $(prefix)/bin/smokeping_cgi /etc/smokeping/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
11
13
        chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist