[Pkg-xmpp-commits] [SCM] Jabber MUC (Multi User Chat) branch, master, updated. 6a0dad1c5a766edab065a62e4c8239b4fe114e57

[W. van den Akker]

The following commit has been merged in the master branch:
commit 6a0dad1c5a766edab065a62e4c8239b4fe114e57
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Thu Jan 24 13:41:44 2013 +0100

    Changed CFLAGS and LDFLAGS to make hardening work.
    Added missing manpages file.

diff --git a/debian/changelog b/debian/changelog
index 1149a24..38aab59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ jabber-muc (0.8-4) unstable; urgency=low
   * debian/lintian-overrides: added spelling-error-in-binary.
   * debian/rules: include hardening options.
     - debian/lintian-overrides: added hardening-no-relro.
-    - debian/control: added hardening-include dependency.
   * debian/rules: added build-arch, build-indep.
   * debian/rules: added include quilt.make
     debian/control: added quilt dependency.
@@ -25,6 +24,7 @@ jabber-muc (0.8-4) unstable; urgency=low
   * Added mu-conference man page.
     + debian/mu-conference.1 file added.
     + debian/manpage file added.
+  * Added patch for CFLAGS in src/Makefile to make hardening work.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 18 Jan 2013 10:03:25 +0100
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 4fe5972..3a03c6b 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,4 +1,2 @@
-# proberbly false positives in mu-conference
-jabber-muc binary: hardening-no-relro
 #this error is by design to fix previous error in XML file.
 jabber-muc binary: spelling-error-in-binary
\ No newline at end of file
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..9240673
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/mu-conference.1
diff --git a/debian/patches/cflags_hardening.diff b/debian/patches/cflags_hardening.diff
new file mode 100644
index 0000000..a85affc
--- /dev/null
+++ b/debian/patches/cflags_hardening.diff
@@ -0,0 +1,17 @@
+Description: Change CFLAGS and LDFLAGS for use hardening.
+Author: Willem van den Akker <wvdakker at wilsoft.nl>
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,9 +1,9 @@
+ CC:=gcc
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
++CFLAGS:=$(CFLAGS) -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
+ #CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN -DHAVE_MYSQL
+ LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn
+ #LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn `mysql_config --libs`
+-LDFLAGS:=-L.
++LDFLAGS:=$(LDFLAGS) -L.
+ 
+ # Debug/Experimental
+ #CFLAGS:=$(CFLAGS) -pipe -Os -I../../jabberd -I../include 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0df0c60
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cflags_hardening.diff

-- 
Jabber MUC (Multi User Chat)