[SCM] caps/master: Added patches to fix build.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43e2e1864bdade66947379ee6a3fe49c2572757e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Aug 17 00:06:50 2013 +0200

    Added patches to fix build.

diff --git a/debian/patches/01-fix_prefix.patch b/debian/patches/01-fix_prefix.patch
new file mode 100644
index 0000000..b4d4e0e
--- /dev/null
+++ b/debian/patches/01-fix_prefix.patch
@@ -0,0 +1,14 @@
+Description:  Set prefix properly
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: caps/Makefile
+===================================================================
+--- caps.orig/Makefile	2013-08-15 21:57:28.000000000 +0200
++++ caps/Makefile	2013-08-15 22:08:30.448628529 +0200
+@@ -1,4 +1,4 @@
+-PREFIX = /usr/local
++PREFIX = /usr
+ 
+ CC = g++
+ 
diff --git a/debian/patches/02-fix_destdir.patch b/debian/patches/02-fix_destdir.patch
new file mode 100644
index 0000000..5a4caf7
--- /dev/null
+++ b/debian/patches/02-fix_destdir.patch
@@ -0,0 +1,51 @@
+Description:  Set DESTDIR
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: caps/Makefile
+===================================================================
+--- caps.orig/Makefile	2013-08-15 23:21:13.398263229 +0200
++++ caps/Makefile	2013-08-15 23:26:44.659905865 +0200
+@@ -1,4 +1,5 @@
+ PREFIX = /usr
++DESTDIR=
+ 
+ CC = g++
+ 
+@@ -55,24 +56,24 @@
+ 
+ install: all
+ 	@$(STRIP) $(PLUG).so > /dev/null
+-	install -d $(DEST)
+-	install -m 644 $(PLUG).so $(DEST)
+-	install -d $(RDFDEST)
+-	install -m 644 $(PLUG).rdf $(RDFDEST)
++	install -d $(DESTDIR)$(DEST)
++	install -m 644 $(PLUG).so $(DESTDIR)$(DEST)
++	install -d $(DESTDIR)$(RDFDEST)
++	install -m 644 $(PLUG).rdf $(DESTDIR)$(RDFDEST)
+ 
+ fake-install: all
+-	-rm $(DEST)/$(PLUG).so
+-	ln -s `pwd`/$(PLUG).so $(DEST)/$(PLUG).so
+-	-rm $(RDFDEST)/$(PLUG).rdf
+-	ln -s `pwd`/$(PLUG).rdf $(RDFDEST)/$(PLUG).rdf
++	-rm $(DESTDIR)$(DEST)/$(PLUG).so
++	ln -s `pwd`/$(PLUG).so $(DESTDIR)$(DEST)/$(PLUG).so
++	-rm $(DESTDIR)$(RDFDEST)/$(PLUG).rdf
++	ln -s `pwd`/$(PLUG).rdf $(DESTDIR)$(RDFDEST)/$(PLUG).rdf
+ 
+ rdf-install:
+-	install -d $(RDFDEST)
+-	install -m 644 $(PLUG).rdf $(RDFDEST)
++	install -d $(DESTDIR)$(RDFDEST)
++	install -m 644 $(PLUG).rdf $(DESTDIR)$(RDFDEST)
+ 
+ uninstall:
+-	-rm $(DEST)/$(PLUG).so
+-	-rm $(DEST)/$(PLUG)-ng.so
++	-rm $(DESTDIR)$(DEST)/$(PLUG).so
++	-rm $(DESTDIR)$(DEST)/$(PLUG)-ng.so
+ 
+ clean:
+ 	rm -f $(OBJECTS) $(PLUG).so *.s depend
diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
new file mode 100644
index 0000000..9166630
--- /dev/null
+++ b/debian/patches/03-fix_hardening.patch
@@ -0,0 +1,19 @@
+Description:  Fix hardening by pasing LDFLAGS properly.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: caps-back/Makefile
+===================================================================
+--- caps-back.orig/Makefile	2013-08-15 23:50:47.163058854 +0200
++++ caps-back/Makefile	2013-08-15 23:56:02.632623183 +0200
+@@ -11,8 +11,8 @@
+ 
+ -include defines.make
+ 
+-CFLAGS = $(OPTS) $(_CFLAGS)
+-LDFLAGS = $(_LDFLAGS) $(CFLAGS)
++CFLAGS += $(OPTS) $(_CFLAGS)
++LDFLAGS += $(_LDFLAGS) $(CFLAGS)
+ 
+ VERSION = 0.9.10
+ PLUG = caps
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ffa423c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-fix_prefix.patch
+02-fix_destdir.patch
+03-fix_hardening.patch

-- 
caps packaging